Merge pull request #178 from miaoyq/using-jsonpb

Use `protobuf/jsonpb` instead of `golang json` in some cases

Author: Random-Liu

cmd/crictl/container.go

@@ -456,12 +456,8 @@ func ContainerStatus(client pb.RuntimeServiceClient, ID, output string) error {
 		return err
 	}
 
-	switch output {
-	case "json":
-		return outputJSON(r.Status)
-
-	case "yaml":
-		return outputYAML(r.Status)
+	if output == "json" || output == "yaml" {
+		return outputStatusInfo(r.Status, r.Info, output)
 	}
 
 	// output in table format by default.
@@ -538,7 +534,6 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
 	switch opts.output {
 	case "json":
 		return outputJSON(r.Containers)
-
 	case "yaml":
 		return outputYAML(r.Containers)
 	}

cmd/crictl/image.go

@@ -207,12 +207,9 @@ var imageStatusCommand = cli.Command{
 			return fmt.Errorf("no such image present")
 		}
 
-		switch context.String("output") {
-		case "json":
-			return outputJSON(r.Image)
-
-		case "yaml":
-			return outputYAML(r.Image)
+		output := context.String("output")
+		if output == "json" || output == "yaml" {
+			return outputStatusInfo(r.Image, r.Info, output)
 		}
 
 		// output in table format by default.

cmd/crictl/sandbox.go

@@ -287,12 +287,8 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID, output string) error {
 		return err
 	}
 
-	switch output {
-	case "json":
-		return outputJSON(r.Status)
-
-	case "yaml":
-		return outputYAML(r.Status)
+	if output == "json" || output == "yaml" {
+		return outputStatusInfo(r.Status, r.Info, output)
 	}
 
 	// output in table format by default.

cmd/crictl/util.go

@@ -24,6 +24,8 @@ import (
 	"sort"
 
 	"github.com/ghodss/yaml"
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
@@ -183,8 +185,17 @@ func outputYAML(v interface{}) error {
 	return nil
 }
 
-func outputStatusInfo(status interface{}, info map[string]string, format string) error {
-	statusByte, err := json.Marshal(status)
+func protobufObjectToJSON(obj proto.Message) (string, error) {
+	jsonpbMarshaler := jsonpb.Marshaler{EmitDefaults: true, Indent: "  "}
+	marshaledJSON, err := jsonpbMarshaler.MarshalToString(obj)
+	if err != nil {
+		return "", err
+	}
+	return marshaledJSON, nil
+}
+
+func outputStatusInfo(status proto.Message, info map[string]string, format string) error {
+	statusByte, err := protobufObjectToJSON(status)
 	if err != nil {
 		return err
 	}