put routes under experiment

f0ssel · f0ssel · commit 22935ed5dc24 · 2024-07-12T20:26:09.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6551,6 +6551,7 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser
 		}
 	}
 
+	//nolint:gosimple
 	provisionerKey := database.ProvisionerKey{
 		ID:             arg.ID,
 		CreatedAt:      arg.CreatedAt,
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -259,6 +259,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 				apiKeyMiddleware,
 				httpmw.ExtractOrganizationParam(api.Database),
 				api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
+				httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),
 			)
 			r.Get("/", api.provisionerKeys)
 			r.Post("/", api.postProvisionerKey)
diff --git a/enterprise/coderd/provisionerkeys_test.go b/enterprise/coderd/provisionerkeys_test.go
@@ -19,11 +19,18 @@ func TestProvisionerKeys(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong*10)
 	t.Cleanup(cancel)
-	client, owner := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
-		Features: license.Features{
-			codersdk.FeatureMultipleOrganizations: 1,
+	dv := coderdtest.DeploymentValues(t)
+	dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
+	client, owner := coderdenttest.New(t, &coderdenttest.Options{
+		Options: &coderdtest.Options{
+			DeploymentValues: dv,
 		},
-	}})
+		LicenseOptions: &coderdenttest.LicenseOptions{
+			Features: license.Features{
+				codersdk.FeatureMultipleOrganizations: 1,
+			},
+		},
+	})
 	orgAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
 	member, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 	otherOrg := coderdtest.CreateOrganization(t, client, coderdtest.CreateOrganizationOptions{})

Original file line number	Diff line number	Diff line change
`@@ -6551,6 +6551,7 @@ func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.Inser`
`6551`	`6551`	`}`
`6552`	`6552`	`}`
`6553`	`6553`
	`6554`	`+ //nolint:gosimple`
`6554`	`6555`	`provisionerKey := database.ProvisionerKey{`
`6555`	`6556`	`ID: arg.ID,`
`6556`	`6557`	`CreatedAt: arg.CreatedAt,`
Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,7 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`259`	`259`	`apiKeyMiddleware,`
`260`	`260`	`httpmw.ExtractOrganizationParam(api.Database),`
`261`	`261`	`api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),`
	`262`	`+ httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),`
`262`	`263`	`)`
`263`	`264`	`r.Get("/", api.provisionerKeys)`
`264`	`265`	`r.Post("/", api.postProvisionerKey)`