add BranchVersion to tools/setup-envtest to show binary version

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

Makefile

@@ -39,6 +39,7 @@ export GOPROXY
 # Active module mode, as we use go modules to manage dependencies
 export GO111MODULE=on
 
+BRANCHVERSION := $(shell git symbolic-ref --short HEAD)
 # Hosts running SELinux need :z added to volume mounts
 SELINUX_ENABLED := $(shell cat /sys/fs/selinux/enforce 2> /dev/null || echo 0)
 
@@ -174,7 +175,7 @@ release-binary: $(RELEASE_DIR)
 		-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
 		-w /workspace/tools/setup-envtest \
 		golang:$(GO_VERSION) \
-		go build -a -trimpath -ldflags "-extldflags '-static'" \
+		go build -a -trimpath -ldflags "-X 'main.BranchVersion=$(BRANCHVERSION)' -extldflags '-static'" \
 		-o ./out/$(RELEASE_BINARY) ./
 
 ## --------------------------------------

tools/setup-envtest/main.go

@@ -51,6 +51,8 @@ var (
 		"directory to store binary assets (default: $OS_SPECIFIC_DATA_DIR/envtest-binaries)")
 
 	index = flag.String("index", remote.DefaultIndexURL, "index to discover envtest binaries")
+
+	BranchVersion = "unknown"
 )
 
 // TODO(directxman12): handle interrupts?
@@ -256,7 +258,6 @@ Environment Variables:
 		version = flag.Arg(1)
 	}
 	env := setupEnv(globalLog, version)
-
 	// perform our main set of actions
 	switch action := flag.Arg(0); action {
 	case "use":
@@ -274,6 +275,10 @@ Environment Variables:
 			Input:       os.Stdin,
 			PrintFormat: printFormat,
 		}.Do(env)
+	case "version":
+		workflows.Version{
+			BinaryVersion: BranchVersion,
+		}.Do(env)
 	default:
 		flag.Usage()
 		envp.Exit(2, "unknown action %q", action)

tools/setup-envtest/workflows/workflows.go

@@ -5,6 +5,7 @@ package workflows
 
 import (
 	"context"
+	"fmt"
 	"io"
 
 	"github.com/go-logr/logr"
@@ -85,3 +86,11 @@ func (f Sideload) Do(env *envp.Env) {
 	env.Sideload(ctx, f.Input)
 	env.PrintInfo(f.PrintFormat)
 }
+
+type Version struct {
+	BinaryVersion string
+}
+
+func (v Version) Do(env *envp.Env) {
+	fmt.Fprintf(env.Out, "setup-envtest version: %s\n", v.BinaryVersion)
+}