Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0b7d68d

Browse files
authored
chore: remove template_update_policies experiment (#11250)
1 parent5b071f4 commit0b7d68d

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
returnxerrors.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-
ifexErr!=nil {
84-
returnxerrors.Errorf("get experiments: %w",exErr)
85-
}
86-
87-
if!experiments.Enabled(codersdk.ExperimentTemplateUpdatePolicies) {
88-
returnxerrors.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
returnxerrors.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-
ifexErr!=nil {
92-
returnxerrors.Errorf("get experiments: %w",exErr)
93-
}
94-
95-
if!experiments.Enabled(codersdk.ExperimentTemplateUpdatePolicies) {
96-
returnxerrors.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 aboutcustomizing 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 aboutcustomizing 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
ExperimentDeploymentHealthPageExperiment="deployment_health_page"
20902090

2091-
ExperimentTemplateUpdatePoliciesExperiment="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 aboutcustomizing 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 aboutcustomizing how changed files appear on GitHub.

‎site/src/components/Dashboard/DashboardProvider.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,3 @@ export const useIsWorkspaceActionsEnabled = (): boolean => {
121121
constallowWorkspaceActions=experiments.includes("workspace_actions");
122122
returnallowWorkspaceActions&&allowAdvancedScheduling;
123123
};
124-
125-
exportconstuseTemplatePoliciesEnabled=():boolean=>{
126-
const{ entitlements, experiments}=useDashboard();
127-
return(
128-
entitlements.features.access_control.enabled&&
129-
experiments.includes("template_update_policies")
130-
);
131-
};

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export interface TemplateSettingsForm {
5252
// Helpful to show field errors on Storybook
5353
initialTouched?:FormikTouched<UpdateTemplateMeta>;
5454
accessControlEnabled:boolean;
55-
templatePoliciesEnabled:boolean;
5655
}
5756

5857
exportconstTemplateSettingsForm:FC<TemplateSettingsForm>=({
@@ -63,7 +62,6 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
6362
isSubmitting,
6463
initialTouched,
6564
accessControlEnabled,
66-
templatePoliciesEnabled,
6765
})=>{
6866
constvalidationSchema=getValidationSchema();
6967
constform:FormikContextType<UpdateTemplateMeta>=
@@ -180,41 +178,39 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
180178
</Stack>
181179
</Stack>
182180
</label>
183-
{templatePoliciesEnabled&&(
184-
<labelhtmlFor="require_active_version">
185-
<Stackdirection="row"spacing={1}>
186-
<Checkbox
187-
id="require_active_version"
188-
name="require_active_version"
189-
checked={form.values.require_active_version}
190-
onChange={form.handleChange}
191-
/>
181+
<labelhtmlFor="require_active_version">
182+
<Stackdirection="row"spacing={1}>
183+
<Checkbox
184+
id="require_active_version"
185+
name="require_active_version"
186+
checked={form.values.require_active_version}
187+
onChange={form.handleChange}
188+
/>
192189

193-
<Stackdirection="column"spacing={0.5}>
194-
<Stack
195-
direction="row"
196-
alignItems="center"
197-
spacing={0.5}
198-
css={styles.optionText}
199-
>
200-
Require workspaces automatically update when started.
201-
<HelpTooltip>
202-
<HelpTooltipTrigger/>
203-
<HelpTooltipContent>
204-
<HelpTooltipText>
205-
This setting is not enforced for template admins.
206-
</HelpTooltipText>
207-
</HelpTooltipContent>
208-
</HelpTooltip>
209-
</Stack>
210-
<spancss={styles.optionHelperText}>
211-
Workspaces that are manually started or auto-started will
212-
use the active template version.
213-
</span>
190+
<Stackdirection="column"spacing={0.5}>
191+
<Stack
192+
direction="row"
193+
alignItems="center"
194+
spacing={0.5}
195+
css={styles.optionText}
196+
>
197+
Require workspaces automatically update when started.
198+
<HelpTooltip>
199+
<HelpTooltipTrigger/>
200+
<HelpTooltipContent>
201+
<HelpTooltipText>
202+
This setting is not enforced for template admins.
203+
</HelpTooltipText>
204+
</HelpTooltipContent>
205+
</HelpTooltip>
214206
</Stack>
207+
<spancss={styles.optionHelperText}>
208+
Workspaces that are manually started or auto-started will use
209+
the active template version.
210+
</span>
215211
</Stack>
216-
</label>
217-
)}
212+
</Stack>
213+
</label>
218214
</Stack>
219215
</FormSection>
220216

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ const fillAndSubmitForm = async ({
8080
awaituserEvent.clear(iconField);
8181
awaituserEvent.type(iconField,icon);
8282

83-
constallowCancelJobsField=screen.getByRole("checkbox");
83+
constallowCancelJobsField=screen.getByRole("checkbox",{
84+
name:"Allow users to cancel in-progress workspace jobs. Depending on your template, canceling builds may leave workspaces in an unhealthy state. This option isn't recommended for most use cases.",
85+
});
8486
// checkbox is checked by default, so it must be clicked to get unchecked
8587
if(!allow_user_cancel_workspace_jobs){
8688
awaituserEvent.click(allowCancelJobsField);

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import { useTemplateSettings } from "../TemplateSettingsLayout";
1010
import{TemplateSettingsPageView}from"./TemplateSettingsPageView";
1111
import{templateByNameKey}from"api/queries/templates";
1212
import{useOrganizationId}from"hooks";
13-
import{
14-
useDashboard,
15-
useTemplatePoliciesEnabled,
16-
}from"components/Dashboard/DashboardProvider";
13+
import{useDashboard}from"components/Dashboard/DashboardProvider";
1714

1815
exportconstTemplateSettingsPage:FC=()=>{
1916
const{template:templateName}=useParams()as{template:string};
@@ -23,7 +20,6 @@ export const TemplateSettingsPage: FC = () => {
2320
constqueryClient=useQueryClient();
2421
const{ entitlements}=useDashboard();
2522
constaccessControlEnabled=entitlements.features.access_control.enabled;
26-
consttemplatePoliciesEnabled=useTemplatePoliciesEnabled();
2723

2824
const{
2925
mutate:updateTemplate,
@@ -62,7 +58,6 @@ export const TemplateSettingsPage: FC = () => {
6258
});
6359
}}
6460
accessControlEnabled={accessControlEnabled}
65-
templatePoliciesEnabled={templatePoliciesEnabled}
6661
/>
6762
</>
6863
);

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.stories.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const meta: Meta<typeof TemplateSettingsPageView> = {
88
args:{
99
template:MockTemplate,
1010
accessControlEnabled:true,
11-
templatePoliciesEnabled:true,
1211
},
1312
};
1413

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export interface TemplateSettingsPageViewProps {
1313
typeofTemplateSettingsForm
1414
>["initialTouched"];
1515
accessControlEnabled:boolean;
16-
templatePoliciesEnabled:boolean;
1716
}
1817

1918
exportconstTemplateSettingsPageView:FC<TemplateSettingsPageViewProps>=({
@@ -24,7 +23,6 @@ export const TemplateSettingsPageView: FC<TemplateSettingsPageViewProps> = ({
2423
submitError,
2524
initialTouched,
2625
accessControlEnabled,
27-
templatePoliciesEnabled,
2826
})=>{
2927
return(
3028
<>
@@ -40,7 +38,6 @@ export const TemplateSettingsPageView: FC<TemplateSettingsPageViewProps> = ({
4038
onCancel={onCancel}
4139
error={submitError}
4240
accessControlEnabled={accessControlEnabled}
43-
templatePoliciesEnabled={templatePoliciesEnabled}
4441
/>
4542
</>
4643
);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp