stembuild: simplify version package

Author: aramprice

stembuild/Makefile

@@ -1,6 +1,6 @@
 GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*")
 STEMCELL_VERSION = $(shell echo "$${STEMBUILD_VERSION}")
-LD_FLAGS = "-w -s -X github.com/cloudfoundry/bosh-windows-stemcell-builder/stembuild/version.Version=${STEMCELL_VERSION}"
+LD_FLAGS = "-w -s -X github.com/cloudfoundry/bosh-windows-stemcell-builder/stembuild/version.Current=${STEMCELL_VERSION}"
 
 ifeq ($(OS),Windows_NT)
 	COMMAND = out/stembuild.exe
@@ -31,7 +31,7 @@ out/stembuild.exe : assets $(GOSRC)
 	GOOS=windows CGO_ENABLED=0 go build -o out/stembuild.exe -ldflags $(LD_FLAGS) .
 
 clean :
-	rm -rf version/version.go assets/StemcellAutomation.zip out/*
+	rm -rf assets/StemcellAutomation.zip out/*
 
 units : stubbed-stemcell-automation-zip
 	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --skip-package integration,iaas_cli

stembuild/commandparser/help.go

@@ -63,7 +63,7 @@ func (h *stembuildHelp) Execute(c context.Context, f *flag.FlagSet, args ...inte
 
 func (h *stembuildHelp) Explain(w io.Writer) {
 
-	fmt.Fprintf(w, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Version) //nolint:errcheck
+	fmt.Fprintf(w, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Current) //nolint:errcheck
 	fmt.Fprintf(w, "Usage: %s <global options> <command> <command flags>\n\n", path.Base(os.Args[0]))           //nolint:errcheck
 
 	fmt.Fprint(w, "Commands:\n") //nolint:errcheck

stembuild/commandparser/help_test.go

@@ -21,15 +21,15 @@ var _ = Describe("help", func() {
 	// struct variables. This adds a bit of protection when renaming flag parameters.
 	Describe("Explain", func() {
 		It("shows the correct version", func() {
-			version.Version = "1.56"
+			version.Current = "1.56"
 			buf := bytes.Buffer{}
 			fs := flag.NewFlagSet(path.Base(os.Args[0]), flag.ExitOnError)
 			commands := make([]subcommands.Command, 0)
 			sb := commandparser.NewStembuildHelp(subcommands.DefaultCommander, fs, &commands)
 
 			sb.Explain(&buf)
 
-			expectedString := fmt.Sprintf("%s version %s, Windows Stemcell Building Tool", path.Base(os.Args[0]), version.Version)
+			expectedString := fmt.Sprintf("%s version %s, Windows Stemcell Building Tool", path.Base(os.Args[0]), version.Current)
 			Expect(buf.String()).To(ContainSubstring(expectedString))
 		})
 	})

stembuild/construct/factory.go

@@ -47,7 +47,7 @@ func (f *Factory) New(config config.SourceConfig, vCenterManager commandparser.V
 		GuestManager: guestManager,
 		Unarchiver:   &archive.Zip{},
 	}
-	versionGetter := version.NewVersionGetter()
+	versionGetter := version.New()
 
 	winRmClientFactory := remotemanager.NewWinRmClientFactory(config.GuestVmIp, config.GuestVMUsername, config.GuestVMPassword)
 	remoteManager := remotemanager.NewWinRM(config.GuestVmIp, config.GuestVMUsername, config.GuestVMPassword, winRmClientFactory)

stembuild/main.go

@@ -35,7 +35,7 @@ func main() {
 	}
 
 	var gf commandparser.GlobalFlags
-	packageCmd := commandparser.NewPackageCommand(version.NewVersionGetter(), &packager.Factory{}, &commandparser.PackageMessenger{Output: os.Stderr})
+	packageCmd := commandparser.NewPackageCommand(version.New(), &packager.Factory{}, &commandparser.PackageMessenger{Output: os.Stderr})
 	packageCmd.GlobalFlags = &gf
 	constructCmd := commandparser.NewConstructCmd(context.Background(), &construct.Factory{}, &vcenter_manager.ManagerFactory{}, &commandparser.ConstructValidator{}, &commandparser.ConstructCmdMessenger{OutputChannel: os.Stderr})
 	constructCmd.GlobalFlags = &gf
@@ -65,7 +65,7 @@ func main() {
 
 	fs.Parse(os.Args[1:]) //nolint:errcheck
 	if gf.ShowVersion {
-		fmt.Fprintf(os.Stdout, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Version) //nolint:errcheck
+		fmt.Fprintf(os.Stdout, "%s version %s, Windows Stemcell Building Tool\n\n", path.Base(os.Args[0]), version.Current) //nolint:errcheck
 		os.Remove(s)                                                                                                        //nolint:errcheck
 		os.Exit(0)
 	}

stembuild/version/get_versions.go

@@ -0,0 +1,38 @@
+package version
+
+import (
+	"fmt"
+	"strings"
+)
+
+var Current = "dev"
+
+func New() *Getter {
+	return &Getter{
+		Version: Current,
+	}
+}
+
+type Getter struct {
+	Version string
+}
+
+func (g *Getter) GetVersion() string {
+	majorMinor := g.versionArray()[0:2]
+
+	return strings.Join(majorMinor, ".")
+}
+
+func (g *Getter) GetVersionWithPatchNumber(patchNumber string) string {
+	return fmt.Sprintf("%s.%s", g.GetVersion(), patchNumber)
+}
+
+func (g *Getter) GetOs() string {
+	osIdentifier := g.versionArray()[0]
+
+	return osIdentifier
+}
+
+func (g *Getter) versionArray() []string {
+	return strings.Split(g.Version, ".")
+}

stembuild/version/version.go

@@ -7,18 +7,10 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-type VModifier struct {
-	newVersionNumber string
-}
-
-func (m *VModifier) Modify(v *version.VersionGetter) {
-	v.Version = m.newVersionNumber
-}
-
 var _ = Describe("Version Utilities", func() {
 	Describe("GetVersion", func() {
 		It("should return a properly formatted version number", func() {
-			versionGetter := version.NewVersionGetter(&VModifier{"2019.123.13"})
+			versionGetter := version.Getter{Version: "2019.123.13"}
 
 			stemcellVersion := versionGetter.GetVersion()
 			Expect(stemcellVersion).To(Equal("2019.123"))
@@ -27,7 +19,7 @@ var _ = Describe("Version Utilities", func() {
 
 	Describe("GetVersionWithPatchNumber", func() {
 		It("returns a version number with a patch number when provided", func() {
-			versionGetter := version.NewVersionGetter(&VModifier{"2019.5.13"})
+			versionGetter := version.Getter{Version: "2019.5.13"}
 
 			stemcellVersion := versionGetter.GetVersionWithPatchNumber("2")
 			Expect(stemcellVersion).To(Equal("2019.5.2"))
@@ -36,7 +28,7 @@ var _ = Describe("Version Utilities", func() {
 
 	Describe("GetOs", func() {
 		It("should returns the first part of a '.' separated string", func() {
-			versionGetter := version.NewVersionGetter(&VModifier{"111.222.333"})
+			versionGetter := version.Getter{Version: "111.222.333"}
 
 			os := versionGetter.GetOs()
 			Expect(os).To(Equal("111"))