Add actual version printing for toolhive (#132)

Signed-off-by: Juan Antonio Osorio <ozz@stacklok.com>

Author: JAORMX

.gitignore

@@ -29,6 +29,6 @@ go.work
 /coverage/
 
 .roo/
-thv
+^thv$
 
-kconfig.yaml
+kconfig.yaml

.goreleaser.yaml

@@ -12,11 +12,9 @@ builds:
       - -tags=netgo
     ldflags:
       - "-s -w"
-      - "-X main.Version={{ .Env.VERSION }}"
-      - "-X main.Commit={{ .Env.COMMIT }}"
-      - "-X main.CommitDate={{ .Env.COMMIT_DATE }}"
-      - "-X main.TreeState={{ .Env.TREE_STATE }}"
-#      - "-X github.com/stacklok/toolhive/---/cli.CLIVersion={{ .Env.VERSION }}"
+      - "-X github.com/stacklok/toolhive/cmd/thv.Version={{ .Version }}"
+      - "-X github.com/stacklok/toolhive/cmd/thv.Commit={{ .Commit }}"
+      - "-X github.com/stacklok/toolhive/cmd/thv.BuildDate={{ .Date }}"
     goos:
       - linux
 #      - windows

Taskfile.yml

@@ -28,14 +28,28 @@ tasks:
 
   build:
     desc: Build the binary
+    vars:
+      VERSION:
+        sh: git describe --tags --always --dirty || echo "dev"
+      COMMIT:
+        sh: git rev-parse --short HEAD || echo "unknown"
+      BUILD_DATE:
+        sh: date -u +"%Y-%m-%dT%H:%M:%SZ"
     cmds:
       - mkdir -p bin
-      - go build -o bin/thv ./cmd/thv
+      - go build -ldflags "-s -w -X github.com/stacklok/toolhive/cmd/thv.Version={{.VERSION}} -X github.com/stacklok/toolhive/cmd/thv.Commit={{.COMMIT}} -X github.com/stacklok/toolhive/cmd/thv.BuildDate={{.BUILD_DATE}}" -o bin/thv ./cmd/thv
 
   install:
     desc: Install the thv binary to GOPATH/bin
+    vars:
+      VERSION:
+        sh: git describe --tags --always --dirty || echo "dev"
+      COMMIT:
+        sh: git rev-parse --short HEAD || echo "unknown"
+      BUILD_DATE:
+        sh: date -u +"%Y-%m-%dT%H:%M:%SZ"
     cmds:
-      - go install -v ./cmd/thv
+      - go install -ldflags "-s -w -X github.com/stacklok/toolhive/cmd/thv.Version={{.VERSION}} -X github.com/stacklok/toolhive/cmd/thv.Commit={{.COMMIT}} -X github.com/stacklok/toolhive/cmd/thv.BuildDate={{.BUILD_DATE}}" -v ./cmd/thv
 
   all:
     desc: Run linting, tests, and build

cmd/thv/list.go

@@ -32,7 +32,8 @@ var (
 
 // Constants for list command
 const (
-	defaultHost = "localhost"
+	defaultHost      = "localhost"
+	unknownTransport = "unknown"
 )
 
 // ContainerOutput represents container information for JSON output
@@ -126,7 +127,7 @@ func printJSONOutput(containers []rt.ContainerInfo) error {
 		// Get transport type from labels
 		transport := labels.GetTransportType(c.Labels)
 		if transport == "" {
-			transport = "unknown"
+			transport = unknownTransport
 		}
 
 		// Get tool type from labels
@@ -242,7 +243,7 @@ func printTextOutput(containers []rt.ContainerInfo) {
 		// Get transport type from labels
 		transport := labels.GetTransportType(c.Labels)
 		if transport == "" {
-			transport = "unknown"
+			transport = unknownTransport
 		}
 
 		// Get port from labels

cmd/thv/main.go

@@ -26,14 +26,6 @@ container-based isolation for running MCP servers.`,
 	},
 }
 
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Show the version of ToolHive",
-	Run: func(_ *cobra.Command, _ []string) {
-		logger.Log.Info("ToolHive v0.1.0")
-	},
-}
-
 func init() {
 	// Initialize the logger system
 	logger.Initialize()
@@ -48,7 +40,7 @@ func init() {
 	rootCmd.AddCommand(rmCmd)
 	rootCmd.AddCommand(proxyCmd)
 	rootCmd.AddCommand(restartCmd)
-	rootCmd.AddCommand(versionCmd)
+	rootCmd.AddCommand(newVersionCmd())
 	rootCmd.AddCommand(newLogsCommand())
 	rootCmd.AddCommand(newSecretCommand())
 }

cmd/thv/version.go

@@ -0,0 +1,138 @@
+// Package main provides the entry point for the toolhive command-line application.
+// This file contains the implementation of the 'version' command.
+package main
+
+import (
+	"fmt"
+	"runtime"
+	"runtime/debug"
+	"strings"
+	"time"
+
+	"github.com/spf13/cobra"
+)
+
+const (
+	unknownStr = "unknown"
+)
+
+// Version information set by build using -ldflags
+var (
+	// Version is the current version of ToolHive
+	Version = "dev"
+	// Commit is the git commit hash of the build
+	//nolint:goconst // This is a placeholder for the commit hash
+	Commit = unknownStr
+	// BuildDate is the date when the binary was built
+	// nolint:goconst // This is a placeholder for the build date
+	BuildDate = unknownStr
+)
+
+// versionInfo represents the version information
+type versionInfo struct {
+	Version   string `json:"version"`
+	Commit    string `json:"commit"`
+	BuildDate string `json:"build_date"`
+	GoVersion string `json:"go_version"`
+	Platform  string `json:"platform"`
+}
+
+// newVersionCmd creates a new version command
+func newVersionCmd() *cobra.Command {
+	var jsonOutput bool
+
+	cmd := &cobra.Command{
+		Use:   "version",
+		Short: "Show the version of ToolHive",
+		Long:  `Display detailed version information about ToolHive, including version number, git commit, build date, and Go version.`,
+		Run: func(_ *cobra.Command, _ []string) {
+			info := getVersionInfo()
+
+			if jsonOutput {
+				printJSONVersionInfo(info)
+			} else {
+				printVersionInfo(info)
+			}
+		},
+	}
+
+	cmd.Flags().BoolVar(&jsonOutput, "json", false, "Output version information as JSON")
+
+	return cmd
+}
+
+// getVersionInfo returns the version information
+func getVersionInfo() versionInfo {
+	// If version is still "dev", try to get it from build info
+	ver := Version
+	commit := Commit
+	buildDate := BuildDate
+
+	if ver == "dev" {
+		if info, ok := debug.ReadBuildInfo(); ok {
+			// Try to get version from build info
+			for _, setting := range info.Settings {
+				switch setting.Key {
+				case "vcs.revision":
+					if commit == unknownStr {
+						commit = setting.Value
+					}
+				case "vcs.time":
+					if buildDate == unknownStr {
+						buildDate = setting.Value
+					}
+				}
+			}
+		}
+	}
+
+	// Format the build date if it's a timestamp
+	if buildDate != unknownStr {
+		if t, err := time.Parse(time.RFC3339, buildDate); err == nil {
+			buildDate = t.Format("2006-01-02 15:04:05 MST")
+		}
+	}
+
+	return versionInfo{
+		Version:   ver,
+		Commit:    commit,
+		BuildDate: buildDate,
+		GoVersion: runtime.Version(),
+		Platform:  fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
+	}
+}
+
+// printVersionInfo prints the version information
+func printVersionInfo(info versionInfo) {
+	fmt.Printf("ToolHive %s", info.Version)
+	fmt.Printf("Commit: %s", info.Commit)
+	fmt.Printf("Built: %s", info.BuildDate)
+	fmt.Printf("Go version: %s", info.GoVersion)
+	fmt.Printf("Platform: %s", info.Platform)
+}
+
+// printJSONVersionInfo prints the version information as JSON
+func printJSONVersionInfo(info versionInfo) {
+	// Simple JSON formatting without importing encoding/json
+	jsonStr := fmt.Sprintf(`{
+  "version": "%s",
+  "commit": "%s",
+  "build_date": "%s",
+  "go_version": "%s",
+  "platform": "%s"
+}`,
+		escapeJSON(info.Version),
+		escapeJSON(info.Commit),
+		escapeJSON(info.BuildDate),
+		escapeJSON(info.GoVersion),
+		escapeJSON(info.Platform))
+
+	fmt.Printf("%s", jsonStr)
+}
+
+// escapeJSON escapes special characters in JSON strings
+func escapeJSON(s string) string {
+	s = strings.ReplaceAll(s, `\`, `\\`)
+	s = strings.ReplaceAll(s, `"`, `\"`)
+	return s
+}