fix: fix version flag test

Author: Fleezesd

pkg/version/flag.go

@@ -16,7 +16,6 @@ import (
 	"strings"
 
 	flag "github.com/spf13/pflag"
-	"k8s.io/component-base/version"
 )
 
 type versionValue int
@@ -44,7 +43,7 @@ func (v *versionValue) Set(s string) error {
 	}
 
 	if strings.HasPrefix(s, "v") {
-		err := version.SetDynamicVersion(s)
+		err := SetDynamicVersion(s)
 		if err == nil {
 			value, _ := strconv.Atoi(s)
 			*v = versionValue(value)
@@ -98,9 +97,8 @@ func AddFlags(fs *flag.FlagSet) {
 
 // variables for unit testing PrintAndExitIfRequested
 var (
-	appName = "onex-apiserver"
-	output  = io.Writer(os.Stdout)
-	exit    = os.Exit
+	output = io.Writer(os.Stdout)
+	exit   = os.Exit
 )
 
 // PrintAndExitIfRequested will check if the -version flag was passed

pkg/version/flag_test.go

@@ -6,14 +6,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spf13/pflag"
-	"k8s.io/component-base/version"
+	flag "github.com/spf13/pflag"
 )
 
 func TestVersionFlag(t *testing.T) {
-	initialFlagValue := int(*versionFlag)
+	appName := "onex-test"
+	initialFlagValue := *versionFlag
 	initialVersion := Get()
-
 	testcases := []struct {
 		name               string
 		flags              []string
@@ -66,6 +65,13 @@ func TestVersionFlag(t *testing.T) {
 			flags:            []string{"--version=v0.0.0-custom"},
 			expectGitVersion: "v0.0.0-custom",
 		},
+		{
+			name:               "override and exit",
+			flags:              []string{"--version=v0.0.0-custom", "--version"},
+			expectGitVersion:   "v0.0.0-custom",
+			expectExit:         true,
+			expectPrintVersion: appName + " v0.0.0-custom",
+		},
 		{
 			name:        "invalid override semver",
 			flags:       []string{"--version=vX"},
@@ -103,13 +109,13 @@ func TestVersionFlag(t *testing.T) {
 				output = originalOutput
 				exit = originalExit
 				*versionFlag = versionValue(initialFlagValue)
-				err := version.SetDynamicVersion(initialVersion.GitVersion)
+				err := SetDynamicVersion(initialVersion.GitVersion)
 				if err != nil {
 					t.Fatal(err)
 				}
 			})
 
-			fs := pflag.NewFlagSet("test", pflag.ContinueOnError)
+			fs := flag.NewFlagSet("test", flag.ContinueOnError)
 			AddFlags(fs)
 			err := fs.Parse(tc.flags)
 			if tc.expectError != "" {
@@ -124,7 +130,7 @@ func TestVersionFlag(t *testing.T) {
 				t.Fatalf("unexpected parse error: %v", err)
 			}
 
-			if e, a := tc.expectGitVersion, version.Get().GitVersion; e != a {
+			if e, a := tc.expectGitVersion, Get().GitVersion; e != a {
 				t.Fatalf("gitversion: expected %v, got %v", e, a)
 			}
 

pkg/version/version.go

@@ -82,7 +82,7 @@ func Get() Info {
 	// These variables typically come from -ldflags settings and in
 	// their absence fallback to the settings in pkg/version/base.go
 	return Info{
-		GitVersion:   gitVersion,
+		GitVersion:   dynamicGitVersion.Load().(string),
 		GitCommit:    gitCommit,
 		GitTreeState: gitTreeState,
 		BuildDate:    buildDate,