Rename 'crictl info' to 'crictl version' and add verbose for crictl status

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

Author: Yanqiang Miao

cmd/crictl/status.go

@@ -17,6 +17,8 @@ limitations under the License.
 package main
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
 	"os"
 	"text/tabwriter"
@@ -29,10 +31,16 @@ import (
 
 var runtimeStatusCommand = cli.Command{
 	Name:      "status",
-	Usage:     "Display status of the container runtime",
+	Usage:     "Display status and extra information of the container runtime",
 	ArgsUsage: "",
+	Flags: []cli.Flag{
+		cli.BoolFlag{
+			Name:  "verbose, v",
+			Usage: "Shows extra status information",
+		},
+	},
 	Action: func(context *cli.Context) error {
-		err := Status(runtimeClient)
+		err := Status(runtimeClient, context.Bool("verbose"))
 		if err != nil {
 			return fmt.Errorf("Getting status of runtime failed: %v", err)
 		}
@@ -43,8 +51,8 @@ var runtimeStatusCommand = cli.Command{
 }
 
 // Status sends a StatusRequest to the server, and parses the returned StatusResponse.
-func Status(client pb.RuntimeServiceClient) error {
-	request := &pb.StatusRequest{}
+func Status(client pb.RuntimeServiceClient, verbose bool) error {
+	request := &pb.StatusRequest{Verbose: verbose}
 	logrus.Debugf("StatusRequest: %v", request)
 	r, err := client.Status(context.Background(), request)
 	logrus.Debugf("StatusResponse: %v", r)
@@ -57,6 +65,20 @@ func Status(client pb.RuntimeServiceClient) error {
 	for _, c := range r.GetStatus().GetConditions() {
 		fmt.Fprintf(w, "%s\t%v\t%s\t%s\n", c.Type, c.Status, c.Reason, c.Message)
 	}
+	if verbose {
+		fmt.Fprintln(w, "Extra Info: ")
+		for key, value := range r.Info {
+			var buf *bytes.Buffer
+			err := json.Indent(buf, []byte(value), "", "    ")
+			if err != nil {
+				return err
+			}
+
+			fmt.Fprintf(w, " %s: ", key)
+			fmt.Fprintf(w, string(buf.Bytes()))
+		}
+	}
 	w.Flush()
+
 	return nil
 }

cmd/crictl/info.go cmd/crictl/version.go

@@ -30,7 +30,7 @@ const (
 )
 
 var runtimeVersionCommand = cli.Command{
-	Name:  "info",
+	Name:  "version",
 	Usage: "Display runtime version information",
 	Action: func(context *cli.Context) error {
 		err := Version(runtimeClient, criClientVersion)