Merge branch 'v7'

cloudfoundry · Mar 11, 2021 · bd66e0b · bd66e0b
2 parents 11cfaa2 + e951a00
commit bd66e0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/util/ui/ui.go b/util/ui/ui.go
@@ -359,7 +359,7 @@ func (ui *UI) DisplayJSON(name string, jsonData interface{}) error {
 	buff := new(bytes.Buffer)
 	encoder := json.NewEncoder(buff)
 	encoder.SetEscapeHTML(false)
-	encoder.SetIndent("", " ")
+	encoder.SetIndent("", "  ")
 
 	err := encoder.Encode(jsonData)
 	if err != nil {

diff --git a/util/ui/ui_test.go b/util/ui/ui_test.go
@@ -201,17 +201,17 @@ var _ = Describe("UI", func() {
 
 			Expect(out).To(SatisfyAll(
 				Say("named_json: {\n"),
-				Say(" \"arr\": \\[\n"),
-				Say("  \"a\","),
-				Say("  \"b\"\n"),
-				Say(" \\],\n"),
-				Say(" \"bool\": true,\n"),
-				Say(" \"int\": 42,\n"),
-				Say(" \"map\": {\n"),
-				Say("  \"float\": 123.03\n"),
-				Say(" },\n"),
-				Say(" \"pass\": \"abc>&gd!f\",\n"),
-				Say(" \"str\": \"hello\"\n"),
+				Say("  \"arr\": \\[\n"),
+				Say("    \"a\","),
+				Say("    \"b\"\n"),
+				Say("  \\],\n"),
+				Say("  \"bool\": true,\n"),
+				Say("  \"int\": 42,\n"),
+				Say("  \"map\": {\n"),
+				Say("    \"float\": 123.03\n"),
+				Say("  },\n"),
+				Say("  \"pass\": \"abc>&gd!f\",\n"),
+				Say("  \"str\": \"hello\"\n"),
 				Say("}\n"),
 				Say("\n"),
 			))