Fix version string parsing

kylecarbs · kylecarbs · commit 3f1d3d00dc79 · 2022-10-18T00:46:46.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -403,6 +403,7 @@ func Server(dflags *codersdk.DeploymentFlags, newAPI func(context.Context, *code
 				if err != nil {
 					return xerrors.Errorf("scan version: %w", err)
 				}
+				versionStr = strings.Split(versionStr, " ")[0]
 				if semver.Compare("v"+versionStr, "v13") < 0 {
 					return xerrors.New("PostgreSQL version must be v13.0.0 or higher!")
 				}
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -60,6 +60,9 @@ func TestServer(t *testing.T) {
 			"--postgres-url", connectionURL,
 			"--cache-dir", t.TempDir(),
 		)
+		pty := ptytest.New(t)
+		root.SetOutput(pty.Output())
+		root.SetErr(pty.Output())
 		errC := make(chan error, 1)
 		go func() {
 			errC <- root.ExecuteContext(ctx)
@@ -669,7 +672,7 @@ func waitAccessURL(t *testing.T, cfg config.Root) *url.URL {
 	require.Eventually(t, func() bool {
 		rawURL, err = cfg.URL().Read()
 		return err == nil && rawURL != ""
-	}, testutil.WaitLong, testutil.IntervalFast, "failed to get access URL")
+	}, time.Minute, testutil.IntervalFast, "failed to get access URL")
 
 	accessURL, err := url.Parse(rawURL)
 	require.NoError(t, err, "failed to parse access URL")

Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,7 @@ func Server(dflags codersdk.DeploymentFlags, newAPI func(context.Context, code`
`403`	`403`	`if err != nil {`
`404`	`404`	`return xerrors.Errorf("scan version: %w", err)`
`405`	`405`	`}`
	`406`	`+ versionStr = strings.Split(versionStr, " ")[0]`
`406`	`407`	`if semver.Compare("v"+versionStr, "v13") < 0 {`
`407`	`408`	`return xerrors.New("PostgreSQL version must be v13.0.0 or higher!")`
`408`	`409`	`}`