Unit test deployment id stuff

Emyrk · Emyrk · commit 904ce34141fa · 2023-06-07T13:40:27.000-05:00
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -10,6 +10,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
+	"database/sql"
 	"encoding/base64"
 	"encoding/json"
 	"encoding/pem"
@@ -206,9 +207,15 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 		options.Database = dbauthz.New(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
 	}
 
-	// Some routes expect a deployment ID
-	err := options.Database.InsertDeploymentID(dbauthz.AsSystemRestricted(context.Background()), uuid.NewString())
-	require.NoError(t, err, "insert a deployment id")
+	// Some routes expect a deployment ID, so just make sure one exists.
+	// Check first incase the caller already set up this database.
+	// nolint:gocritic // Setting up unit test data inside test helper
+	depID, err := options.Database.GetDeploymentID(dbauthz.AsSystemRestricted(context.Background()))
+	if xerrors.Is(err, sql.ErrNoRows) || depID == "" {
+		// nolint:gocritic // Setting up unit test data inside test helper
+		err := options.Database.InsertDeploymentID(dbauthz.AsSystemRestricted(context.Background()), uuid.NewString())
+		require.NoError(t, err, "insert a deployment id")
+	}
 
 	if options.DeploymentValues == nil {
 		options.DeploymentValues = DeploymentValues(t)
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -409,7 +409,7 @@ func (api *API) workspaceProxies(rw http.ResponseWriter, r *http.Request) {
 		httpapi.InternalServerError(rw, err)
 		return
 	}
-	proxies = append(proxies, primaryProxy)
+	proxies = append([]database.WorkspaceProxy{primaryProxy}, proxies...)
 
 	statues := api.ProxyHealth.HealthStatus()
 	httpapi.Write(ctx, rw, http.StatusOK, convertProxies(proxies, statues))
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -44,11 +44,6 @@ func TestRegions(t *testing.T) {
 		}
 
 		db, pubsub := dbtestutil.NewDB(t)
-		deploymentID := uuid.New()
-
-		ctx := testutil.Context(t, testutil.WaitLong)
-		err := db.InsertDeploymentID(ctx, deploymentID.String())
-		require.NoError(t, err)
 
 		client := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
@@ -58,14 +53,18 @@ func TestRegions(t *testing.T) {
 				DeploymentValues: dv,
 			},
 		})
+
 		_ = coderdtest.CreateFirstUser(t, client)
+		ctx := testutil.Context(t, testutil.WaitLong)
+		deploymentID, err := db.GetDeploymentID(ctx)
+		require.NoError(t, err, "get deployment ID")
 
 		regions, err := client.Regions(ctx)
 		require.NoError(t, err)
 
 		require.Len(t, regions, 1)
 		require.NotEqual(t, uuid.Nil, regions[0].ID)
-		require.Equal(t, regions[0].ID, deploymentID)
+		require.Equal(t, regions[0].ID.String(), deploymentID)
 		require.Equal(t, "primary", regions[0].Name)
 		require.Equal(t, "Default", regions[0].DisplayName)
 		require.NotEmpty(t, regions[0].IconURL)
@@ -89,11 +88,6 @@ func TestRegions(t *testing.T) {
 		}
 
 		db, pubsub := dbtestutil.NewDB(t)
-		deploymentID := uuid.New()
-
-		ctx := testutil.Context(t, testutil.WaitLong)
-		err := db.InsertDeploymentID(ctx, deploymentID.String())
-		require.NoError(t, err)
 
 		client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
@@ -106,6 +100,9 @@ func TestRegions(t *testing.T) {
 		t.Cleanup(func() {
 			_ = closer.Close()
 		})
+		ctx := testutil.Context(t, testutil.WaitLong)
+		deploymentID, err := db.GetDeploymentID(ctx)
+		require.NoError(t, err, "get deployment ID")
 		_ = coderdtest.CreateFirstUser(t, client)
 		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			Features: license.Features{
@@ -131,7 +128,7 @@ func TestRegions(t *testing.T) {
 
 		// Region 0 is the primary	require.Len(t, regions, 1)
 		require.NotEqual(t, uuid.Nil, regions[0].ID)
-		require.Equal(t, regions[0].ID, deploymentID)
+		require.Equal(t, regions[0].ID.String(), deploymentID)
 		require.Equal(t, "primary", regions[0].Name)
 		require.Equal(t, "Default", regions[0].DisplayName)
 		require.NotEmpty(t, regions[0].IconURL)

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ func (api API) workspaceProxies(rw http.ResponseWriter, r http.Request) {`
`409`	`409`	`httpapi.InternalServerError(rw, err)`
`410`	`410`	`return`
`411`	`411`	`}`
`412`		`- proxies = append(proxies, primaryProxy)`
	`412`	`+ proxies = append([]database.WorkspaceProxy{primaryProxy}, proxies...)`
`413`	`413`
`414`	`414`	`statues := api.ProxyHealth.HealthStatus()`
`415`	`415`	`httpapi.Write(ctx, rw, http.StatusOK, convertProxies(proxies, statues))`