feat: make pgCoordinator generally available (#8419)

* pgCoord to GA, fix tests

Signed-off-by: Spike Curtis <spike@coder.com>

* Fix generation and coordinator delete RBAC

Signed-off-by: Spike Curtis <spike@coder.com>

* Fix fakeQuerier -> FakeQuerier

Signed-off-by: Spike Curtis <spike@coder.com>

---------

Signed-off-by: Spike Curtis <spike@coder.com>

coderd/apidoc/docs.go

@@ -7615,14 +7615,14 @@ const docTemplate = `{
             "enum": [
                 "moons",
                 "workspace_actions",
-                "tailnet_pg_coordinator",
+                "tailnet_ha_coordinator",
                 "convert-to-oidc",
                 "workspace_build_logs_ui"
             ],
             "x-enum-varnames": [
                 "ExperimentMoons",
                 "ExperimentWorkspaceActions",
-                "ExperimentTailnetPGCoordinator",
+                "ExperimentTailnetHACoordinator",
                 "ExperimentConvertToOIDC",
                 "ExperimentWorkspaceBuildLogsUI"
             ]

coderd/apidoc/swagger.json

@@ -6816,14 +6816,14 @@
       "enum": [
         "moons",
         "workspace_actions",
-        "tailnet_pg_coordinator",
+        "tailnet_ha_coordinator",
         "convert-to-oidc",
         "workspace_build_logs_ui"
       ],
       "x-enum-varnames": [
         "ExperimentMoons",
         "ExperimentWorkspaceActions",
-        "ExperimentTailnetPGCoordinator",
+        "ExperimentTailnetHACoordinator",
         "ExperimentConvertToOIDC",
         "ExperimentWorkspaceBuildLogsUI"
       ]

coderd/database/pubsub/pubsub_memory.go

@@ -22,21 +22,22 @@ func (g genericListener) send(ctx context.Context, message []byte) {
 	}
 }
 
-// memoryPubsub is an in-memory Pubsub implementation.
-type memoryPubsub struct {
+// MemoryPubsub is an in-memory Pubsub implementation.  It's an exported type so that our test code can do type
+// checks.
+type MemoryPubsub struct {
 	mut       sync.RWMutex
 	listeners map[string]map[uuid.UUID]genericListener
 }
 
-func (m *memoryPubsub) Subscribe(event string, listener Listener) (cancel func(), err error) {
+func (m *MemoryPubsub) Subscribe(event string, listener Listener) (cancel func(), err error) {
 	return m.subscribeGeneric(event, genericListener{l: listener})
 }
 
-func (m *memoryPubsub) SubscribeWithErr(event string, listener ListenerWithErr) (cancel func(), err error) {
+func (m *MemoryPubsub) SubscribeWithErr(event string, listener ListenerWithErr) (cancel func(), err error) {
 	return m.subscribeGeneric(event, genericListener{le: listener})
 }
 
-func (m *memoryPubsub) subscribeGeneric(event string, listener genericListener) (cancel func(), err error) {
+func (m *MemoryPubsub) subscribeGeneric(event string, listener genericListener) (cancel func(), err error) {
 	m.mut.Lock()
 	defer m.mut.Unlock()
 
@@ -62,7 +63,7 @@ func (m *memoryPubsub) subscribeGeneric(event string, listener genericListener)
 	}, nil
 }
 
-func (m *memoryPubsub) Publish(event string, message []byte) error {
+func (m *MemoryPubsub) Publish(event string, message []byte) error {
 	m.mut.RLock()
 	defer m.mut.RUnlock()
 	listeners, ok := m.listeners[event]
@@ -83,12 +84,12 @@ func (m *memoryPubsub) Publish(event string, message []byte) error {
 	return nil
 }
 
-func (*memoryPubsub) Close() error {
+func (*MemoryPubsub) Close() error {
 	return nil
 }
 
 func NewInMemory() Pubsub {
-	return &memoryPubsub{
+	return &MemoryPubsub{
 		listeners: make(map[string]map[uuid.UUID]genericListener),
 	}
 }

codersdk/deployment.go

@@ -1755,9 +1755,10 @@ const (
 	// https://github.com/coder/coder/milestone/19
 	ExperimentWorkspaceActions Experiment = "workspace_actions"
 
-	// ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub-
-	// only Coordinator
-	ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator"
+	// ExperimentTailnetHACoordinator downgrades to the haCoordinator instead
+	// of PGCoord.  Should only be used if we see issues in prod with PGCoord
+	// which is now the default.
+	ExperimentTailnetHACoordinator Experiment = "tailnet_ha_coordinator"
 
 	// ExperimentConvertToOIDC enables users to convert from password to
 	// oidc.

docs/api/schemas.md

@@ -2541,7 +2541,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
 | ------------------------- |
 | `moons`                   |
 | `workspace_actions`       |
-| `tailnet_pg_coordinator`  |
+| `tailnet_ha_coordinator`  |
 | `convert-to-oidc`         |
 | `workspace_build_logs_ui` |
 

enterprise/cli/features_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/cli/clitest"
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/pty/ptytest"
@@ -19,8 +18,7 @@ func TestFeaturesList(t *testing.T) {
 	t.Parallel()
 	t.Run("Table", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		inv, conf := newCLI(t, "features", "list")
 		clitest.SetupConfig(t, client, conf)
 		pty := ptytest.New(t).Attach(inv)
@@ -31,8 +29,7 @@ func TestFeaturesList(t *testing.T) {
 	t.Run("JSON", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		inv, conf := newCLI(t, "features", "list", "-o", "json")
 		clitest.SetupConfig(t, client, conf)
 		doneChan := make(chan struct{})

enterprise/cli/groupcreate_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/enterprise/coderd/license"
@@ -21,13 +20,11 @@ func TestCreateGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		var (
 			groupName = "test"

enterprise/cli/groupdelete_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/enterprise/coderd/license"
@@ -22,14 +21,11 @@ func TestGroupDelete(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		admin := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, admin := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, admin.OrganizationID, codersdk.CreateGroupRequest{
@@ -55,14 +51,11 @@ func TestGroupDelete(t *testing.T) {
 	t.Run("NoArg", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		inv, conf := newCLI(
 			t,

enterprise/cli/groupedit_test.go

@@ -22,14 +22,11 @@ func TestGroupEdit(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		admin := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, admin := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 		_, user1 := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
@@ -74,14 +71,11 @@ func TestGroupEdit(t *testing.T) {
 	t.Run("InvalidUserInput", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		admin := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, admin := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
@@ -106,14 +100,11 @@ func TestGroupEdit(t *testing.T) {
 	t.Run("NoArg", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		inv, conf := newCLI(t, "groups", "edit")
 		clitest.SetupConfig(t, client, conf)

enterprise/cli/grouplist_test.go

@@ -20,14 +20,11 @@ func TestGroupList(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		admin := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, admin := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 		_, user1 := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
@@ -80,14 +77,11 @@ func TestGroupList(t *testing.T) {
 	t.Run("NoGroups", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		inv, conf := newCLI(t, "groups", "list")
 

enterprise/cli/licenses_test.go

@@ -18,7 +18,6 @@ import (
 
 	"github.com/coder/coder/cli/clibase"
 	"github.com/coder/coder/cli/clitest"
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
@@ -118,8 +117,7 @@ func TestLicensesAddReal(t *testing.T) {
 	t.Parallel()
 	t.Run("Fails", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		inv, conf := newCLI(
 			t,
 			"licenses", "add", "-l", fakeLicenseJWT,
@@ -173,8 +171,7 @@ func TestLicensesListReal(t *testing.T) {
 	t.Parallel()
 	t.Run("Empty", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		inv, conf := newCLI(
 			t,
 			"licenses", "list",
@@ -215,8 +212,7 @@ func TestLicensesDeleteReal(t *testing.T) {
 	t.Parallel()
 	t.Run("Empty", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		inv, conf := newCLI(
 			t,
 			"licenses", "delete", "1")

enterprise/cli/workspaceproxy_test.go

@@ -29,15 +29,14 @@ func Test_ProxyCRUD(t *testing.T) {
 			"*",
 		}
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
-		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
 			},
 		})
 
@@ -102,15 +101,14 @@ func Test_ProxyCRUD(t *testing.T) {
 			"*",
 		}
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
-		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
 			},
 		})
 

enterprise/coderd/appearance_test.go

@@ -30,9 +30,7 @@ func TestServiceBanners(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
-		adminClient := coderdenttest.New(t, &coderdenttest.Options{})
-
-		adminUser := coderdtest.CreateFirstUser(t, adminClient)
+		adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 
 		// Even without a license, the banner should return as disabled.
 		sb, err := adminClient.Appearance(ctx)
@@ -88,12 +86,12 @@ func TestServiceBanners(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
+			DontAddLicense: true,
 		})
-		user := coderdtest.CreateFirstUser(t, client)
 		license := coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureAppearance: 1,
@@ -164,15 +162,14 @@ func TestCustomSupportLinks(t *testing.T) {
 		Value: supportLinks,
 	}
 
-	client := coderdenttest.New(t, &coderdenttest.Options{
+	client, _ := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			DeploymentValues: cfg,
 		},
-	})
-	coderdtest.CreateFirstUser(t, client)
-	coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-		Features: license.Features{
-			codersdk.FeatureAppearance: 1,
+		LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureAppearance: 1,
+			},
 		},
 	})
 
@@ -187,9 +184,8 @@ func TestCustomSupportLinks(t *testing.T) {
 func TestDefaultSupportLinks(t *testing.T) {
 	t.Parallel()
 
-	client := coderdenttest.New(t, nil)
-	coderdtest.CreateFirstUser(t, client)
 	// Don't need to set the license, as default links are passed without it.
+	client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
 	defer cancel()

enterprise/coderd/authorize_test.go

@@ -21,19 +21,17 @@ func TestCheckACLPermissions(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	t.Cleanup(cancel)
 
-	adminClient := coderdenttest.New(t, &coderdenttest.Options{
+	adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			IncludeProvisionerDaemon: true,
 		},
-	})
-	// Create adminClient, member, and org adminClient
-	adminUser := coderdtest.CreateFirstUser(t, adminClient)
-	_ = coderdenttest.AddLicense(t, adminClient, coderdenttest.LicenseOptions{
-		Features: license.Features{
-			codersdk.FeatureTemplateRBAC: 1,
+		LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureTemplateRBAC: 1,
+			},
 		},
 	})
-
+	// Create member and org adminClient
 	memberClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
 	memberUser, err := memberClient.User(ctx, codersdk.Me)
 	require.NoError(t, err)

enterprise/coderd/coderd.go

@@ -448,10 +448,10 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 		coordinator := agpltailnet.NewCoordinator(api.Logger)
 		if enabled {
 			var haCoordinator agpltailnet.Coordinator
-			if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetPGCoordinator) {
-				haCoordinator, err = tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database)
-			} else {
+			if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetHACoordinator) {
 				haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub)
+			} else {
+				haCoordinator, err = tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database)
 			}
 			if err != nil {
 				api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))

enterprise/coderd/coderd_test.go

@@ -34,7 +34,9 @@ func TestEntitlements(t *testing.T) {
 	t.Parallel()
 	t.Run("NoLicense", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
+			DontAddLicense: true,
+		})
 		res, err := client.Entitlements(context.Background())
 		require.NoError(t, err)
 		require.False(t, res.HasLicense)
@@ -42,10 +44,10 @@ func TestEntitlements(t *testing.T) {
 	})
 	t.Run("FullLicense", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
-			AuditLogging: true,
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
+			AuditLogging:   true,
+			DontAddLicense: true,
 		})
-		_ = coderdtest.CreateFirstUser(t, client)
 		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureUserLimit:                  100,
@@ -74,10 +76,10 @@ func TestEntitlements(t *testing.T) {
 	})
 	t.Run("FullLicenseToNone", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
-			AuditLogging: true,
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
+			AuditLogging:   true,
+			DontAddLicense: true,
 		})
-		_ = coderdtest.CreateFirstUser(t, client)
 		license := coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureUserLimit: 100,
@@ -103,11 +105,10 @@ func TestEntitlements(t *testing.T) {
 	})
 	t.Run("Pubsub", func(t *testing.T) {
 		t.Parallel()
-		client, _, api := coderdenttest.NewWithAPI(t, nil)
+		client, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{DontAddLicense: true})
 		entitlements, err := client.Entitlements(context.Background())
 		require.NoError(t, err)
 		require.False(t, entitlements.HasLicense)
-		coderdtest.CreateFirstUser(t, client)
 		//nolint:gocritic // unit test
 		ctx := testDBAuthzRole(context.Background())
 		_, err = api.Database.InsertLicense(ctx, database.InsertLicenseParams{
@@ -130,13 +131,13 @@ func TestEntitlements(t *testing.T) {
 	})
 	t.Run("Resync", func(t *testing.T) {
 		t.Parallel()
-		client, _, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		client, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			EntitlementsUpdateInterval: 25 * time.Millisecond,
+			DontAddLicense:             true,
 		})
 		entitlements, err := client.Entitlements(context.Background())
 		require.NoError(t, err)
 		require.False(t, entitlements.HasLicense)
-		coderdtest.CreateFirstUser(t, client)
 		// Valid
 		ctx := context.Background()
 		//nolint:gocritic // unit test
@@ -180,16 +181,15 @@ func TestAuditLogging(t *testing.T) {
 	t.Parallel()
 	t.Run("Enabled", func(t *testing.T) {
 		t.Parallel()
-		client, _, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		_, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			AuditLogging: true,
 			Options: &coderdtest.Options{
 				Auditor: audit.NewAuditor(audit.DefaultFilter),
 			},
-		})
-		coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureAuditLog: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAuditLog: 1,
+				},
 			},
 		})
 		auditor := *api.AGPL.Auditor.Load()
@@ -199,8 +199,7 @@ func TestAuditLogging(t *testing.T) {
 	})
 	t.Run("Disabled", func(t *testing.T) {
 		t.Parallel()
-		client, _, api := coderdenttest.NewWithAPI(t, nil)
-		coderdtest.CreateFirstUser(t, client)
+		_, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{DontAddLicense: true})
 		auditor := *api.AGPL.Auditor.Load()
 		ea := agplaudit.NewNop()
 		t.Logf("%T = %T", auditor, ea)
@@ -211,12 +210,12 @@ func TestAuditLogging(t *testing.T) {
 	t.Run("FullBuild", func(t *testing.T) {
 		t.Parallel()
 		ctx := testutil.Context(t, testutil.WaitLong)
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
+			DontAddLicense: true,
 		})
-		user := coderdtest.CreateFirstUser(t, client)
 		workspace, agent := setupWorkspaceAgent(t, client, user, 0)
 		conn, err := client.DialWorkspaceAgent(ctx, agent.ID, nil)
 		require.NoError(t, err)

enterprise/coderd/coderdenttest/coderdenttest.go

@@ -10,6 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coder/coder/coderd/database/dbfake"
+	"github.com/coder/coder/coderd/database/pubsub"
+
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
@@ -48,15 +51,20 @@ type Options struct {
 	SCIMAPIKey                 []byte
 	UserWorkspaceQuota         int
 	ProxyHealthInterval        time.Duration
+	LicenseOptions             *LicenseOptions
+	DontAddLicense             bool
+	DontAddFirstUser           bool
 }
 
 // New constructs a codersdk client connected to an in-memory Enterprise API instance.
-func New(t *testing.T, options *Options) *codersdk.Client {
-	client, _, _ := NewWithAPI(t, options)
-	return client
+func New(t *testing.T, options *Options) (*codersdk.Client, codersdk.CreateFirstUserResponse) {
+	client, _, _, user := NewWithAPI(t, options)
+	return client, user
 }
 
-func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *coderd.API) {
+func NewWithAPI(t *testing.T, options *Options) (
+	*codersdk.Client, io.Closer, *coderd.API, codersdk.CreateFirstUserResponse,
+) {
 	t.Helper()
 
 	if options == nil {
@@ -65,6 +73,7 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 	if options.Options == nil {
 		options.Options = &coderdtest.Options{}
 	}
+	require.False(t, options.DontAddFirstUser && !options.DontAddLicense, "DontAddFirstUser requires DontAddLicense")
 	setHandler, cancelFunc, serverURL, oop := coderdtest.NewOptions(t, options.Options)
 	coderAPI, err := coderd.New(context.Background(), &coderd.Options{
 		RBAC:                       true,
@@ -99,7 +108,26 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 			},
 		},
 	}
-	return client, provisionerCloser, coderAPI
+	var user codersdk.CreateFirstUserResponse
+	if !options.DontAddFirstUser {
+		user = coderdtest.CreateFirstUser(t, client)
+		if !options.DontAddLicense {
+			lo := LicenseOptions{}
+			if options.LicenseOptions != nil {
+				lo = *options.LicenseOptions
+				// The pgCoord is not supported by the fake DB & in-memory Pubsub.  It only works on a real postgres.
+				if lo.AllFeatures || (lo.Features != nil && lo.Features[codersdk.FeatureHighAvailability] != 0) {
+					// we check for the in-memory test types so that the real types don't have to exported
+					_, ok := coderAPI.Pubsub.(*pubsub.MemoryPubsub)
+					require.False(t, ok, "FeatureHighAvailability is incompatible with MemoryPubsub")
+					_, ok = coderAPI.Database.(*dbfake.FakeQuerier)
+					require.False(t, ok, "FeatureHighAvailability is incompatible with dbfake")
+				}
+			}
+			_ = AddLicense(t, client, lo)
+		}
+	}
+	return client, provisionerCloser, coderAPI, user
 }
 
 type LicenseOptions struct {

enterprise/coderd/coderdenttest/coderdenttest_test.go

@@ -8,5 +8,5 @@ import (
 
 func TestNew(t *testing.T) {
 	t.Parallel()
-	_ = coderdenttest.New(t, nil)
+	_, _ = coderdenttest.New(t, nil)
 }

enterprise/coderd/coderdenttest/swagger_test.go

@@ -16,6 +16,7 @@ func TestEnterpriseEndpointsDocumented(t *testing.T) {
 	require.NoError(t, err, "can't parse swagger comments")
 	require.NotEmpty(t, swaggerComments, "swagger comments must be present")
 
-	_, _, api := coderdenttest.NewWithAPI(t, nil)
+	//nolint: dogsled
+	_, _, api, _ := coderdenttest.NewWithAPI(t, nil)
 	coderdtest.VerifySwaggerDefinitions(t, api.AGPL.APIHandler, swaggerComments)
 }

enterprise/coderd/groups_test.go

@@ -23,14 +23,11 @@ func TestCreateGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name:      "hi",
@@ -47,19 +44,17 @@ func TestCreateGroup(t *testing.T) {
 		t.Parallel()
 
 		auditor := audit.NewMock()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			AuditLogging: true,
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Auditor:                  auditor,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureTemplateRBAC: 1,
-				codersdk.FeatureAuditLog:     1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureTemplateRBAC: 1,
+					codersdk.FeatureAuditLog:     1,
+				},
 			},
 		})
 
@@ -79,14 +74,11 @@ func TestCreateGroup(t *testing.T) {
 	t.Run("Conflict", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		_, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -105,14 +97,11 @@ func TestCreateGroup(t *testing.T) {
 	t.Run("allUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		_, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: database.AllUsersGroup,
@@ -130,14 +119,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name:           "hi",
@@ -164,14 +150,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("SameNameOK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -188,14 +171,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("AddUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 
@@ -216,14 +196,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("RemoveUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user4 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -254,23 +231,19 @@ func TestPatchGroup(t *testing.T) {
 		t.Parallel()
 
 		auditor := audit.NewMock()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			AuditLogging: true,
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Auditor:                  auditor,
 			},
-		})
-
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureTemplateRBAC: 1,
-				codersdk.FeatureAuditLog:     1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureTemplateRBAC: 1,
+					codersdk.FeatureAuditLog:     1,
+				},
 			},
 		})
-
 		ctx := testutil.Context(t, testutil.WaitLong)
 
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
@@ -292,14 +265,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("NameConflict", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group1, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name:      "hi",
@@ -325,14 +295,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("UserNotExist", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -351,14 +318,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("MalformedUUID", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -377,14 +341,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("AddDuplicateUser", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
@@ -405,14 +366,11 @@ func TestPatchGroup(t *testing.T) {
 	t.Run("allUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -436,14 +394,11 @@ func TestGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -458,14 +413,11 @@ func TestGroup(t *testing.T) {
 	t.Run("ByName", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -480,14 +432,11 @@ func TestGroup(t *testing.T) {
 	t.Run("WithUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 
@@ -512,14 +461,11 @@ func TestGroup(t *testing.T) {
 	t.Run("RegularUserReadGroup", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		client1, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 
 		ctx := testutil.Context(t, testutil.WaitLong)
@@ -536,13 +482,11 @@ func TestGroup(t *testing.T) {
 	t.Run("FilterDeletedUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -571,13 +515,11 @@ func TestGroup(t *testing.T) {
 	t.Run("FilterSuspendedUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -609,14 +551,11 @@ func TestGroup(t *testing.T) {
 	t.Run("everyoneGroupReturnsEmpty", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		// The 'Everyone' group always has an ID that matches the organization ID.
 		group, err := client.Group(ctx, user.OrganizationID)
@@ -634,13 +573,11 @@ func TestGroups(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user4 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -681,14 +618,11 @@ func TestDeleteGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		group1, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
 			Name: "hi",
@@ -709,14 +643,13 @@ func TestDeleteGroup(t *testing.T) {
 		t.Parallel()
 
 		auditor := audit.NewMock()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			AuditLogging: true,
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Auditor:                  auditor,
 			},
 		})
-		user := coderdtest.CreateFirstUser(t, client)
 
 		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			Features: license.Features{
@@ -744,14 +677,11 @@ func TestDeleteGroup(t *testing.T) {
 	t.Run("allUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 		ctx := testutil.Context(t, testutil.WaitLong)
 		err := client.DeleteGroup(ctx, user.OrganizationID)
 		require.Error(t, err)

enterprise/coderd/licenses_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/enterprise/coderd/license"
@@ -21,8 +20,7 @@ func TestPostLicense(t *testing.T) {
 
 	t.Run("Success", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		respLic := coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 			AccountType: license.AccountTypeSalesforce,
 			AccountID:   "testing",
@@ -40,7 +38,8 @@ func TestPostLicense(t *testing.T) {
 
 	t.Run("Unauthorized", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
+		client.SetSessionToken("")
 		_, err := client.AddLicense(context.Background(), codersdk.AddLicenseRequest{
 			License: "content",
 		})
@@ -54,8 +53,7 @@ func TestPostLicense(t *testing.T) {
 
 	t.Run("Corrupted", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{})
 		_, err := client.AddLicense(context.Background(), codersdk.AddLicenseRequest{
 			License: "invalid",
@@ -73,8 +71,7 @@ func TestGetLicense(t *testing.T) {
 	t.Parallel()
 	t.Run("Success", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
@@ -132,8 +129,7 @@ func TestDeleteLicense(t *testing.T) {
 	t.Parallel()
 	t.Run("Empty", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
@@ -148,8 +144,7 @@ func TestDeleteLicense(t *testing.T) {
 
 	t.Run("BadID", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 
@@ -161,8 +156,7 @@ func TestDeleteLicense(t *testing.T) {
 
 	t.Run("Success", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		_ = coderdtest.CreateFirstUser(t, client)
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 

enterprise/coderd/provisionerdaemons_test.go

@@ -23,13 +23,11 @@ func TestProvisionerDaemonServe(t *testing.T) {
 	t.Parallel()
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureExternalProvisionerDaemons: 1,
 			},
-		})
+		}})
 		srv, err := client.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
 			codersdk.ProvisionerTypeEcho,
 		}, map[string]string{})
@@ -39,8 +37,7 @@ func TestProvisionerDaemonServe(t *testing.T) {
 
 	t.Run("NoLicense", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
+		client, user := coderdenttest.New(t, &coderdenttest.Options{DontAddLicense: true})
 		_, err := client.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
 			codersdk.ProvisionerTypeEcho,
 		}, map[string]string{})
@@ -52,13 +49,11 @@ func TestProvisionerDaemonServe(t *testing.T) {
 
 	t.Run("Organization", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureExternalProvisionerDaemons: 1,
 			},
-		})
+		}})
 		another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleOrgAdmin(user.OrganizationID))
 		_, err := another.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
 			codersdk.ProvisionerTypeEcho,
@@ -73,13 +68,11 @@ func TestProvisionerDaemonServe(t *testing.T) {
 
 	t.Run("OrganizationNoPerms", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureExternalProvisionerDaemons: 1,
 			},
-		})
+		}})
 		another, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, err := another.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
 			codersdk.ProvisionerTypeEcho,
@@ -94,13 +87,11 @@ func TestProvisionerDaemonServe(t *testing.T) {
 
 	t.Run("UserLocal", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureExternalProvisionerDaemons: 1,
 			},
-		})
+		}})
 		closer := coderdtest.NewExternalProvisionerDaemon(t, client, user.OrganizationID, map[string]string{
 			provisionerdserver.TagScope: provisionerdserver.ScopeUser,
 		})

enterprise/coderd/replicas_test.go

@@ -20,22 +20,27 @@ import (
 
 func TestReplicas(t *testing.T) {
 	t.Parallel()
+	if !dbtestutil.WillUsePostgres() {
+		t.Skip("only test with real postgresF")
+	}
 	t.Run("ErrorWithoutLicense", func(t *testing.T) {
 		t.Parallel()
 		db, pubsub := dbtestutil.NewDB(t)
-		firstClient := coderdenttest.New(t, &coderdenttest.Options{
+		firstClient, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
 			},
+			DontAddLicense: true,
 		})
-		_ = coderdtest.CreateFirstUser(t, firstClient)
-		secondClient, _, secondAPI := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		secondClient, _, secondAPI, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				Database: db,
 				Pubsub:   pubsub,
 			},
+			DontAddFirstUser: true,
+			DontAddLicense:   true,
 		})
 		secondClient.SetSessionToken(firstClient.SessionToken())
 		ents, err := secondClient.Entitlements(context.Background())
@@ -50,25 +55,26 @@ func TestReplicas(t *testing.T) {
 	t.Run("ConnectAcrossMultiple", func(t *testing.T) {
 		t.Parallel()
 		db, pubsub := dbtestutil.NewDB(t)
-		firstClient := coderdenttest.New(t, &coderdenttest.Options{
+		firstClient, firstUser := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
 			},
-		})
-		firstUser := coderdtest.CreateFirstUser(t, firstClient)
-		coderdenttest.AddLicense(t, firstClient, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureHighAvailability: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureHighAvailability: 1,
+				},
 			},
 		})
 
-		secondClient := coderdenttest.New(t, &coderdenttest.Options{
+		secondClient, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				Database: db,
 				Pubsub:   pubsub,
 			},
+			DontAddLicense:   true,
+			DontAddFirstUser: true,
 		})
 		secondClient.SetSessionToken(firstClient.SessionToken())
 		replicas, err := secondClient.Replicas(context.Background())
@@ -93,27 +99,28 @@ func TestReplicas(t *testing.T) {
 		t.Parallel()
 		db, pubsub := dbtestutil.NewDB(t)
 		certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")}
-		firstClient := coderdenttest.New(t, &coderdenttest.Options{
+		firstClient, firstUser := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
 				TLSCertificates:          certificates,
 			},
-		})
-		firstUser := coderdtest.CreateFirstUser(t, firstClient)
-		coderdenttest.AddLicense(t, firstClient, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureHighAvailability: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureHighAvailability: 1,
+				},
 			},
 		})
 
-		secondClient := coderdenttest.New(t, &coderdenttest.Options{
+		secondClient, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				Database:        db,
 				Pubsub:          pubsub,
 				TLSCertificates: certificates,
 			},
+			DontAddFirstUser: true,
+			DontAddLicense:   true,
 		})
 		secondClient.SetSessionToken(firstClient.SessionToken())
 		replicas, err := secondClient.Replicas(context.Background())

enterprise/coderd/scim_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
 	"github.com/coder/coder/enterprise/coderd"
@@ -63,12 +62,13 @@ func TestScim(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 			defer cancel()
 
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: []byte("hi")})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 0,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: []byte("hi"),
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 0,
+					},
 				},
 			})
 
@@ -84,12 +84,13 @@ func TestScim(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 			defer cancel()
 
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: []byte("hi")})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 1,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: []byte("hi"),
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 1,
+					},
 				},
 			})
 
@@ -106,12 +107,13 @@ func TestScim(t *testing.T) {
 			defer cancel()
 
 			scimAPIKey := []byte("hi")
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: scimAPIKey})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 1,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: scimAPIKey,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 1,
+					},
 				},
 			})
 
@@ -136,12 +138,13 @@ func TestScim(t *testing.T) {
 			defer cancel()
 
 			scimAPIKey := []byte("hi")
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: scimAPIKey})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 1,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: scimAPIKey,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 1,
+					},
 				},
 			})
 
@@ -172,12 +175,13 @@ func TestScim(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 			defer cancel()
 
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: []byte("hi")})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 0,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: []byte("hi"),
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 0,
+					},
 				},
 			})
 
@@ -193,12 +197,13 @@ func TestScim(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 			defer cancel()
 
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: []byte("hi")})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 1,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: []byte("hi"),
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 1,
+					},
 				},
 			})
 
@@ -215,12 +220,13 @@ func TestScim(t *testing.T) {
 			defer cancel()
 
 			scimAPIKey := []byte("hi")
-			client := coderdenttest.New(t, &coderdenttest.Options{SCIMAPIKey: scimAPIKey})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AccountID: "coolin",
-				Features: license.Features{
-					codersdk.FeatureSCIM: 1,
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
+				SCIMAPIKey: scimAPIKey,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					AccountID: "coolin",
+					Features: license.Features{
+						codersdk.FeatureSCIM: 1,
+					},
 				},
 			})
 

enterprise/coderd/templates_test.go

@@ -28,15 +28,14 @@ func TestTemplates(t *testing.T) {
 	t.Run("SetMaxTTL", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureAdvancedTemplateScheduling: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
 			},
 		})
 
@@ -95,15 +94,14 @@ func TestTemplates(t *testing.T) {
 
 	t.Run("CreateUpdateWorkspaceMaxTTL", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureAdvancedTemplateScheduling: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
 			},
 		})
 
@@ -156,15 +154,14 @@ func TestTemplates(t *testing.T) {
 
 	t.Run("BlockDisablingAutoOffWithMaxTTL", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureAdvancedTemplateScheduling: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
 			},
 		})
 
@@ -211,13 +208,16 @@ func TestTemplates(t *testing.T) {
 		t.Parallel()
 
 		ctx := testutil.Context(t, testutil.WaitMedium)
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
+			},
 		})
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -262,13 +262,11 @@ func TestTemplateACL(t *testing.T) {
 
 	t.Run("UserRoles", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -305,13 +303,11 @@ func TestTemplateACL(t *testing.T) {
 
 	t.Run("everyoneGroup", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		// Create a user to assert they aren't returned in the response.
 		_, _ = coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -332,13 +328,11 @@ func TestTemplateACL(t *testing.T) {
 
 	t.Run("NoGroups", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client1, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -384,13 +378,11 @@ func TestTemplateACL(t *testing.T) {
 	t.Run("FilterDeletedUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -424,13 +416,11 @@ func TestTemplateACL(t *testing.T) {
 	t.Run("FilterSuspendedUsers", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -464,13 +454,11 @@ func TestTemplateACL(t *testing.T) {
 	t.Run("FilterDeletedGroups", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -514,13 +502,11 @@ func TestTemplateACL(t *testing.T) {
 
 	t.Run("AdminCanPushVersions", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client1, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -572,13 +558,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 
 	t.Run("UserPerms", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -618,20 +602,17 @@ func TestUpdateTemplateACL(t *testing.T) {
 		t.Parallel()
 
 		auditor := audit.NewMock()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			AuditLogging: true,
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 				Auditor:                  auditor,
 			},
-		})
-
-		user := coderdtest.CreateFirstUser(t, client)
-
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureTemplateRBAC: 1,
-				codersdk.FeatureAuditLog:     1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureTemplateRBAC: 1,
+					codersdk.FeatureAuditLog:     1,
+				},
 			},
 		})
 
@@ -659,13 +640,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("DeleteUser", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -722,13 +701,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("InvalidUUID", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -749,13 +726,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("InvalidUser", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -776,13 +751,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("InvalidRole", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		_, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -804,13 +777,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("RegularUserCannotUpdatePerms", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client2, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -841,13 +812,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("RegularUserWithAdminCanUpdate", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client2, user2 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		_, user3 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
@@ -885,13 +854,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("allUsersGroup", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -909,13 +876,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 	t.Run("CustomGroupHasAccess", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client1, user1 := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -976,13 +941,11 @@ func TestUpdateTemplateACL(t *testing.T) {
 
 	t.Run("NoAccess", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		client1, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -1031,13 +994,11 @@ func TestReadFileWithTemplateUpdate(t *testing.T) {
 		t.Parallel()
 
 		// Upload a file
-		client := coderdenttest.New(t, nil)
-		first := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, first := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
@@ -1086,13 +1047,11 @@ func TestTemplateAccess(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong*3)
 	t.Cleanup(cancel)
 
-	ownerClient := coderdenttest.New(t, nil)
-	owner := coderdtest.CreateFirstUser(t, ownerClient)
-	_ = coderdenttest.AddLicense(t, ownerClient, coderdenttest.LicenseOptions{
+	ownerClient, owner := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 		Features: license.Features{
 			codersdk.FeatureTemplateRBAC: 1,
 		},
-	})
+	}})
 
 	type coderUser struct {
 		*codersdk.Client

enterprise/coderd/userauth_test.go

@@ -7,6 +7,8 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/coder/coder/enterprise/coderd/license"
+
 	"github.com/golang-jwt/jwt"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
@@ -36,14 +38,13 @@ func TestUserOIDC(t *testing.T) {
 			})
 			config.AllowSignups = true
 
-			client := coderdenttest.New(t, &coderdenttest.Options{
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
 				Options: &coderdtest.Options{
 					OIDCConfig: config,
 				},
-			})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AllFeatures: true,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					Features: license.Features{codersdk.FeatureTemplateRBAC: 1},
+				},
 			})
 
 			admin, err := client.User(ctx, "me")
@@ -81,14 +82,13 @@ func TestUserOIDC(t *testing.T) {
 			})
 			config.AllowSignups = true
 
-			client := coderdenttest.New(t, &coderdenttest.Options{
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
 				Options: &coderdtest.Options{
 					OIDCConfig: config,
 				},
-			})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AllFeatures: true,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					Features: license.Features{codersdk.FeatureTemplateRBAC: 1},
+				},
 			})
 
 			admin, err := client.User(ctx, "me")
@@ -121,14 +121,13 @@ func TestUserOIDC(t *testing.T) {
 			config := conf.OIDCConfig(t, jwt.MapClaims{})
 			config.AllowSignups = true
 
-			client := coderdenttest.New(t, &coderdenttest.Options{
+			client, firstUser := coderdenttest.New(t, &coderdenttest.Options{
 				Options: &coderdtest.Options{
 					OIDCConfig: config,
 				},
-			})
-			firstUser := coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AllFeatures: true,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					Features: license.Features{codersdk.FeatureTemplateRBAC: 1},
+				},
 			})
 
 			// Add some extra users/groups that should be asserted after.
@@ -187,14 +186,13 @@ func TestUserOIDC(t *testing.T) {
 			config := conf.OIDCConfig(t, jwt.MapClaims{})
 			config.AllowSignups = true
 
-			client := coderdenttest.New(t, &coderdenttest.Options{
+			client, _ := coderdenttest.New(t, &coderdenttest.Options{
 				Options: &coderdtest.Options{
 					OIDCConfig: config,
 				},
-			})
-			_ = coderdtest.CreateFirstUser(t, client)
-			coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-				AllFeatures: true,
+				LicenseOptions: &coderdenttest.LicenseOptions{
+					Features: license.Features{codersdk.FeatureTemplateRBAC: 1},
+				},
 			})
 
 			admin, err := client.User(ctx, "me")

enterprise/coderd/workspaceagents_test.go

@@ -33,16 +33,15 @@ func TestBlockNonBrowser(t *testing.T) {
 	t.Parallel()
 	t.Run("Enabled", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			BrowserOnly: true,
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureBrowserOnly: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureBrowserOnly: 1,
+				},
 			},
 		})
 		_, agent := setupWorkspaceAgent(t, client, user, 0)
@@ -53,15 +52,14 @@ func TestBlockNonBrowser(t *testing.T) {
 	})
 	t.Run("Disabled", func(t *testing.T) {
 		t.Parallel()
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureBrowserOnly: 0,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureBrowserOnly: 0,
+				},
 			},
 		})
 		_, agent := setupWorkspaceAgent(t, client, user, 0)

enterprise/coderd/workspaceproxy_test.go

@@ -45,7 +45,7 @@ func TestRegions(t *testing.T) {
 
 		db, pubsub := dbtestutil.NewDB(t)
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				AppHostname:      appHostname,
 				Database:         db,
@@ -54,7 +54,6 @@ func TestRegions(t *testing.T) {
 			},
 		})
 
-		_ = coderdtest.CreateFirstUser(t, client)
 		ctx := testutil.Context(t, testutil.WaitLong)
 		deploymentID, err := db.GetDeploymentID(ctx)
 		require.NoError(t, err, "get deployment ID")
@@ -89,13 +88,18 @@ func TestRegions(t *testing.T) {
 
 		db, pubsub := dbtestutil.NewDB(t)
 
-		client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		client, closer, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				AppHostname:      appHostname,
 				Database:         db,
 				Pubsub:           pubsub,
 				DeploymentValues: dv,
 			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
+			},
 		})
 		t.Cleanup(func() {
 			_ = closer.Close()
@@ -103,12 +107,6 @@ func TestRegions(t *testing.T) {
 		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{
-				codersdk.FeatureWorkspaceProxy: 1,
-			},
-		})
 
 		const proxyName = "hello"
 		_ = coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
@@ -157,13 +155,12 @@ func TestRegions(t *testing.T) {
 		}
 
 		ctx := testutil.Context(t, testutil.WaitLong)
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				AppHostname:      appHostname,
 				DeploymentValues: dv,
 			},
 		})
-		_ = coderdtest.CreateFirstUser(t, client)
 
 		unauthedClient := codersdk.New(client.URL)
 		regions, err := unauthedClient.Regions(ctx)
@@ -185,7 +182,7 @@ func TestRegions(t *testing.T) {
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
-		client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		client, closer, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				AppHostname:      appHostname,
 				Database:         db,
@@ -196,16 +193,15 @@ func TestRegions(t *testing.T) {
 			// check will never happen manually. All checks will be
 			// forced updates.
 			ProxyHealthInterval: time.Hour,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
+			},
 		})
 		t.Cleanup(func() {
 			_ = closer.Close()
 		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
-			},
-		})
 
 		const proxyName = "testproxy"
 		proxy := coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
@@ -247,15 +243,14 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 			string(codersdk.ExperimentMoons),
 			"*",
 		}
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
-		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
 			},
 		})
 		ctx := testutil.Context(t, testutil.WaitLong)
@@ -299,15 +294,14 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
 			string(codersdk.ExperimentMoons),
 			"*",
 		}
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, _ := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues: dv,
 			},
-		})
-		_ = coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
 			},
 		})
 		ctx := testutil.Context(t, testutil.WaitLong)
@@ -337,19 +331,17 @@ func TestIssueSignedAppToken(t *testing.T) {
 	}
 
 	db, pubsub := dbtestutil.NewDB(t)
-	client := coderdenttest.New(t, &coderdenttest.Options{
+	client, user := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			DeploymentValues:         dv,
 			Database:                 db,
 			Pubsub:                   pubsub,
 			IncludeProvisionerDaemon: true,
 		},
-	})
-
-	user := coderdtest.CreateFirstUser(t, client)
-	_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-		Features: license.Features{
-			codersdk.FeatureWorkspaceProxy: 1,
+		LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureWorkspaceProxy: 1,
+			},
 		},
 	})
 
@@ -445,25 +437,23 @@ func TestReconnectingPTYSignedToken(t *testing.T) {
 	}
 
 	db, pubsub := dbtestutil.NewDB(t)
-	client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+	client, closer, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
 			DeploymentValues:         dv,
 			Database:                 db,
 			Pubsub:                   pubsub,
 			IncludeProvisionerDaemon: true,
 		},
+		LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureWorkspaceProxy: 1,
+			},
+		},
 	})
 	t.Cleanup(func() {
 		closer.Close()
 	})
 
-	user := coderdtest.CreateFirstUser(t, client)
-	_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-		Features: license.Features{
-			codersdk.FeatureWorkspaceProxy: 1,
-		},
-	})
-
 	// Create a workspace + apps
 	authToken := uuid.NewString()
 	version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{

enterprise/coderd/workspacequota_test.go

@@ -39,19 +39,17 @@ func TestWorkspaceQuota(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
 		max := 1
-		client, _, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		client, _, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			UserWorkspaceQuota: max,
-		})
-		coderdtest.NewProvisionerDaemon(t, api.AGPL)
-		coderdtest.NewProvisionerDaemon(t, api.AGPL)
-		coderdtest.NewProvisionerDaemon(t, api.AGPL)
-
-		user := coderdtest.CreateFirstUser(t, client)
-		coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureTemplateRBAC: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureTemplateRBAC: 1,
+				},
 			},
 		})
+		coderdtest.NewProvisionerDaemon(t, api.AGPL)
+		coderdtest.NewProvisionerDaemon(t, api.AGPL)
+		coderdtest.NewProvisionerDaemon(t, api.AGPL)
 
 		verifyQuota(ctx, t, client, 0, 0)
 

enterprise/coderd/workspaces_test.go

@@ -33,13 +33,11 @@ func TestCreateWorkspace(t *testing.T) {
 	t.Run("Unauthorized", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdenttest.New(t, nil)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
 			Features: license.Features{
 				codersdk.FeatureTemplateRBAC: 1,
 			},
-		})
+		}})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
@@ -95,19 +93,20 @@ func TestWorkspaceAutobuild(t *testing.T) {
 				IgnoreErrors: true,
 			})
 			failureTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					Logger:                   &logger,
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				Logger:                   &logger,
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
@@ -141,19 +140,20 @@ func TestWorkspaceAutobuild(t *testing.T) {
 				IgnoreErrors: true,
 			})
 			failureTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					Logger:                   &logger,
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				Logger:                   &logger,
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -186,19 +186,20 @@ func TestWorkspaceAutobuild(t *testing.T) {
 				// builds.
 				IgnoreErrors: true,
 			})
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					Logger:                   &logger,
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				Logger:                   &logger,
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -228,18 +229,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker      = make(chan time.Time)
 			statCh      = make(chan autobuild.Stats)
 			inactiveTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
@@ -284,18 +286,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker      = make(chan time.Time)
 			statCh      = make(chan autobuild.Stats)
 			inactiveTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -325,18 +328,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker    = make(chan time.Time)
 			statCh    = make(chan autobuild.Stats)
 			lockedTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -366,18 +370,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker      = make(chan time.Time)
 			statCh      = make(chan autobuild.Stats)
 			inactiveTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -416,18 +421,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker        = make(chan time.Time)
 			statCh        = make(chan autobuild.Stats)
 			transitionTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
@@ -485,18 +491,19 @@ func TestWorkspaceAutobuild(t *testing.T) {
 			ticker    = make(chan time.Time)
 			statCh    = make(chan autobuild.Stats)
 			lockedTTL = time.Minute
-
-			client = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          ticker,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
 		)
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          ticker,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
 			ProvisionPlan:  echo.ProvisionComplete,
@@ -542,22 +549,22 @@ func TestWorkspaceAutobuild(t *testing.T) {
 		t.Parallel()
 
 		var (
-			ctx     = testutil.Context(t, testutil.WaitMedium)
-			tickCh  = make(chan time.Time)
-			statsCh = make(chan autobuild.Stats)
-			client  = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					AutobuildTicker:          tickCh,
-					IncludeProvisionerDaemon: true,
-					AutobuildStats:           statsCh,
-					TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
-				},
-			})
+			ctx         = testutil.Context(t, testutil.WaitMedium)
+			tickCh      = make(chan time.Time)
+			statsCh     = make(chan autobuild.Stats)
 			inactiveTTL = time.Minute
 		)
-
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddFullLicense(t, client)
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				AutobuildTicker:          tickCh,
+				IncludeProvisionerDaemon: true,
+				AutobuildStats:           statsCh,
+				TemplateScheduleStore:    &coderd.EnterpriseTemplateScheduleStore{},
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{codersdk.FeatureAdvancedTemplateScheduling: 1},
+			},
+		})
 
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 			Parse:          echo.ParseComplete,
@@ -623,15 +630,14 @@ func TestWorkspacesFiltering(t *testing.T) {
 
 		inactivityTTL := 1 * 24 * time.Hour
 
-		client := coderdenttest.New(t, &coderdenttest.Options{
+		client, user := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				IncludeProvisionerDaemon: true,
 			},
-		})
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureAdvancedTemplateScheduling: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureAdvancedTemplateScheduling: 1,
+				},
 			},
 		})
 

enterprise/tailnet/pgcoord.go

@@ -81,24 +81,26 @@ type pgCoord struct {
 	querier *querier
 }
 
+var pgCoordSubject = rbac.Subject{
+	ID: uuid.Nil.String(),
+	Roles: rbac.Roles([]rbac.Role{
+		{
+			Name:        "tailnetcoordinator",
+			DisplayName: "Tailnet Coordinator",
+			Site: rbac.Permissions(map[string][]rbac.Action{
+				rbac.ResourceTailnetCoordinator.Type: {rbac.WildcardSymbol},
+			}),
+			Org:  map[string][]rbac.Permission{},
+			User: []rbac.Permission{},
+		},
+	}),
+	Scope: rbac.ScopeAll,
+}.WithCachedASTValue()
+
 // NewPGCoord creates a high-availability coordinator that stores state in the PostgreSQL database and
 // receives notifications of updates via the pubsub.
 func NewPGCoord(ctx context.Context, logger slog.Logger, ps pubsub.Pubsub, store database.Store) (agpl.Coordinator, error) {
-	ctx, cancel := context.WithCancel(dbauthz.As(ctx, rbac.Subject{
-		ID: uuid.Nil.String(),
-		Roles: rbac.Roles([]rbac.Role{
-			{
-				Name:        "tailnetcoordinator",
-				DisplayName: "Tailnet Coordinator",
-				Site: rbac.Permissions(map[string][]rbac.Action{
-					rbac.ResourceTailnetCoordinator.Type: {rbac.WildcardSymbol},
-				}),
-				Org:  map[string][]rbac.Permission{},
-				User: []rbac.Permission{},
-			},
-		}),
-		Scope: rbac.ScopeAll,
-	}.WithCachedASTValue()))
+	ctx, cancel := context.WithCancel(dbauthz.As(ctx, pgCoordSubject))
 	id := uuid.New()
 	logger = logger.Named("pgcoord").With(slog.F("coordinator_id", id))
 	bCh := make(chan binding)
@@ -1243,7 +1245,8 @@ func (h *heartbeats) sendBeat() {
 
 func (h *heartbeats) sendDelete() {
 	// here we don't want to use the main context, since it will have been canceled
-	err := h.store.DeleteCoordinator(context.Background(), h.self)
+	ctx := dbauthz.As(context.Background(), pgCoordSubject)
+	err := h.store.DeleteCoordinator(ctx, h.self)
 	if err != nil {
 		h.logger.Error(h.ctx, "failed to send coordinator delete", slog.Error(err))
 		return

enterprise/wsproxy/wsproxy_test.go

@@ -26,7 +26,7 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
 			"*",
 		}
 
-		client, _, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
+		client, _, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues:         deploymentValues,
 				AppHostname:              "*.primary.test.coder.com",
@@ -41,12 +41,10 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
 					},
 				},
 			},
-		})
-
-		user := coderdtest.CreateFirstUser(t, client)
-		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
-			Features: license.Features{
-				codersdk.FeatureWorkspaceProxy: 1,
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureWorkspaceProxy: 1,
+				},
 			},
 		})
 

scripts/dbgen/main.go

@@ -53,7 +53,7 @@ func run() error {
 	}
 	databasePath := filepath.Join(localPath, "..", "..", "..", "coderd", "database")
 
-	err = orderAndStubDatabaseFunctions(filepath.Join(databasePath, "dbfake", "dbfake.go"), "q", "fakeQuerier", func(params stubParams) string {
+	err = orderAndStubDatabaseFunctions(filepath.Join(databasePath, "dbfake", "dbfake.go"), "q", "FakeQuerier", func(params stubParams) string {
 		return `panic("not implemented")`
 	})
 	if err != nil {

site/src/api/typesGenerated.ts

@@ -1431,13 +1431,13 @@ export const Entitlements: Entitlement[] = [
 export type Experiment =
   | "convert-to-oidc"
   | "moons"
-  | "tailnet_pg_coordinator"
+  | "tailnet_ha_coordinator"
   | "workspace_actions"
   | "workspace_build_logs_ui"
 export const Experiments: Experiment[] = [
   "convert-to-oidc",
   "moons",
-  "tailnet_pg_coordinator",
+  "tailnet_ha_coordinator",
   "workspace_actions",
   "workspace_build_logs_ui",
 ]