Merge pull request #676 from jmpsec/version-cli-admin-fix

Fix for `--version` in `osctrl-admin`

Author: javuto

.goreleaser.yml

@@ -43,9 +43,9 @@ builds:
       - arm64
     ldflags:
       - -s -w
-      - -X main.version={{.Version}}
-      - -X main.commit={{.Commit}}
-      - -X main.date={{.Date}}
+      - -X main.buildVersion={{.Version}}
+      - -X main.buildCommit={{.Commit}}
+      - -X main.buildDate={{.Date}}
 
   - id: osctrl-api
     main: ./cmd/api

Makefile

@@ -52,11 +52,11 @@ tls-static:
 
 # Build Admin UI
 admin:
-	go build -o $(OUTPUT)/$(ADMIN_NAME) $(ADMIN_CODE)
+	go build $(BUILD_ARGS) -o $(OUTPUT)/$(ADMIN_NAME) $(ADMIN_CODE)
 
 # Build Admin UI statically
 admin-static:
-	go build $(STATIC_ARGS) -o $(OUTPUT)/$(ADMIN_NAME) -a $(ADMIN_CODE)
+	go build $(BUILD_ARGS) $(STATIC_ARGS) -o $(OUTPUT)/$(ADMIN_NAME) -a $(ADMIN_CODE)
 
 # Build API
 api:

cmd/admin/main.go

@@ -73,6 +73,13 @@ const (
 	defaultInactive int = 72
 )
 
+// Build-time metadata (overridden via -ldflags "-X main.buildVersion=... -X main.buildCommit=... -X main.buildDate=...")
+var (
+	buildVersion = serviceVersion
+	buildCommit  = "unknown"
+	buildDate    = "unknown"
+)
+
 // Global general variables
 var (
 	err         error
@@ -649,9 +656,19 @@ func main() {
 	app = cli.NewApp()
 	app.Name = serviceName
 	app.Usage = appDescription
-	app.Version = serviceVersion
+	app.Version = buildVersion
 	app.Description = appDescription
 	app.Flags = flags
+	// Customize version output (supports `--version` and `version` command)
+	cli.VersionPrinter = func(c *cli.Context) {
+		fmt.Printf("%s version=%s commit=%s date=%s\n", serviceName, buildVersion, buildCommit, buildDate)
+	}
+	// Add -v alias to the global --version flag
+	cli.VersionFlag = &cli.BoolFlag{
+		Name:    "version",
+		Aliases: []string{"v"},
+		Usage:   "Print version information",
+	}
 	// Define this command for help to exit when help flag is passed
 	app.Commands = []*cli.Command{
 		{
@@ -662,13 +679,19 @@ func main() {
 			},
 		},
 	}
-	app.Action = cliAction
+	// Start service only for default action; version/help won't trigger this
+	app.Action = func(c *cli.Context) error {
+		if err := cliAction(c); err != nil {
+			return err
+		}
+		// Initialize service logger
+		initializeLoggers(flagParams.ConfigValues)
+		// Service starts!
+		osctrlAdminService()
+		return nil
+	}
 	if err := app.Run(os.Args); err != nil {
 		fmt.Printf("app.Run error: %s", err.Error())
 		os.Exit(1)
 	}
-	// Initialize service logger
-	initializeLoggers(flagParams.ConfigValues)
-	// Service starts!
-	osctrlAdminService()
 }

cmd/tls/main.go

@@ -419,7 +419,6 @@ func main() {
 	app.Version = buildVersion
 	app.Description = appDescription
 	app.Flags = flags
-
 	// Customize version output (supports `--version` and `version` command)
 	cli.VersionPrinter = func(c *cli.Context) {
 		fmt.Printf("%s version=%s commit=%s date=%s\n", serviceName, buildVersion, buildCommit, buildDate)
@@ -430,7 +429,6 @@ func main() {
 		Aliases: []string{"v"},
 		Usage:   "Print version information",
 	}
-
 	// Define commands
 	app.Commands = []*cli.Command{
 		{