Skip to content

Commit d844be7

Browse files
EmyrkEmyrk
committed
chore: remove multi-organization and custom role experiment
1 parent 5cc5bbe commit d844be7

23 files changed

+0
-111
lines changed

‎enterprise/cli/create_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ func TestEnterpriseCreate(t *testing.T) {
3838
// both organizations, and optionally creates templates in each organization.
3939
setupMultipleOrganizations := func(t *testing.T, args setupArgs) setupData {
4040
dv := coderdtest.DeploymentValues(t)
41-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
4241
ownerClient, first := coderdenttest.New(t, &coderdenttest.Options{
4342
Options: &coderdtest.Options{
4443
DeploymentValues: dv,

‎enterprise/cli/organization_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ func TestShowOrganizations(t *testing.T) {
120120
t.Parallel()
121121

122122
dv := coderdtest.DeploymentValues(t)
123-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
124123
ownerClient, first := coderdenttest.New(t, &coderdenttest.Options{
125124
Options: &coderdtest.Options{
126125
IncludeProvisionerDaemon: true,
@@ -160,7 +159,6 @@ func TestShowOrganizations(t *testing.T) {
160159
t.Run("UsingFlag", func(t *testing.T) {
161160
t.Parallel()
162161
dv := coderdtest.DeploymentValues(t)
163-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
164162
ownerClient, first := coderdenttest.New(t, &coderdenttest.Options{
165163
Options: &coderdtest.Options{
166164
IncludeProvisionerDaemon: true,

‎enterprise/cli/organizationmembers_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestRemoveOrganizationMembers(t *testing.T) {
2121
t.Run("OK", func(t *testing.T) {
2222
t.Parallel()
2323
dv := coderdtest.DeploymentValues(t)
24-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
2524

2625
ownerClient, _ := coderdenttest.New(t, &coderdenttest.Options{
2726
Options: &coderdtest.Options{

‎enterprise/cli/organizationsettings_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ func TestUpdateGroupSync(t *testing.T) {
2525
t.Parallel()
2626

2727
dv := coderdtest.DeploymentValues(t)
28-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
2928

3029
owner, first := coderdenttest.New(t, &coderdenttest.Options{
3130
Options: &coderdtest.Options{
@@ -82,7 +81,6 @@ func TestUpdateRoleSync(t *testing.T) {
8281
t.Parallel()
8382

8483
dv := coderdtest.DeploymentValues(t)
85-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
8684

8785
owner, _ := coderdenttest.New(t, &coderdenttest.Options{
8886
Options: &coderdtest.Options{

‎enterprise/cli/provisionerdaemonstart_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func TestProvisionerDaemon_PSK(t *testing.T) {
3131
t.Parallel()
3232

3333
dv := coderdtest.DeploymentValues(t)
34-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
3534
client, _ := coderdenttest.New(t, &coderdenttest.Options{
3635
Options: &coderdtest.Options{
3736
DeploymentValues: dv,
@@ -71,7 +70,6 @@ func TestProvisionerDaemon_PSK(t *testing.T) {
7170
t.Run("AnotherOrgByNameWithUser", func(t *testing.T) {
7271
t.Parallel()
7372
dv := coderdtest.DeploymentValues(t)
74-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
7573
client, _ := coderdenttest.New(t, &coderdenttest.Options{
7674
Options: &coderdtest.Options{
7775
DeploymentValues: dv,
@@ -225,7 +223,6 @@ func TestProvisionerDaemon_SessionToken(t *testing.T) {
225223
t.Run("ScopeUserAnotherOrg", func(t *testing.T) {
226224
t.Parallel()
227225
dv := coderdtest.DeploymentValues(t)
228-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
229226
client, _ := coderdenttest.New(t, &coderdenttest.Options{
230227
Options: &coderdtest.Options{
231228
DeploymentValues: dv,
@@ -274,7 +271,6 @@ func TestProvisionerDaemon_ProvisionerKey(t *testing.T) {
274271
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
275272
defer cancel()
276273
dv := coderdtest.DeploymentValues(t)
277-
dv.Experiments.Append(string(codersdk.ExperimentMultiOrganization))
278274
client, user := coderdenttest.New(t, &coderdenttest.Options{
279275
ProvisionerDaemonPSK: "provisionersftw",
280276
LicenseOptions: &coderdenttest.LicenseOptions{
@@ -320,7 +316,6 @@ func TestProvisionerDaemon_ProvisionerKey(t *testing.T) {
320316
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
321317
defer cancel()
322318
dv := coderdtest.DeploymentValues(t)
323-
dv.Experiments.Append(string(codersdk.ExperimentMultiOrganization))
324319
client, user := coderdenttest.New(t, &coderdenttest.Options{
325320
ProvisionerDaemonPSK: "provisionersftw",
326321
LicenseOptions: &coderdenttest.LicenseOptions{
@@ -351,7 +346,6 @@ func TestProvisionerDaemon_ProvisionerKey(t *testing.T) {
351346
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
352347
defer cancel()
353348
dv := coderdtest.DeploymentValues(t)
354-
dv.Experiments.Append(string(codersdk.ExperimentMultiOrganization))
355349
client, user := coderdenttest.New(t, &coderdenttest.Options{
356350
ProvisionerDaemonPSK: "provisionersftw",
357351
LicenseOptions: &coderdenttest.LicenseOptions{
@@ -382,7 +376,6 @@ func TestProvisionerDaemon_ProvisionerKey(t *testing.T) {
382376
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
383377
defer cancel()
384378
dv := coderdtest.DeploymentValues(t)
385-
dv.Experiments.Append(string(codersdk.ExperimentMultiOrganization))
386379
client, _ := coderdenttest.New(t, &coderdenttest.Options{
387380
ProvisionerDaemonPSK: "provisionersftw",
388381
LicenseOptions: &coderdenttest.LicenseOptions{

‎enterprise/cli/provisionerkeys_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func TestProvisionerKeys(t *testing.T) {
2424
t.Parallel()
2525

2626
dv := coderdtest.DeploymentValues(t)
27-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
2827
client, owner := coderdenttest.New(t, &coderdenttest.Options{
2928
Options: &coderdtest.Options{
3029
DeploymentValues: dv,

‎enterprise/cli/templatecreate_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ func TestTemplateCreate(t *testing.T) {
140140
t.Parallel()
141141

142142
dv := coderdtest.DeploymentValues(t)
143-
dv.Experiments = []string{
144-
string(codersdk.ExperimentCustomRoles),
145-
string(codersdk.ExperimentMultiOrganization),
146-
}
147143
ownerClient, _ := coderdenttest.New(t, &coderdenttest.Options{
148144
Options: &coderdtest.Options{
149145
DeploymentValues: dv,

‎enterprise/cli/templatelist_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func TestEnterpriseListTemplates(t *testing.T) {
2424
t.Parallel()
2525

2626
dv := coderdtest.DeploymentValues(t)
27-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
2827
client, owner := coderdenttest.New(t, &coderdenttest.Options{
2928
Options: &coderdtest.Options{
3029
IncludeProvisionerDaemon: true,

‎enterprise/coderd/audit_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestEnterpriseAuditLogs(t *testing.T) {
2121

2222
ctx := context.Background()
2323
dv := coderdtest.DeploymentValues(t)
24-
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
2524
client, user := coderdenttest.New(t, &coderdenttest.Options{
2625
Options: &coderdtest.Options{
2726
DeploymentValues: dv,

‎enterprise/coderd/coderd.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
261261
r.Use(
262262
apiKeyMiddleware,
263263
api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
264-
httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),
265264
)
266265
r.Post("/organizations", api.postOrganizations)
267266
})
@@ -270,7 +269,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
270269
r.Use(
271270
apiKeyMiddleware,
272271
api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
273-
httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),
274272
httpmw.ExtractOrganizationParam(api.Database),
275273
)
276274
r.Patch("/organizations/{organization}", api.patchOrganization)
@@ -336,7 +334,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
336334
apiKeyMiddleware,
337335
httpmw.ExtractOrganizationParam(api.Database),
338336
api.RequireFeatureMW(codersdk.FeatureMultipleOrganizations),
339-
httpmw.RequireExperiment(api.AGPL.Experiments, codersdk.ExperimentMultiOrganization),
340337
)
341338
r.Get("/", api.provisionerKeys)
342339
r.Post("/", api.postProvisionerKey)

‎enterprise/coderd/idpsync_test.go

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ func TestGetGroupSyncConfig(t *testing.T) {
2626
t.Parallel()
2727

2828
dv := coderdtest.DeploymentValues(t)
29-
dv.Experiments = []string{
30-
string(codersdk.ExperimentCustomRoles),
31-
string(codersdk.ExperimentMultiOrganization),
32-
}
3329

3430
owner, db, user := coderdenttest.NewWithDatabase(t, &coderdenttest.Options{
3531
Options: &coderdtest.Options{
@@ -60,10 +56,6 @@ func TestGetGroupSyncConfig(t *testing.T) {
6056
t.Parallel()
6157

6258
dv := coderdtest.DeploymentValues(t)
63-
dv.Experiments = []string{
64-
string(codersdk.ExperimentCustomRoles),
65-
string(codersdk.ExperimentMultiOrganization),
66-
}
6759
dv.OIDC.GroupField = "legacy-group"
6860
dv.OIDC.GroupRegexFilter = serpent.Regexp(*regexp.MustCompile("legacy-filter"))
6961
dv.OIDC.GroupMapping = serpent.Struct[map[string]string]{
@@ -102,11 +94,6 @@ func TestPostGroupSyncConfig(t *testing.T) {
10294
t.Parallel()
10395

10496
dv := coderdtest.DeploymentValues(t)
105-
dv.Experiments = []string{
106-
string(codersdk.ExperimentCustomRoles),
107-
string(codersdk.ExperimentMultiOrganization),
108-
}
109-
11097
owner, user := coderdenttest.New(t, &coderdenttest.Options{
11198
Options: &coderdtest.Options{
11299
DeploymentValues: dv,
@@ -138,11 +125,6 @@ func TestPostGroupSyncConfig(t *testing.T) {
138125
t.Parallel()
139126

140127
dv := coderdtest.DeploymentValues(t)
141-
dv.Experiments = []string{
142-
string(codersdk.ExperimentCustomRoles),
143-
string(codersdk.ExperimentMultiOrganization),
144-
}
145-
146128
owner, user := coderdenttest.New(t, &coderdenttest.Options{
147129
Options: &coderdtest.Options{
148130
DeploymentValues: dv,
@@ -178,11 +160,6 @@ func TestGetRoleSyncConfig(t *testing.T) {
178160
t.Parallel()
179161

180162
dv := coderdtest.DeploymentValues(t)
181-
dv.Experiments = []string{
182-
string(codersdk.ExperimentCustomRoles),
183-
string(codersdk.ExperimentMultiOrganization),
184-
}
185-
186163
owner, _, _, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
187164
Options: &coderdtest.Options{
188165
DeploymentValues: dv,
@@ -221,11 +198,6 @@ func TestPostRoleSyncConfig(t *testing.T) {
221198
t.Parallel()
222199

223200
dv := coderdtest.DeploymentValues(t)
224-
dv.Experiments = []string{
225-
string(codersdk.ExperimentCustomRoles),
226-
string(codersdk.ExperimentMultiOrganization),
227-
}
228-
229201
owner, user := coderdenttest.New(t, &coderdenttest.Options{
230202
Options: &coderdtest.Options{
231203
DeploymentValues: dv,
@@ -257,11 +229,6 @@ func TestPostRoleSyncConfig(t *testing.T) {
257229
t.Parallel()
258230

259231
dv := coderdtest.DeploymentValues(t)
260-
dv.Experiments = []string{
261-
string(codersdk.ExperimentCustomRoles),
262-
string(codersdk.ExperimentMultiOrganization),
263-
}
264-
265232
owner, user := coderdenttest.New(t, &coderdenttest.Options{
266233
Options: &coderdtest.Options{
267234
DeploymentValues: dv,

0 commit comments

Comments
 (0)