support for json flag

.github/workflows/ci.yml

@@ -45,6 +45,8 @@ jobs:
         with:
           version: latest
           args: build --snapshot --skip-post-hooks
+        env:
+          GOVERSION: ${{ steps.go-version.outputs.content }}
 
   test:
     runs-on: ${{ matrix.os }}
@@ -94,7 +96,7 @@ jobs:
       -
         name: Run tests
         run: make test
-      - 
+      -
         name: Upload code coverage report
         uses: codecov/codecov-action@v1
         with:

internal/cmd/version_command.go

@@ -11,15 +11,26 @@ import (
 
 type VersionOutput struct {
 	Version string `json:"version"`
+
+	BuildGoVersion string `json:"go_version,omitempty"`
+	BuildGoOS      string `json:"go_os,omitempty"`
+	BuildGoArch    string `json:"go_arch,omitempty"`
 }
 
 type VersionCommand struct {
-	Ui      cli.Ui
-	Version string
+	Ui        cli.Ui
+	Version   string
+	BuildInfo *BuildInfo
 
 	jsonOutput bool
 }
 
+type BuildInfo struct {
+	GoVersion string
+	GoOS      string
+	GoArch    string
+}
+
 func (c *VersionCommand) flags() *flag.FlagSet {
 	fs := defaultFlagSet("version")
 
@@ -37,10 +48,14 @@ func (c *VersionCommand) Run(args []string) int {
 		return 1
 	}
 
+	output := VersionOutput{
+		Version:        c.Version,
+		BuildGoVersion: c.BuildInfo.GoVersion,
+		BuildGoOS:      c.BuildInfo.GoOS,
+		BuildGoArch:    c.BuildInfo.GoArch,
+	}
+
 	if c.jsonOutput {
-		output := VersionOutput{
-			Version: c.Version,
-		}
 		jsonOutput, err := json.MarshalIndent(output, "", "  ")
 		if err != nil {
 			c.Ui.Error(fmt.Sprintf("\nError marshalling JSON: %s", err))
@@ -50,7 +65,12 @@ func (c *VersionCommand) Run(args []string) int {
 		return 0
 	}
 
-	c.Ui.Output(string(c.Version))
+	ver := string(c.Version)
+	if output.BuildGoVersion != "" && output.BuildGoOS != "" && output.BuildGoArch != "" {
+		ver = fmt.Sprintf("%s\ngo%s %s/%s", c.Version, output.BuildGoVersion, output.BuildGoOS, output.BuildGoArch)
+	}
+
+	c.Ui.Output(ver)
 	return 0
 }
 

main.go

@@ -47,6 +47,11 @@ func main() {
 			return &cmd.VersionCommand{
 				Ui:      ui,
 				Version: VersionString(),
+				BuildInfo: &cmd.BuildInfo{
+					GoVersion: buildGoVersion,
+					GoOS:      buildGoOS,
+					GoArch:    buildGoArch,
+				},
 			}, nil
 		},
 	}

version.go

@@ -31,14 +31,7 @@ func init() {
 // VersionString returns the complete version string, including prerelease
 func VersionString() string {
 	if prerelease != "" {
-		return buildInfo(fmt.Sprintf("%s-%s", version, prerelease))
-	}
-
-	return buildInfo(version)
-}
-func buildInfo(version string) string {
-	if buildGoVersion != "" && buildGoOS != "" && buildGoArch != "" {
-		return fmt.Sprintf("%s\ngo%s %s/%s", version, buildGoVersion, buildGoOS, buildGoArch)
+		return fmt.Sprintf("%s-%s", version, prerelease)
 	}
 	return version
 }