Add operator version to output of px get viziers command.

htroisi · copybaranaut · commit ec4eaa891bfa · 2022-10-04T15:39:14.000Z
Summary: Depends on D12319. Pixie now stores the operator version in Cloud DB. This diff makes that information available in the output of the `px get viziers` CLI command. {F196108} Test Plan: Skaffold cloud + operator + vizier (to test recent related infra changes), then build the CLI locally to test changes. Reviewers: vihang, michelle Reviewed By: vihang, michelle Signed-off-by: Hannah Troisi <htroisi@pixielabs.ai> Differential Revision: https://phab.corp.pixielabs.ai/D12332 GitOrigin-RevId: 7b884ab8a563592d2053a12f8e4318b75f5d8936
diff --git a/src/pixie_cli/pkg/cmd/get.go b/src/pixie_cli/pkg/cmd/get.go
@@ -114,7 +114,7 @@ var GetViziersCmd = &cobra.Command{
 
 		w := components.CreateStreamWriter(format, os.Stdout)
 		defer w.Finish()
-		w.SetHeader("viziers", []string{"ClusterName", "ID", "K8s Version", "Vizier Version", "Last Heartbeat", "Status", "Status Message"})
+		w.SetHeader("viziers", []string{"ClusterName", "ID", "K8s Version", "Operator Version", "Vizier Version", "Last Heartbeat", "Status", "Status Message"})
 
 		for _, vz := range vzs {
 			var lastHeartbeat interface{}
@@ -126,26 +126,31 @@ var GetViziersCmd = &cobra.Command{
 							time.Since(time.Unix(0, vz.LastHeartbeatNs)).Nanoseconds()))
 				}
 			}
-			sb := strings.Builder{}
-
-			// Parse the version to pretty print it.
-			if sv, err := semver.Parse(vz.VizierVersion); err == nil {
-				sb.WriteString(fmt.Sprintf("%d.%d.%d", sv.Major, sv.Minor, sv.Patch))
-				for idx, pre := range sv.Pre {
-					if idx == 0 {
-						sb.WriteString("-")
-					} else {
-						sb.WriteString(".")
-					}
-					sb.WriteString(pre.String())
-				}
-			}
-			_ = w.Write([]interface{}{vz.ClusterName, utils.UUIDFromProtoOrNil(vz.ID), vz.ClusterVersion, sb.String(),
-				lastHeartbeat, vz.Status, vz.StatusMessage})
+			_ = w.Write([]interface{}{vz.ClusterName, utils.UUIDFromProtoOrNil(vz.ID), vz.ClusterVersion,
+				prettyVersion(vz.OperatorVersion), prettyVersion(vz.VizierVersion), lastHeartbeat, vz.Status, vz.StatusMessage})
 		}
 	},
 }
 
+// prettyVersion returns a pretty form of the version string.
+func prettyVersion(version string) string {
+	sb := strings.Builder{}
+	sv, err := semver.Parse(version)
+	if err != nil {
+		return ""
+	}
+	sb.WriteString(fmt.Sprintf("%d.%d.%d", sv.Major, sv.Minor, sv.Patch))
+	for idx, pre := range sv.Pre {
+		if idx == 0 {
+			sb.WriteString("-")
+		} else {
+			sb.WriteString(".")
+		}
+		sb.WriteString(pre.String())
+	}
+	return sb.String()
+}
+
 // GetClusterCmd is the "get cluster" command to get information about the current kubeconfig cluster.
 var GetClusterCmd = &cobra.Command{
 	Use:   "cluster",
