diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-17 16:04:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-17 16:04:34 +0200 |
| commit | fbb7fabe0462be82a765f8d9cbedc939ab68d962 (patch) | |
| tree | b75b1a47b1d1b9466607c9b840a33c7088092d5f | |
| parent | 55f1b1945decd65de208a8fbdbc2a917206022df (diff) | |
| parent | f27de7ccbdea1ca6393a789e1aed4e976ce153fb (diff) | |
Merge pull request #24103 from vespa-engine/bratseth/explicit-cli-version
Specify this is the CLI, not Vespa version
| -rw-r--r-- | client/go/cmd/version.go | 2 | ||||
| -rw-r--r-- | client/go/cmd/version_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/go/cmd/version.go b/client/go/cmd/version.go index 0a47039a37d..3189b573059 100644 --- a/client/go/cmd/version.go +++ b/client/go/cmd/version.go @@ -27,7 +27,7 @@ func newVersionCmd(cli *CLI) *cobra.Command { SilenceUsage: true, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { - log.Printf("vespa version %s compiled with %v on %v/%v", build.Version, runtime.Version(), runtime.GOOS, runtime.GOARCH) + log.Printf("Vespa CLI version %s compiled with %v on %v/%v", build.Version, runtime.Version(), runtime.GOOS, runtime.GOARCH) if !skipVersionCheck && cli.isTerminal() { return checkVersion(cli) } diff --git a/client/go/cmd/version_test.go b/client/go/cmd/version_test.go index 4354a2098c7..404aa9ac1e1 100644 --- a/client/go/cmd/version_test.go +++ b/client/go/cmd/version_test.go @@ -21,7 +21,7 @@ func TestVersion(t *testing.T) { t.Fatal(err) } assert.Equal(t, "", stderr.String()) - assert.Contains(t, stdout.String(), "vespa version 0.0.0-devel compiled with") + assert.Contains(t, stdout.String(), "Vespa CLI version 0.0.0-devel compiled with") assert.Contains(t, stdout.String(), "New release available: 1.2.3\nhttps://github.com/vespa-engine/vespa/releases/tag/v1.2.3") } @@ -38,7 +38,7 @@ func TestVersionCheckHomebrew(t *testing.T) { t.Fatal(err) } assert.Equal(t, "", stderr.String()) - assert.Contains(t, stdout.String(), "vespa version 0.0.0-devel compiled with") + assert.Contains(t, stdout.String(), "Vespa CLI version 0.0.0-devel compiled with") assert.Contains(t, stdout.String(), "New release available: 1.2.3\n"+ "https://github.com/vespa-engine/vespa/releases/tag/v1.2.3\n"+ "\nUpgrade by running:\nbrew update && brew upgrade vespa-cli\n") |