fix(cmdx): use better yaml library

aeneasr · aeneasr · commit 28892fda8c86 · 2022-03-24T18:50:23.000+01:00
diff --git a/cmdx/printing.go b/cmdx/printing.go
@@ -153,7 +153,7 @@ func PrintJSONAble(cmd *cobra.Command, d interface{ String() string }) {
 		if i, ok := d.(interfacer); ok {
 			v = i
 		}
-		printJSON(cmd.OutOrStdout(), v, true)
+		printYAML(cmd.OutOrStdout(), v)
 	}
 }
 
@@ -202,7 +202,9 @@ func printJSON(w io.Writer, v interface{}, pretty bool) {
 }
 
 func printYAML(w io.Writer, v interface{}) {
-	e, err := yaml.Marshal(v)
+	j, err := json.Marshal(v)
+	Must(err, "Error encoding JSON: %s", err)
+	e, err := yaml.JSONToYAML(j)
 	Must(err, "Error encoding YAML: %s", err)
 	_, _ = w.Write(e)
 }
diff --git a/cmdx/printing_test.go b/cmdx/printing_test.go
@@ -263,7 +263,7 @@ func TestPrinting(t *testing.T) {
 				},
 				{
 					fArgs:    []string{"--" + FlagFormat, string(FormatYAML)},
-					expected: "[]",
+					expected: "null",
 				},
 			} {
 				t.Run(fmt.Sprintf("format=%v", tc.fArgs), func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func PrintJSONAble(cmd *cobra.Command, d interface{ String() string }) {`
`153`	`153`	`if i, ok := d.(interfacer); ok {`
`154`	`154`	`v = i`
`155`	`155`	`}`
`156`		`- printJSON(cmd.OutOrStdout(), v, true)`
	`156`	`+ printYAML(cmd.OutOrStdout(), v)`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`@@ -202,7 +202,9 @@ func printJSON(w io.Writer, v interface{}, pretty bool) {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`func printYAML(w io.Writer, v interface{}) {`
`205`		`- e, err := yaml.Marshal(v)`
	`205`	`+ j, err := json.Marshal(v)`
	`206`	`+ Must(err, "Error encoding JSON: %s", err)`
	`207`	`+ e, err := yaml.JSONToYAML(j)`
`206`	`208`	`Must(err, "Error encoding YAML: %s", err)`
`207`	`209`	`_, _ = w.Write(e)`
`208`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func TestPrinting(t *testing.T) {`
`263`	`263`	`},`
`264`	`264`	`{`
`265`	`265`	`fArgs: []string{"--" + FlagFormat, string(FormatYAML)},`
`266`		`- expected: "[]",`
	`266`	`+ expected: "null",`
`267`	`267`	`},`
`268`	`268`	`} {`
`269`	`269`	`t.Run(fmt.Sprintf("format=%v", tc.fArgs), func(t *testing.T) {`