Skip to content

Commit 0b7d68d

Browse files
sreyasreya
authored
chore: remove template_update_policies experiment (coder#11250)
1 parent 5b071f4 commit 0b7d68d

20 files changed

+77
-169
lines changed

‎cli/templatecreate.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
7878
if !entitlements.Features[codersdk.FeatureAccessControl].Enabled {
7979
return xerrors.Errorf("your license is not entitled to use enterprise access control, so you cannot set --require-active-version")
8080
}
81-
82-
experiments, exErr := client.Experiments(inv.Context())
83-
if exErr != nil {
84-
return xerrors.Errorf("get experiments: %w", exErr)
85-
}
86-
87-
if !experiments.Enabled(codersdk.ExperimentTemplateUpdatePolicies) {
88-
return xerrors.Errorf("--require-active-version is an experimental feature, contact an administrator to enable the 'template_update_policies' experiment on your Coder server")
89-
}
9081
}
9182
}
9283

‎cli/templatecreate_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/coder/coder/v2/cli/clitest"
1414
"github.com/coder/coder/v2/coderd/coderdtest"
1515
"github.com/coder/coder/v2/coderd/database"
16-
"github.com/coder/coder/v2/codersdk"
1716
"github.com/coder/coder/v2/provisioner/echo"
1817
"github.com/coder/coder/v2/provisionersdk/proto"
1918
"github.com/coder/coder/v2/pty/ptytest"
@@ -398,14 +397,8 @@ func TestTemplateCreate(t *testing.T) {
398397
t.Run("RequireActiveVersionInvalid", func(t *testing.T) {
399398
t.Parallel()
400399

401-
dv := coderdtest.DeploymentValues(t)
402-
dv.Experiments = []string{
403-
string(codersdk.ExperimentTemplateUpdatePolicies),
404-
}
405-
406400
client := coderdtest.New(t, &coderdtest.Options{
407401
IncludeProvisionerDaemon: true,
408-
DeploymentValues: dv,
409402
})
410403
coderdtest.CreateFirstUser(t, client)
411404
source := clitest.CreateTemplateVersionSource(t, completeWithAgent())

‎cli/templateedit.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,6 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
8686
if !entitlements.Features[codersdk.FeatureAccessControl].Enabled {
8787
return xerrors.Errorf("your license is not entitled to use enterprise access control, so you cannot set --require-active-version")
8888
}
89-
90-
experiments, exErr := client.Experiments(inv.Context())
91-
if exErr != nil {
92-
return xerrors.Errorf("get experiments: %w", exErr)
93-
}
94-
95-
if !experiments.Enabled(codersdk.ExperimentTemplateUpdatePolicies) {
96-
return xerrors.Errorf("--require-active-version is an experimental feature, contact an administrator to enable the 'template_update_policies' experiment on your Coder server")
97-
}
9889
}
9990
}
10091

‎coderd/apidoc/docs.go

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/deployment.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,6 @@ const (
20882088
// Deployment health page
20892089
ExperimentDeploymentHealthPage Experiment = "deployment_health_page"
20902090

2091-
ExperimentTemplateUpdatePolicies Experiment = "template_update_policies"
20922091
// Add new experiments here!
20932092
// ExperimentExample Experiment = "example"
20942093
)

‎docs/api/schemas.md

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎enterprise/cli/templatecreate_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@ func TestTemplateCreate(t *testing.T) {
2323
t.Run("RequireActiveVersion", func(t *testing.T) {
2424
t.Parallel()
2525

26-
dv := coderdtest.DeploymentValues(t)
27-
dv.Experiments = []string{
28-
string(codersdk.ExperimentTemplateUpdatePolicies),
29-
}
30-
3126
client, user := coderdenttest.New(t, &coderdenttest.Options{
3227
LicenseOptions: &coderdenttest.LicenseOptions{
3328
Features: license.Features{
3429
codersdk.FeatureAccessControl: 1,
3530
},
3631
},
3732
Options: &coderdtest.Options{
38-
DeploymentValues: dv,
3933
IncludeProvisionerDaemon: true,
4034
},
4135
})
@@ -124,17 +118,11 @@ func TestTemplateCreate(t *testing.T) {
124118
t.Run("NotEntitled", func(t *testing.T) {
125119
t.Parallel()
126120

127-
dv := coderdtest.DeploymentValues(t)
128-
dv.Experiments = []string{
129-
string(codersdk.ExperimentTemplateUpdatePolicies),
130-
}
131-
132121
client, admin := coderdenttest.New(t, &coderdenttest.Options{
133122
LicenseOptions: &coderdenttest.LicenseOptions{
134123
Features: license.Features{},
135124
},
136125
Options: &coderdtest.Options{
137-
DeploymentValues: dv,
138126
IncludeProvisionerDaemon: true,
139127
},
140128
})

‎enterprise/cli/templateedit_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ func TestTemplateEdit(t *testing.T) {
2121
t.Run("OK", func(t *testing.T) {
2222
t.Parallel()
2323

24-
dv := coderdtest.DeploymentValues(t)
25-
dv.Experiments = []string{
26-
string(codersdk.ExperimentTemplateUpdatePolicies),
27-
}
28-
2924
ownerClient, owner := coderdenttest.New(t, &coderdenttest.Options{
3025
LicenseOptions: &coderdenttest.LicenseOptions{
3126
Features: license.Features{
3227
codersdk.FeatureAccessControl: 1,
3328
},
3429
},
3530
Options: &coderdtest.Options{
36-
DeploymentValues: dv,
3731
IncludeProvisionerDaemon: true,
3832
},
3933
})
@@ -64,17 +58,11 @@ func TestTemplateEdit(t *testing.T) {
6458
t.Run("NotEntitled", func(t *testing.T) {
6559
t.Parallel()
6660

67-
dv := coderdtest.DeploymentValues(t)
68-
dv.Experiments = []string{
69-
string(codersdk.ExperimentTemplateUpdatePolicies),
70-
}
71-
7261
client, owner := coderdenttest.New(t, &coderdenttest.Options{
7362
LicenseOptions: &coderdenttest.LicenseOptions{
7463
Features: license.Features{},
7564
},
7665
Options: &coderdtest.Options{
77-
DeploymentValues: dv,
7866
IncludeProvisionerDaemon: true,
7967
},
8068
})

‎site/src/api/typesGenerated.ts

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)