feat(coderd): store workspace proxy version in database upon register

johnstcn · johnstcn · commit c7999691ba20 · 2023-11-20T14:07:52.000Z
diff --git a/cli/server_internal_test.go b/cli/server_internal_test.go
@@ -254,7 +254,7 @@ func TestIsDERPPath(t *testing.T) {
 		//{
 		//	path:     "/derp",
 		//	expected: true,
-		//},
+		// },
 		{
 			path:     "/derp/",
 			expected: true,
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5563,6 +5563,7 @@ func (q *FakeQuerier) RegisterWorkspaceProxy(_ context.Context, arg database.Reg
 			p.WildcardHostname = arg.WildcardHostname
 			p.DerpEnabled = arg.DerpEnabled
 			p.DerpOnly = arg.DerpOnly
+			p.Version = arg.Version
 			p.UpdatedAt = dbtime.Now()
 			q.workspaceProxies[i] = p
 			return p, nil
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/proxies.sql b/coderd/database/queries/proxies.sql
@@ -25,6 +25,7 @@ SET
 	wildcard_hostname = @wildcard_hostname :: text,
 	derp_enabled = @derp_enabled :: boolean,
 	derp_only = @derp_only :: boolean,
+	version = @version :: text,
 	updated_at = Now()
 WHERE
 	id = @id
diff --git a/enterprise/coderd/proxyhealth/proxyhealth_test.go b/enterprise/coderd/proxyhealth/proxyhealth_test.go
@@ -31,6 +31,7 @@ func insertProxy(t *testing.T, db database.Store, url string) database.Workspace
 		Url:              url,
 		WildcardHostname: "",
 		ID:               proxy.ID,
+		Version:          `v2.34.5-test+beefcake`,
 	})
 	require.NoError(t, err, "failed to update proxy")
 	return proxy
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -625,6 +625,7 @@ func (api *API) workspaceProxyRegister(rw http.ResponseWriter, r *http.Request)
 			DerpEnabled:      req.DerpEnabled,
 			DerpOnly:         req.DerpOnly,
 			WildcardHostname: req.WildcardHostname,
+			Version:          req.Version,
 		})
 		if err != nil {
 			return xerrors.Errorf("register workspace proxy: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func TestIsDERPPath(t *testing.T) {`
`254`	`254`	`//{`
`255`	`255`	`// path: "/derp",`
`256`	`256`	`// expected: true,`
`257`		`- //},`
	`257`	`+ // },`
`258`	`258`	`{`
`259`	`259`	`path: "/derp/",`
`260`	`260`	`expected: true,`