WIP: version pretty output

Author: vitorfloriano

cmd/cmd.go

@@ -64,7 +64,7 @@ func Run() {
 
 	c, err := cli.New(
 		cli.WithCommandName("kubebuilder"),
-		cli.WithVersion(versionString()),
+		cli.WithVersion(versionMap()),
 		cli.WithCliVersion(getKubebuilderVersion()),
 		cli.WithPlugins(
 			golangv4.Plugin{},

cmd/version.go

@@ -59,17 +59,19 @@ type version struct {
 }
 
 // versionString returns the Full CLI version
-func versionString() string {
+func versionMap() map[string]string {
 	kubeBuilderVersion = getKubebuilderVersion()
-
-	return fmt.Sprintf("Version: %#v", version{
-		kubeBuilderVersion,
-		kubernetesVendorVersion,
-		gitCommit,
-		buildDate,
-		goos,
-		goarch,
-	})
+	
+	version := map[string]string{
+		"kubebuilder": kubeBuilderVersion,
+		"kubernetes": kubernetesVendorVersion,
+		"buildDate": buildDate,
+		"gitCommit": gitCommit,
+		"os": goos,
+		"arch": goarch,
+	}
+	
+	return version
 }
 
 // getKubebuilderVersion returns only the CLI version string

pkg/cli/cli.go

@@ -49,7 +49,7 @@ type CLI struct {
 	// Root command name. It is injected downstream to provide correct help, usage, examples and errors.
 	commandName string
 	// Full CLI version string.
-	version string
+	version map[string]string
 	// CLI version string (just the CLI version number, no extra information).
 	cliVersion string
 	// CLI root's command description.
@@ -527,7 +527,7 @@ func (c *CLI) addSubcommands() {
 
 	// kubebuilder version
 	// Only add version if a version string was provided
-	if c.version != "" {
+	if c.version != nil {
 		c.cmd.AddCommand(c.newVersionCmd())
 	}
 }

pkg/cli/cli_test.go

@@ -623,7 +623,14 @@ plugins:
 
 		When("providing a version string", func() {
 			It("should create a valid CLI", func() {
-				const version = "version string"
+				version := map[string]string{
+					"kubebuilder": "123",
+					"kubernetes": "123",
+					"buildDate": "2025/12/3",
+					"gitCommit": "0123fasdf0123",
+					"os": "os123",
+					"arch": "arch123",
+				}
 				c, err = New(
 					WithPlugins(&golangv4.Plugin{}),
 					WithDefaultPlugins(projectVersion, &golangv4.Plugin{}),
@@ -648,7 +655,19 @@ plugins:
 				Expect(err).NotTo(HaveOccurred())
 				printed, _ := io.ReadAll(r)
 				Expect(string(printed)).To(Equal(
-					fmt.Sprintf("%s\n", version)))
+					fmt.Sprintf(`Kubebuilder:    %v
+Kubernetes:     %v
+Git Commit:     %v
+Build date:     %v
+OS/Arch:        %v/%v
+`,
+					version["kubebuilder"],
+					version["kubernetes"],
+					version["gitCommit"],
+					version["buildDate"],
+					version["os"],
+					version["arch"],
+					)))
 			})
 		})
 

pkg/cli/options.go

@@ -50,7 +50,7 @@ func WithCommandName(name string) Option {
 }
 
 // WithVersion is an Option that defines the version string of the CLI.
-func WithVersion(version string) Option {
+func WithVersion(version map[string]string) Option {
 	return func(c *CLI) error {
 		c.version = version
 		return nil

pkg/cli/options_test.go

@@ -540,7 +540,14 @@ var _ = Describe("CLI options", func() {
 
 	Context("WithVersion", func() {
 		It("should use the provided version string", func() {
-			version := "Version: 0.0.0"
+			version := map[string]string{
+				"kubebuilder": "123",
+				"kubernetes": "123",
+				"buildDate": "2025/12/3",
+				"gitCommit": "0123fasdf0123",
+				"os": "os123",
+				"arch": "arch123",
+			}
 			c, err = newCLI(WithVersion(version))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(c).NotTo(BeNil())

pkg/cli/version.go

@@ -29,7 +29,19 @@ func (c CLI) newVersionCmd() *cobra.Command {
 		Long:    fmt.Sprintf("Print the %s version", c.commandName),
 		Example: fmt.Sprintf("%s version", c.commandName),
 		RunE: func(_ *cobra.Command, _ []string) error {
-			fmt.Println(c.version)
+			fmt.Printf(`Kubebuilder:    %v
+Kubernetes:     %v
+Git Commit:     %v
+Build date:     %v
+OS/Arch:        %v/%v
+`,
+			c.version["kubebuilder"],
+			c.version["kubernetes"],
+			c.version["gitCommit"],
+			c.version["buildDate"],
+			c.version["os"],
+			c.version["arch"],
+			)
 			return nil
 		},
 	}