Use protobuf/jsonpb instead of golang json in some cases

Signed-off-by: Yanqiang Miao <[email protected]>

Author: Yanqiang Miao

cmd/crictl/container.go

@@ -458,10 +458,9 @@ func ContainerStatus(client pb.RuntimeServiceClient, ID, output string) error {
 
 	switch output {
 	case "json":
-		return outputJSON(r.Status)
-
+		return outputProtobufObjAsJSON(r.Status)
 	case "yaml":
-		return outputYAML(r.Status)
+		return outputProtobufObjAsYAML(r.Status)
 	}
 
 	// output in table format by default.
@@ -538,7 +537,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/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"
@@ -178,8 +180,42 @@ 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 outputProtobufObjAsJSON(obj proto.Message) error {
+	marshaledJSON, err := protobufObjectToJSON(obj)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(marshaledJSON)
+	return nil
+}
+
+func outputProtobufObjAsYAML(obj proto.Message) error {
+	marshaledJSON, err := protobufObjectToJSON(obj)
+	if err != nil {
+		return err
+	}
+	marshaledYAML, err := yaml.JSONToYAML([]byte(marshaledJSON))
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(string(marshaledYAML))
+	return nil
+}
+
+func outputStatusInfo(status proto.Message, info map[string]string, format string) error {
+	statusByte, err := protobufObjectToJSON(status)
 	if err != nil {
 		return err
 	}