From dff2bdc63e80d443d77e74313ca7dbbcabd9168c Mon Sep 17 00:00:00 2001
From: seph <seph@directionless.org>
Date: Wed, 23 Dec 2020 08:51:23 -0500
Subject: [PATCH] Version: Change go_version to based on runtime, add
 additional

Given that go is statically compiled, I'm not sure why GoVersion is
linked at build time, vs using runtime directly.

Also, add it some additional runtime variables. While seemingly
superfluous, these can add clarity in the rosetta2 environment.
---
 version/version.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/version/version.go b/version/version.go
index cd02b25..60044c7 100644
--- a/version/version.go
+++ b/version/version.go
@@ -24,6 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"runtime"
 )
 
 // These values are private which ensures they can only be set with the build flags.
@@ -42,6 +43,8 @@ type Info struct {
 	Version   string `json:"version"`
 	Branch    string `json:"branch"`
 	Revision  string `json:"revision"`
+	GoArch    string `json:"go_arch"`
+	GoOs      string `json:"go_os"`
 	GoVersion string `json:"go_version"`
 	BuildDate string `json:"build_date"`
 	BuildUser string `json:"build_user"`
@@ -53,7 +56,9 @@ func Version() Info {
 		Version:   version,
 		Branch:    branch,
 		Revision:  revision,
-		GoVersion: goVersion,
+		GoArch:    runtime.GOARCH,
+		GoOs:      runtime.GOOS,
+		GoVersion: runtime.Version(),
 		BuildDate: buildDate,
 		BuildUser: buildUser,
 	}
@@ -73,6 +78,8 @@ func PrintFull() {
 	fmt.Printf("  revision: \t%s\n", v.Revision)
 	fmt.Printf("  build date: \t%s\n", v.BuildDate)
 	fmt.Printf("  build user: \t%s\n", v.BuildUser)
+	fmt.Printf("  go arch: \t%s\n", v.GoArch)
+	fmt.Printf("  go os: \t%s\n", v.GoOs)
 	fmt.Printf("  go version: \t%s\n", v.GoVersion)
 }