refactor(cli): move version command out of root (akuity#1556)

Signed-off-by: Hidde Beydals <hidde@hhh.computer>

cmd/cli/root.go

@@ -28,6 +28,7 @@ import (
 	"github.com/akuity/kargo/internal/cli/cmd/promote"
 	"github.com/akuity/kargo/internal/cli/cmd/refresh"
 	"github.com/akuity/kargo/internal/cli/cmd/update"
+	"github.com/akuity/kargo/internal/cli/cmd/version"
 	clicfg "github.com/akuity/kargo/internal/cli/config"
 	"github.com/akuity/kargo/internal/cli/option"
 )
@@ -110,7 +111,7 @@ func NewRootCommand(
 	cmd.AddCommand(update.NewCommand(cfg, opt))
 	cmd.AddCommand(dashboard.NewCommand(cfg))
 	cmd.AddCommand(promote.NewCommand(cfg, opt))
-	cmd.AddCommand(newVersionCommand(cfg, opt))
+	cmd.AddCommand(version.NewCommand(cfg, opt))
 	cmd.AddCommand(
 		cobracompletefig.CreateCompletionSpecCommand(
 			cobracompletefig.Opts{

internal/cli/cmd/version/version.go

@@ -0,0 +1,144 @@
+package version
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"connectrpc.com/connect"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/encoding/protojson"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/utils/ptr"
+
+	kargoapi "github.com/akuity/kargo/api/v1alpha1"
+	typesv1alpha1 "github.com/akuity/kargo/internal/api/types/v1alpha1"
+	"github.com/akuity/kargo/internal/cli/client"
+	"github.com/akuity/kargo/internal/cli/config"
+	"github.com/akuity/kargo/internal/cli/option"
+	versionpkg "github.com/akuity/kargo/internal/version"
+	svcv1alpha1 "github.com/akuity/kargo/pkg/api/service/v1alpha1"
+)
+
+type versionOptions struct {
+	*option.Option
+	Config config.CLIConfig
+
+	ClientOnly bool
+}
+
+func NewCommand(cfg config.CLIConfig, opt *option.Option) *cobra.Command {
+	cmdOpts := &versionOptions{
+		Option: opt,
+		Config: cfg,
+	}
+
+	cmd := &cobra.Command{
+		Use:   "version",
+		Short: "Show the client and server version information",
+		Args:  option.NoArgs,
+		Example: `
+# Print the client and server version information
+kargo version
+
+# Print the client version information only
+kargo version --client
+`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cmdOpts.run(cmd.Context())
+		},
+	}
+
+	// Register the option flags on the command.
+	cmdOpts.addFlags(cmd)
+
+	return cmd
+}
+
+// addFlags adds the flags for the version options to the provided command.
+func (o *versionOptions) addFlags(cmd *cobra.Command) {
+	o.PrintFlags.AddFlags(cmd)
+
+	option.InsecureTLS(cmd.PersistentFlags(), o.Option)
+	option.LocalServer(cmd.PersistentFlags(), o.Option)
+
+	cmd.Flags().BoolVar(&o.ClientOnly, "client", o.ClientOnly, "If true, shows client version only (no server required)")
+}
+
+// run prints the client and server version information.
+func (o *versionOptions) run(ctx context.Context) error {
+	printToStdout := ptr.Deref(o.PrintFlags.OutputFormat, "") == ""
+
+	cliVersion := typesv1alpha1.ToVersionProto(versionpkg.GetVersion())
+	if printToStdout {
+		fmt.Println("Client Version:", cliVersion.GetVersion())
+	}
+
+	var serverVersion *svcv1alpha1.VersionInfo
+	var serverErr error
+	if !o.UseLocalServer && !o.ClientOnly {
+		serverVersion, serverErr = getServerVersion(ctx, o.Config, o.Option)
+	}
+
+	if printToStdout {
+		if serverVersion != nil {
+			fmt.Println("Server Version:", serverVersion.GetVersion())
+		}
+		return serverErr
+	}
+
+	printer, err := o.PrintFlags.ToPrinter()
+	if err != nil {
+		return errors.Wrap(err, "new printer")
+	}
+	obj, err := componentVersionsToRuntimeObject(&svcv1alpha1.ComponentVersions{
+		Server: serverVersion,
+		Cli:    cliVersion,
+	})
+	if err != nil {
+		return errors.Wrap(err, "map component versions to runtime object")
+	}
+
+	if err := printer.PrintObj(obj, o.IOStreams.Out); err != nil {
+		return errors.Wrap(err, "printing object")
+	}
+	return serverErr
+}
+
+func getServerVersion(ctx context.Context, cfg config.CLIConfig, opt *option.Option) (*svcv1alpha1.VersionInfo, error) {
+	if cfg.APIAddress == "" || cfg.BearerToken == "" {
+		return nil, nil
+	}
+
+	kargoSvcCli, err := client.GetClientFromConfig(ctx, cfg, opt)
+	if err != nil {
+		return nil, errors.Wrap(err, "get client from config")
+	}
+	resp, err := kargoSvcCli.GetVersionInfo(
+		ctx,
+		connect.NewRequest(&svcv1alpha1.GetVersionInfoRequest{}),
+	)
+	if err != nil {
+		return nil, errors.Wrap(err, "get version info from server")
+	}
+
+	return resp.Msg.GetVersionInfo(), nil
+}
+
+func componentVersionsToRuntimeObject(v *svcv1alpha1.ComponentVersions) (runtime.Object, error) {
+	data, err := protojson.Marshal(v)
+	if err != nil {
+		return nil, errors.Wrap(err, "marshal component versions")
+	}
+	var content map[string]any
+	if err := json.Unmarshal(data, &content); err != nil {
+		return nil, errors.Wrap(err, "unmarshal component versions")
+	}
+	u := &unstructured.Unstructured{}
+	u.SetUnstructuredContent(content)
+	u.SetAPIVersion(kargoapi.GroupVersion.String())
+	u.SetKind("ComponentVersions")
+	return u, nil
+}

internal/cli/option/flag.go

@@ -41,10 +41,6 @@ func LocalServer(fs *pflag.FlagSet, opt *Option) {
 	fs.BoolVar(&opt.UseLocalServer, "local-server", false, "Use local server")
 }
 
-func ClientVersion(fs *pflag.FlagSet, opt *Option) {
-	fs.BoolVar(&opt.ClientVersionOnly, "client", false, "If true, shows client version only (no server required)")
-}
-
 // Project adds the ProjectFlag and ProjectShortFlag to the provided flag set.
 func Project(fs *pflag.FlagSet, project *string, defaultProject, usage string) {
 	fs.StringVarP(project, ProjectFlag, ProjectShortFlag, defaultProject, usage)

internal/cli/option/option.go

@@ -19,8 +19,6 @@ type Option struct {
 	LocalServerAddress string
 	UseLocalServer     bool
 
-	ClientVersionOnly bool
-
 	Project string
 
 	IOStreams  *genericiooptions.IOStreams