Merge pull request #1002 from laverya/improve-version-output

improve version command output and fix git sha

Author: laverya

Diff for: deploy/.goreleaser.unstable.yml

@@ -25,7 +25,7 @@ builds:
   main: cmd/ship/main.go
   ldflags: -s -w 
     -X github.com/replicatedhq/ship/pkg/version.version={{.Version}}
-    -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
+    -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.FullCommit}}
     -X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
     -X github.com/replicatedhq/ship/pkg/version.helm=v2.14.1
     -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3

Diff for: deploy/.goreleaser.yml

@@ -25,7 +25,7 @@ builds:
   main: cmd/ship/main.go
   ldflags: -s -w
     -X github.com/replicatedhq/ship/pkg/version.version={{.Version}}
-    -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
+    -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.FullCommit}}
     -X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
     -X github.com/replicatedhq/ship/pkg/version.helm=v2.14.1
     -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3

Diff for: pkg/version/version.go

@@ -1,6 +1,9 @@
 package version
 
-import "time"
+import (
+	"runtime"
+	"time"
+)
 
 var (
 	build Build
@@ -13,6 +16,7 @@ type Build struct {
 	BuildTime    time.Time         `json:"buildTime,omitempty"`
 	TimeFallback string            `json:"buildTimeFallback,omitempty"`
 	Dependencies BuildDependencies `json:"dependencies,omitempty"`
+	GoInfo       GoInfo            `json:"go,omitempty"`
 }
 
 type BuildDependencies struct {
@@ -21,6 +25,13 @@ type BuildDependencies struct {
 	Terraform string `json:"terraform,omitempty"`
 }
 
+type GoInfo struct {
+	Version  string `json:"version,omitempty"`
+	Compiler string `json:"compiler,omitempty"`
+	OS       string `json:"os,omitempty"`
+	Arch     string `json:"arch,omitempty"`
+}
+
 // initBuild sets up the version info from build args
 func initBuild() {
 	build.Version = version
@@ -39,6 +50,8 @@ func initBuild() {
 		Terraform: terraform,
 	}
 	build.Dependencies = deps
+
+	build.GoInfo = getGoInfo()
 }
 
 // GetBuild gets the build
@@ -60,3 +73,12 @@ func GitSHA() string {
 func BuildTime() time.Time {
 	return build.BuildTime
 }
+
+func getGoInfo() GoInfo {
+	return GoInfo{
+		Version:  runtime.Version(),
+		Compiler: runtime.Compiler,
+		OS:       runtime.GOOS,
+		Arch:     runtime.GOARCH,
+	}
+}

Diff for: pkg/version/version_test.go

@@ -0,0 +1,142 @@
+package version
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestVersion(t *testing.T) {
+	tests := []struct {
+		name string
+		want string
+	}{
+		{
+			name: "empty",
+			want: "",
+		},
+		{
+			name: "version string",
+			want: "v0.1.2",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+
+			version = tt.want
+			initBuild()
+
+			got := Version()
+			req.Equal(tt.want, got)
+		})
+	}
+}
+
+func TestGitSHA(t *testing.T) {
+	tests := []struct {
+		name string
+		sha  string
+		want string
+	}{
+		{
+			name: "empty",
+			sha:  "",
+			want: "",
+		},
+		{
+			name: "too short",
+			sha:  "123456",
+			want: "",
+		},
+		{
+			name: "7 chars",
+			sha:  "1234567",
+			want: "1234567",
+		},
+		{
+			name: "full sha",
+			sha:  "e21cf800acca2aa972e7f5f65f7134b5da92f05f",
+			want: "e21cf80",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+
+			gitSHA = tt.sha
+			initBuild()
+
+			got := GitSHA()
+			req.Equal(tt.want, got)
+		})
+	}
+}
+
+func TestBuildTime(t *testing.T) {
+	req := require.New(t)
+	aTime, err := time.Parse(time.RFC3339, "2019-06-26T18:53:19Z")
+	req.NoError(err, "parse constant time")
+
+	tests := []struct {
+		name       string
+		timestring string
+		want       time.Time
+	}{
+		{
+			name:       "empty",
+			timestring: "",
+			want:       time.Time{},
+		},
+		{
+			name:       "proper format",
+			timestring: "2019-06-26T18:53:19Z",
+			want:       aTime,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+
+			buildTime = tt.timestring
+			initBuild()
+
+			got := BuildTime()
+			req.Equal(tt.want, got)
+		})
+	}
+}
+
+func TestGetBuild(t *testing.T) {
+	tests := []struct {
+		name      string
+		gitSHA    string
+		version   string
+		buildTime string
+		want      Build
+	}{
+		{
+			name:   "goInfo",
+			gitSHA: "12345678",
+			want: Build{
+				GitSHA: "1234567",
+				GoInfo: getGoInfo(),
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			req := require.New(t)
+
+			version = tt.version
+			gitSHA = tt.gitSHA
+			buildTime = tt.buildTime
+
+			initBuild()
+
+			got := GetBuild()
+			req.Equal(tt.want, got)
+		})
+	}
+}