move trimming into helper

sreya · sreya · commit 423ab8be7ce8 · 2024-01-30T22:04:17.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -835,7 +835,7 @@ func (r *RootCmd) checkVersions(i *clibase.Invocation, client *codersdk.Client,
 	}
 
 	if !buildinfo.VersionsMatch(clientVersion, serverInfo.Version) {
-		upgradeMessage := defaultUpgradeMessage(strings.TrimPrefix(serverInfo.CanonicalVersion(), "v"))
+		upgradeMessage := defaultUpgradeMessage(serverInfo.CanonicalVersion())
 		if serverInfo.UpgradeMessage != "" {
 			upgradeMessage = serverInfo.UpgradeMessage
 		}
@@ -1218,11 +1218,12 @@ func SlimUnsupported(w io.Writer, cmd string) {
 	os.Exit(1)
 }
 
-func defaultUpgradeMessage(serverVersion string) string {
+func defaultUpgradeMessage(version string) string {
 	// Our installation script doesn't work on Windows, so instead we direct the user
 	// to the GitHub release page to download the latest installer.
+	version = strings.TrimPrefix(version, "v")
 	if runtime.GOOS == "windows" {
-		return fmt.Sprintf("download the server version from: https://github.com/coder/coder/releases/v%s", serverVersion)
+		return fmt.Sprintf("download the server version from: https://github.com/coder/coder/releases/v%s", version)
 	}
-	return fmt.Sprintf("download the server version with: 'curl -L https://coder.com/install.sh | sh -s -- --version %s'", serverVersion)
+	return fmt.Sprintf("download the server version with: 'curl -L https://coder.com/install.sh | sh -s -- --version %s'", version)
 }
diff --git a/cli/root_internal_test.go b/cli/root_internal_test.go
@@ -173,7 +173,7 @@ func Test_checkVersions(t *testing.T) {
 		err = r.checkVersions(inv, client, "v2.0.0")
 		require.NoError(t, err)
 
-		fmtOutput := fmt.Sprintf("version mismatch: client v2.0.0, server v1.0.0\n%s", defaultUpgradeMessage("1.0.0"))
+		fmtOutput := fmt.Sprintf("version mismatch: client v2.0.0, server v1.0.0\n%s", defaultUpgradeMessage("v1.0.0"))
 		expectedOutput := fmt.Sprintln(pretty.Sprint(cliui.DefaultStyles.Warn, fmtOutput))
 		require.Equal(t, expectedOutput, buf.String())
 	})

Original file line number	Diff line number	Diff line change
`@@ -835,7 +835,7 @@ func (r RootCmd) checkVersions(i clibase.Invocation, client *codersdk.Client,`
`835`	`835`	`}`
`836`	`836`
`837`	`837`	`if !buildinfo.VersionsMatch(clientVersion, serverInfo.Version) {`
`838`		`- upgradeMessage := defaultUpgradeMessage(strings.TrimPrefix(serverInfo.CanonicalVersion(), "v"))`
	`838`	`+ upgradeMessage := defaultUpgradeMessage(serverInfo.CanonicalVersion())`
`839`	`839`	`if serverInfo.UpgradeMessage != "" {`
`840`	`840`	`upgradeMessage = serverInfo.UpgradeMessage`
`841`	`841`	`}`
`@@ -1218,11 +1218,12 @@ func SlimUnsupported(w io.Writer, cmd string) {`
`1218`	`1218`	`os.Exit(1)`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`-func defaultUpgradeMessage(serverVersion string) string {`
	`1221`	`+func defaultUpgradeMessage(version string) string {`
`1222`	`1222`	`// Our installation script doesn't work on Windows, so instead we direct the user`
`1223`	`1223`	`// to the GitHub release page to download the latest installer.`
	`1224`	`+ version = strings.TrimPrefix(version, "v")`
`1224`	`1225`	`if runtime.GOOS == "windows" {`
`1225`		`- return fmt.Sprintf("download the server version from: https://github.com/coder/coder/releases/v%s", serverVersion)`
	`1226`	`+ return fmt.Sprintf("download the server version from: https://github.com/coder/coder/releases/v%s", version)`
`1226`	`1227`	`}`
`1227`		`- return fmt.Sprintf("download the server version with: 'curl -L https://coder.com/install.sh \| sh -s -- --version %s'", serverVersion)`
	`1228`	`+ return fmt.Sprintf("download the server version with: 'curl -L https://coder.com/install.sh \| sh -s -- --version %s'", version)`
`1228`	`1229`	`}`