fix version info

Author: alexei-led

Makefile

@@ -1,18 +1,20 @@
 MODULE   = $(shell env GO111MODULE=on $(GO) list -m)
 DATE    ?= $(shell date +%FT%T%z)
-VERSION ?= $(shell git describe --tags --always --dirty --match="v*" 2> /dev/null || \
+VERSION ?= $(shell git describe --tags --always --dirty --match="*" 2> /dev/null || \
 			cat $(CURDIR)/.version 2> /dev/null || echo v0)
+COMMIT  ?= $(shell git rev-parse --short HEAD 2>/dev/null)
+BRANCH  ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 PKGS     = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./...))
 TESTPKGS = $(shell env GO111MODULE=on $(GO) list -f \
 			'{{ if or .TestGoFiles .XTestGoFiles }}{{ .ImportPath }}{{ end }}' \
 			$(PKGS))
 BIN      = $(CURDIR)/.bin
-LDFLAGS_VERSION = -X main.Version=$(VERSION) -X main.BuildDate=$(DATE) -X main.GitCommit=$(COMMIT) -X main.GitBranch=$(BRANCH)
 LINT_CONFIG = $(CURDIR)/.golangci.yaml
 PLATFORMS     = darwin linux
 ARCHITECTURES = amd64 arm64
 TARGETOS   ?= $(GOOS)
 TARGETARCH ?= $(GOARCH)
+LDFLAGS_VERSION = -X main.Version=$(VERSION) -X main.BuildDate=$(DATE) -X main.GitCommit=$(COMMIT) -X main.GitBranch=$(BRANCH)
 
 DOCKER  = docker
 GO      = go
@@ -29,7 +31,7 @@ export GOPROXY=https://proxy.golang.org
 all: fmt lint test ; $(info $(M) building executable…) @ ## Build program binary
 	$Q env GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) $(GO) build \
 		-tags release \
-		-ldflags "$(LDFLAGS_VERSION)" \
+		-ldflags "$(LDFLAGS_VERSION) -X main.Platform=$(TARGETOS)/$(TARGETARCH)" \
 		-o $(BIN)/$(basename $(MODULE)) main.go
 
 # Release for multiple platforms
@@ -42,7 +44,7 @@ platfrom-build: clean lint test ; $(info $(M) building binaries for multiple os/
 				GOPROXY=$(GOPROXY) CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) \
 				$(GO) build \
 				-tags release \
-				-ldflags "$(LDFLAGS_VERSION)" \
+				-ldflags "$(LDFLAGS_VERSION) -X main.Platform=$(GOOS)/$(GOARCH)" \
 				-o $(BIN)/$(basename $(MODULE))-$(GOOS)-$(GOARCH) main.go || true)))
 
 # Tools

main.go

@@ -20,14 +20,16 @@ import (
 )
 
 var (
-	// Version contains the current version.
-	version = "dev"
-	// BuildDate contains a string with the build date.
-	date = "unknown"
-	// commit
-	commit = "dirty"
-	// buildBy
-	builtBy = "local"
+	// Version contains the current Version.
+	Version = "dev"
+	// BuildDate contains a string with the build BuildDate.
+	BuildDate = "unknown"
+	// GitCommit git commit sha
+	GitCommit = "dirty"
+	// GitBranch git branch
+	GitBranch = "dirty"
+	// Platform OS/ARCH
+	Platform = ""
 )
 
 func main() {
@@ -42,13 +44,14 @@ func main() {
 		Name:    "secrets-init",
 		Usage:   "enrich environment variables with secrets from secret manager",
 		Action:  mainCmd,
-		Version: version,
+		Version: Version,
 	}
 	cli.VersionPrinter = func(c *cli.Context) {
-		fmt.Printf("secrets-init %s\n", version)
-		fmt.Printf("  build date: %s\n", date)
-		fmt.Printf("  commit: %s\n", commit)
-		fmt.Printf("  built by: %s\n", builtBy)
+		fmt.Printf("version: %s\n", Version)
+		fmt.Printf("  build date: %s\n", BuildDate)
+		fmt.Printf("  commit: %s\n", GitCommit)
+		fmt.Printf("  branch: %s\n", GitBranch)
+		fmt.Printf("  platform: %s\n", Platform)
 		fmt.Printf("  built with: %s\n", runtime.Version())
 	}