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

Commite49d651

Browse files
committed
more removal of max_ttl
1 parent17eeda6 commite49d651

File tree

7 files changed

+5
-40
lines changed

7 files changed

+5
-40
lines changed

‎cli/templatecreate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (r *RootCmd) templateCreate() *serpent.Command {
5757

5858
ifisTemplateSchedulingOptionsSet {
5959
if!entitlements.Features[codersdk.FeatureAdvancedTemplateScheduling].Enabled {
60-
returnxerrors.Errorf("your license is not entitled to use advanced template scheduling, so you cannot set --failure-ttl,--inactivity-ttl,or --max-ttl")
60+
returnxerrors.Errorf("your license is not entitled to use advanced template scheduling, so you cannot set --failure-ttl, or --inactivity-ttl")
6161
}
6262
}
6363

‎site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ export interface CreateTemplateData {
4141
description:string;
4242
icon:string;
4343
default_ttl_hours:number;
44-
use_max_ttl:boolean;
45-
max_ttl_hours:number;
4644
autostart_requirement_days_of_week:TemplateAutostartRequirementDaysValue[];
4745
autostop_requirement_days_of_week:TemplateAutostopRequirementDaysValue;
4846
autostop_requirement_weeks:number;
@@ -70,13 +68,6 @@ const defaultInitialValues: CreateTemplateData = {
7068
description:"",
7169
icon:"",
7270
default_ttl_hours:24,
73-
// max_ttl is an enterprise-only feature, and the server ignores the value if
74-
// you are not licensed. We hide the form value based on entitlements.
75-
//
76-
// The maximum value is 30 days but we default to 7 days as it's a much more
77-
// sensible value for most teams.
78-
use_max_ttl:false,// autostop_requirement is default
79-
max_ttl_hours:24*7,
8071
// autostop_requirement is an enterprise-only feature, and the server ignores
8172
// the value if you are not licensed. We hide the form value based on
8273
// entitlements.
@@ -110,7 +101,6 @@ const getInitialValues = ({
110101
if(!allowAdvancedScheduling){
111102
initialValues={
112103
...initialValues,
113-
max_ttl_hours:0,
114104
autostop_requirement_days_of_week:"off",
115105
autostop_requirement_weeks:1,
116106
};

‎site/src/pages/CreateTemplatePage/utils.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,25 @@ const provisioner: ProvisionerType =
1212
typeof(windowasany).playwright!=="undefined" ?"echo" :"terraform";
1313

1414
exportconstnewTemplate=(formData:CreateTemplateData)=>{
15-
let{
16-
max_ttl_hours,
17-
autostop_requirement_days_of_week,
18-
autostop_requirement_weeks,
19-
}=formData;
15+
const{ autostop_requirement_days_of_week, autostop_requirement_weeks}=
16+
formData;
2017

2118
constsafeTemplateData={
2219
name:formData.name,
2320
display_name:formData.display_name,
2421
description:formData.description,
2522
icon:formData.icon,
26-
use_max_ttl:formData.use_max_ttl,
2723
allow_user_autostart:formData.allow_user_autostart,
2824
allow_user_autostop:formData.allow_user_autostop,
2925
allow_user_cancel_workspace_jobs:formData.allow_user_cancel_workspace_jobs,
3026
user_variable_values:formData.user_variable_values,
3127
allow_everyone_group_access:formData.allow_everyone_group_access,
3228
};
3329

34-
if(formData.use_max_ttl){
35-
autostop_requirement_days_of_week="off";
36-
autostop_requirement_weeks=1;
37-
}else{
38-
max_ttl_hours=0;
39-
}
40-
4130
return{
4231
...safeTemplateData,
4332
disable_everyone_group_access:!formData.allow_everyone_group_access,
4433
default_ttl_ms:formData.default_ttl_hours*60*60*1000,// Convert hours to ms
45-
max_ttl_ms:max_ttl_hours*60*60*1000,// Convert hours to ms
4634
autostop_requirement:{
4735
days_of_week:calculateAutostopRequirementDaysValue(
4836
autostop_requirement_days_of_week,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { TemplateSettingsPage } from "./TemplateSettingsPage";
1414
typeFormValues=Required<
1515
Omit<
1616
UpdateTemplateMeta,
17-
"default_ttl_ms"|"activity_bump_ms"|"max_ttl_ms"|"deprecation_message"
17+
"default_ttl_ms"|"activity_bump_ms"|"deprecation_message"
1818
>
1919
>;
2020

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import TemplateSchedulePage from "./TemplateSchedulePage";
1919
constvalidFormValues:TemplateScheduleFormValues={
2020
default_ttl_ms:1,
2121
activity_bump_ms:1,
22-
use_max_ttl:true,
23-
max_ttl_ms:2,
2422
failure_ttl_ms:7,
2523
time_til_dormant_ms:180,
2624
time_til_dormant_autodelete_ms:30,
@@ -146,7 +144,7 @@ describe("TemplateSchedulePage", () => {
146144
);
147145
});
148146

149-
test("defaultand max ttlis converted to and from hours",async()=>{
147+
test("default is converted to and from hours",async()=>{
150148
awaitrenderTemplateSchedulePage();
151149

152150
jest.spyOn(API,"updateTemplateMeta").mockResolvedValueOnce({
@@ -164,7 +162,6 @@ describe("TemplateSchedulePage", () => {
164162
"test-template",
165163
expect.objectContaining({
166164
default_ttl_ms:(validFormValues.default_ttl_ms||0)*3600000,
167-
max_ttl_ms:(validFormValues.max_ttl_ms||0)*3600000,
168165
}),
169166
);
170167
});

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/formHelpers.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ export const getValidationSchema = (): Yup.AnyObjectSchema =>
3838
24*MAX_TTL_DAYS/* 30 days in hours */,
3939
"Please enter an activity bump duration that is less than or equal to 720 hours (30 days).",
4040
),
41-
max_ttl_ms:Yup.number()
42-
.integer()
43-
.required()
44-
.min(0,"Maximum time until autostop must not be less than 0.")
45-
.max(
46-
24*MAX_TTL_DAYS/* 30 days in hours */,
47-
"Please enter a limit that is less than or equal to 720 hours (30 days).",
48-
),
4941
failure_ttl_ms:Yup.number()
5042
.integer()
5143
.required()

‎site/src/testHelpers/entities.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,6 @@ export const MockTemplate: TypesGen.Template = {
475475
description:"This is a test description.",
476476
default_ttl_ms:24*60*60*1000,
477477
activity_bump_ms:1*60*60*1000,
478-
use_max_ttl:false,
479-
max_ttl_ms:0,
480478
autostop_requirement:{
481479
days_of_week:["sunday"],
482480
weeks:1,

0 commit comments

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