fix(enterprise/coderd): make primary workspace proxy always be updatd now

johnstcn · johnstcn · commit a84a3b7061ff · 2024-01-09T09:53:23.000Z
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -930,6 +930,7 @@ func convertRegion(proxy database.WorkspaceProxy, status proxyhealth.ProxyStatus
 }
 
 func convertProxy(p database.WorkspaceProxy, status proxyhealth.ProxyStatus) codersdk.WorkspaceProxy {
+	now := dbtime.Now()
 	if p.IsPrimary() {
 		// Primary is always healthy since the primary serves the api that this
 		// is returned from.
@@ -939,8 +940,11 @@ func convertProxy(p database.WorkspaceProxy, status proxyhealth.ProxyStatus) cod
 			ProxyHost: u.Host,
 			Status:    proxyhealth.Healthy,
 			Report:    codersdk.ProxyHealthReport{},
-			CheckedAt: time.Now(),
+			CheckedAt: now,
 		}
+		// For primary, created at / updated at are always 'now'
+		p.CreatedAt = now
+		p.UpdatedAt = now
 	}
 	if status.Status == "" {
 		status.Status = proxyhealth.Unknown
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
+	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/workspaceapps"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
@@ -93,11 +94,16 @@ func TestRegions(t *testing.T) {
 		deploymentID, err := db.GetDeploymentID(ctx)
 		require.NoError(t, err, "get deployment ID")
 
+		// The default proxy is always called "primary".
+		primary, err := client.WorkspaceProxyByName(ctx, "primary")
+		require.NoError(t, err)
+
 		const proxyName = "hello"
 		_ = coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
 			Name:        proxyName,
 			AppHostname: appHostname + ".proxy",
 		})
+		approxCreateTime := dbtime.Now()
 		proxy, err := db.GetWorkspaceProxyByName(ctx, proxyName)
 		require.NoError(t, err)
 
@@ -135,7 +141,7 @@ func TestRegions(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, regions, 2)
 
-		// Region 0 is the primary	require.Len(t, regions, 1)
+		// Region 0 is the primary
 		require.NotEqual(t, uuid.Nil, regions[0].ID)
 		require.Equal(t, regions[0].ID.String(), deploymentID)
 		require.Equal(t, "primary", regions[0].Name)
@@ -145,6 +151,11 @@ func TestRegions(t *testing.T) {
 		require.Equal(t, client.URL.String(), regions[0].PathAppURL)
 		require.Equal(t, appHostname, regions[0].WildcardHostname)
 
+		// Ensure non-zero fields of the default proxy
+		require.NotZero(t, primary.Name)
+		require.NotZero(t, primary.CreatedAt)
+		require.NotZero(t, primary.UpdatedAt)
+
 		// Region 1 is the proxy.
 		require.NotEqual(t, uuid.Nil, regions[1].ID)
 		require.Equal(t, proxy.ID, regions[1].ID)
@@ -154,6 +165,11 @@ func TestRegions(t *testing.T) {
 		require.True(t, regions[1].Healthy)
 		require.Equal(t, proxy.Url, regions[1].PathAppURL)
 		require.Equal(t, proxy.WildcardHostname, regions[1].WildcardHostname)
+
+		// Unfortunately need to wait to assert createdAt/updatedAt
+		<-time.After(testutil.WaitShort / 10)
+		require.WithinDuration(t, approxCreateTime, proxy.CreatedAt, testutil.WaitShort/10)
+		require.WithinDuration(t, approxCreateTime, proxy.UpdatedAt, testutil.WaitShort/10)
 	})
 
 	t.Run("RequireAuth", func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -930,6 +930,7 @@ func convertRegion(proxy database.WorkspaceProxy, status proxyhealth.ProxyStatus`
`930`	`930`	`}`
`931`	`931`
`932`	`932`	`func convertProxy(p database.WorkspaceProxy, status proxyhealth.ProxyStatus) codersdk.WorkspaceProxy {`
	`933`	`+ now := dbtime.Now()`
`933`	`934`	`if p.IsPrimary() {`
`934`	`935`	`// Primary is always healthy since the primary serves the api that this`
`935`	`936`	`// is returned from.`
`@@ -939,8 +940,11 @@ func convertProxy(p database.WorkspaceProxy, status proxyhealth.ProxyStatus) cod`
`939`	`940`	`ProxyHost: u.Host,`
`940`	`941`	`Status: proxyhealth.Healthy,`
`941`	`942`	`Report: codersdk.ProxyHealthReport{},`
`942`		`- CheckedAt: time.Now(),`
	`943`	`+ CheckedAt: now,`
`943`	`944`	`}`
	`945`	`+ // For primary, created at / updated at are always 'now'`
	`946`	`+ p.CreatedAt = now`
	`947`	`+ p.UpdatedAt = now`
`944`	`948`	`}`
`945`	`949`	`if status.Status == "" {`
`946`	`950`	`status.Status = proxyhealth.Unknown`