Add OS/Arch information in the krew version CLI output to help with diagnostics. (#484)

Author: tony-yang

cmd/krew/cmd/version.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"sigs.k8s.io/krew/internal/installation"
 	"sigs.k8s.io/krew/internal/version"
 	"sigs.k8s.io/krew/pkg/constants"
 )
@@ -46,6 +47,7 @@ Remarks:
 			{"IndexPath", paths.IndexPath()},
 			{"InstallPath", paths.InstallPath()},
 			{"BinPath", paths.BinPath()},
+			{"DetectedPlatform", installation.OSArch().String()},
 		}
 		return printTable(os.Stdout, []string{"OPTION", "VALUE"}, conf)
 	},

integration_test/testutil_test.go

@@ -68,6 +68,8 @@ func NewTest(t *testing.T) (*ITest, func()) {
 		env: []string{
 			fmt.Sprintf("KREW_ROOT=%s", tempDir.Root()),
 			fmt.Sprintf("PATH=%s", augmentPATH(t, binDir)),
+			"KREW_OS=linux",
+			"KREW_ARCH=amd64",
 		},
 		tempDir: tempDir,
 	}, cleanup

integration_test/version_test.go

@@ -15,9 +15,12 @@
 package integrationtest
 
 import (
-	"fmt"
+	"path"
 	"regexp"
+	"strings"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
 )
 
 func TestKrewVersion(t *testing.T) {
@@ -26,21 +29,34 @@ func TestKrewVersion(t *testing.T) {
 	test, cleanup := NewTest(t)
 	defer cleanup()
 
-	output := test.Krew("version").RunOrFailOutput()
+	stdOut := string(test.Krew("version").RunOrFailOutput())
+
+	lineSplit := regexp.MustCompile(`\s+`)
+	actual := make(map[string]string)
+	for _, line := range strings.Split(stdOut, "\n") {
+		if line == "" {
+			continue
+		}
+		optionValue := lineSplit.Split(line, 2)
+		if len(optionValue) < 2 {
+			t.Errorf("Expect `krew version` to output `OPTION VALUE` pair separated by spaces, got: %v", optionValue)
+		}
+		actual[optionValue[0]] = optionValue[1]
+	}
 
-	requiredSubstrings := []string{
-		fmt.Sprintf(`BasePath\s+%s`, test.Root()),
-		"GitTag",
-		"GitCommit",
-		`IndexURI\s+https://github.com/kubernetes-sigs/krew-index.git`,
-		"IndexPath",
-		"InstallPath",
-		"BinPath",
+	requiredSubstrings := map[string]string{
+		"OPTION":           "VALUE",
+		"BasePath":         test.Root(),
+		"GitTag":           "unknown",
+		"GitCommit":        "unknown",
+		"IndexURI":         "https://github.com/kubernetes-sigs/krew-index.git",
+		"IndexPath":        path.Join(test.Root(), "index"),
+		"InstallPath":      path.Join(test.Root(), "store"),
+		"BinPath":          path.Join(test.Root(), "bin"),
+		"DetectedPlatform": "linux/amd64",
 	}
 
-	for _, p := range requiredSubstrings {
-		if regexp.MustCompile(p).FindSubmatchIndex(output) == nil {
-			t.Errorf("Expected to find %q in output of `krew version`", p)
-		}
+	if diff := cmp.Diff(actual, requiredSubstrings); diff != "" {
+		t.Errorf("`krew version` output mismatch (-got, +want):\n%s", diff)
 	}
 }