Merge pull request #193 from QuentinPerez/prettyJSON

moul · moul · commit 1400a103a90d · 2015-09-25T05:19:22.000-04:00
Pretty JSON security-groups #192
diff --git a/pkg/cli/x_security-groups.go b/pkg/cli/x_security-groups.go
@@ -60,11 +60,11 @@ var securityGroupsRuleNew string    // -rn, --rule-new flag
 var securityGroupsRuleUpdate string // -ru, --rule-update flag
 
 func printRawMode(out io.Writer, data interface{}) error {
-	js, err := json.Marshal(data)
+	js, err := json.MarshalIndent(data, "", "  ")
 	if err != nil {
 		return fmt.Errorf("Unable to parse the data: %v", err)
 	}
-	fmt.Fprintf(out, string(js))
+	fmt.Fprintf(out, "%s\n", string(js))
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ var securityGroupsRuleNew string // -rn, --rule-new flag`
`60`	`60`	`var securityGroupsRuleUpdate string // -ru, --rule-update flag`
`61`	`61`
`62`	`62`	`func printRawMode(out io.Writer, data interface{}) error {`
`63`		`- js, err := json.Marshal(data)`
	`63`	`+ js, err := json.MarshalIndent(data, "", " ")`
`64`	`64`	`if err != nil {`
`65`	`65`	`return fmt.Errorf("Unable to parse the data: %v", err)`
`66`	`66`	`}`
`67`		`- fmt.Fprintf(out, string(js))`
	`67`	`+ fmt.Fprintf(out, "%s\n", string(js))`
`68`	`68`	`return nil`
`69`	`69`	`}`
`70`	`70`