Move binary version variables to a seperate package

Author: a-hilaly

Makefile

@@ -9,9 +9,10 @@ AWS_SERVICE=$(shell echo $(SERVICE) | tr '[:upper:]' '[:lower:]')
 VERSION ?= "v0.0.0"
 GITCOMMIT=$(shell git rev-parse HEAD)
 BUILDDATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-GO_LDFLAGS=-ldflags "-X main.version=$(VERSION) \
-			-X main.buildHash=$(GITCOMMIT) \
-			-X main.buildDate=$(BUILDDATE)"
+IMPORT_PATH=github.com/aws-controllers-k8s/code-generator
+GO_LDFLAGS=-ldflags "-X $(IMPORT_PATH)/pkg/version.Version=$(VERSION) \
+			-X $(IMPORT_PATH)/pkg/version.BuildHash=$(GITCOMMIT) \
+			-X $(IMPORT_PATH)/pkg/version.BuildDate=$(BUILDDATE)"
 
 # We need to use the codegen tag when building and testing because the
 # aws-sdk-go/private/model/api package is gated behind a build tag "codegen"...

cmd/ack-generate/command/root.go

@@ -30,9 +30,6 @@ A tool to generate AWS service controller code`
 )
 
 var (
-	version                string
-	buildHash              string
-	buildDate              string
 	defaultCacheDir        string
 	optCacheDir            string
 	optRefreshCache        bool
@@ -125,11 +122,7 @@ func init() {
 // Execute adds all child commands to the root command and sets flags
 // appropriately. This is called by main.main(). It only needs to happen once
 // to the rootCmd.
-func Execute(v string, bh string, bd string) {
-	version = v
-	buildHash = bh
-	buildDate = bd
-
+func Execute() {
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}

cmd/ack-generate/command/version.go

@@ -15,9 +15,10 @@ package command
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/spf13/cobra"
+
+	"github.com/aws-controllers-k8s/code-generator/pkg/version"
 )
 
 const debugHeader = `Date: %s
@@ -31,8 +32,7 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Display the version of " + appName,
 	Run: func(cmd *cobra.Command, args []string) {
-		goVersion := fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)
-		fmt.Printf(debugHeader, buildDate, goVersion, version, buildHash)
+		fmt.Printf(debugHeader, version.BuildDate, version.GoVersion, version.Version, version.BuildHash)
 	},
 }
 

cmd/ack-generate/main.go

@@ -17,15 +17,6 @@ import (
 	"github.com/aws-controllers-k8s/code-generator/cmd/ack-generate/command"
 )
 
-var (
-	// version of application at compile time (-X 'main.version=$(VERSION)').
-	version = "(Unknown Version)"
-	// buildHash GIT hash of application at compile time (-X 'main.buildHash=$(GITCOMMIT)').
-	buildHash = "No Git-hash Provided."
-	// buildDate of application at compile time (-X 'main.buildDate=$(BUILDDATE)').
-	buildDate = "No Build Date Provided."
-)
-
 func main() {
-	command.Execute(version, buildHash, buildDate)
+	command.Execute()
 }

pkg/version/version.go

@@ -0,0 +1,34 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package version
+
+import (
+	"fmt"
+	"runtime"
+)
+
+var (
+	// BuildDate of application at compile time (-X 'main.buildDate=$(BUILDDATE)').
+	BuildDate string = "No Build Date Provided."
+	// Version of application at compile time (-X 'main.version=$(VERSION)').
+	Version string = "(Unknown Version)"
+	// BuildHash is the GIT hash of application at compile time (-X 'main.buildHash=$(GITCOMMIT)').
+	BuildHash string = "No Git-hash Provided."
+	// GoVersion is the Go compiler version used to compile this binary
+	GoVersion string
+)
+
+func init() {
+	GoVersion = fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH)
+}