Merge pull request #258 from aliyun/sortjson

sort json

Author: wenzuochao

openapi/commando.go

@@ -20,7 +20,6 @@ import (
 	"github.com/aliyun/aliyun-cli/i18n"
 	"github.com/aliyun/aliyun-cli/meta"
 
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -164,19 +163,23 @@ func (c *Commando) processInvoke(ctx *cli.Context, productCode string, apiOrMeth
 		}
 	}
 
-	out = FormatJson(out)
+	out = sortJSON(out)
 
 	cli.Println(ctx.Writer(), out)
 	return nil
 }
 
-func FormatJson(content string) string {
-	var buf bytes.Buffer
-	err := json.Indent(&buf, []byte(content), "", "\t")
-	if err == nil {
-		content = buf.String()
+func sortJSON(content string) string {
+	var v interface{}
+	err := json.Unmarshal([]byte(content), &v)
+	if err != nil {
+		return content
+	}
+	data, err := json.MarshalIndent(v, "", "\t")
+	if err != nil {
+		return content
 	}
-	return content
+	return string(data)
 }
 
 // invoke with helper

openapi/commando_test.go

@@ -206,8 +206,8 @@ func Test_processInvoke(t *testing.T) {
 	assert.Nil(t, err)
 
 	out := `{"requestid":"test","name":"json"}`
-	out = FormatJson(out)
-	assert.Equal(t, "{\n\t\"requestid\": \"test\",\n\t\"name\": \"json\"\n}", out)
+	out = sortJSON(out)
+	assert.Equal(t, "{\n\t\"name\": \"json\",\n\t\"requestid\": \"test\"\n}", out)
 }
 
 func Test_help(t *testing.T) {