Skip to content

Commit 79418c5

Browse files
f0sself0ssel
committed
change max-ttl to default
1 parent 866270d commit 79418c5

19 files changed

+128
-136
lines changed

‎cli/templatecreate.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func templateCreate() *cobra.Command {
2727
directory string
2828
provisioner string
2929
parameterFile string
30-
maxTTL time.Duration
30+
defaultTTL time.Duration
3131
minAutostartInterval time.Duration
3232
)
3333
cmd := &cobra.Command{
@@ -108,10 +108,9 @@ func templateCreate() *cobra.Command {
108108
}
109109

110110
createReq := codersdk.CreateTemplateRequest{
111-
Name: templateName,
112-
VersionID: job.ID,
113-
MaxTTLMillis: ptr.Ref(maxTTL.Milliseconds()),
114-
MinAutostartIntervalMillis: ptr.Ref(minAutostartInterval.Milliseconds()),
111+
Name: templateName,
112+
VersionID: job.ID,
113+
DefaultTTLMillis: ptr.Ref(defaultTTL.Milliseconds()),
115114
}
116115

117116
_, err = client.CreateTemplate(cmd.Context(), organization.ID, createReq)
@@ -133,7 +132,7 @@ func templateCreate() *cobra.Command {
133132
cmd.Flags().StringVarP(&directory, "directory", "d", currentDirectory, "Specify the directory to create from")
134133
cmd.Flags().StringVarP(&provisioner, "test.provisioner", "", "terraform", "Customize the provisioner backend")
135134
cmd.Flags().StringVarP(&parameterFile, "parameter-file", "", "", "Specify a file path with parameter values.")
136-
cmd.Flags().DurationVarP(&maxTTL, "max-ttl", "", 24*time.Hour, "Specify a maximum TTL for workspaces created from this template.")
135+
cmd.Flags().DurationVarP(&defaultTTL, "default-ttl", "", 24*time.Hour, "Specify a default TTL for workspaces created from this template.")
137136
cmd.Flags().DurationVarP(&minAutostartInterval, "min-autostart-interval", "", time.Hour, "Specify a minimum autostart interval for workspaces created from this template.")
138137
// This is for testing!
139138
err := cmd.Flags().MarkHidden("test.provisioner")

‎cli/templatecreate_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ func TestTemplateCreate(t *testing.T) {
5353
"--directory", source,
5454
"--test.provisioner", string(database.ProvisionerTypeEcho),
5555
"--max-ttl", "24h",
56-
"--min-autostart-interval", "2h",
5756
}
5857
cmd, root := clitest.New(t, args...)
5958
clitest.SetupConfig(t, client, root)

‎cli/templateedit.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func templateEdit() *cobra.Command {
1616
name string
1717
description string
1818
icon string
19-
maxTTL time.Duration
19+
defaultTTL time.Duration
2020
)
2121

2222
cmd := &cobra.Command{
@@ -39,10 +39,10 @@ func templateEdit() *cobra.Command {
3939

4040
// NOTE: coderd will ignore empty fields.
4141
req := codersdk.UpdateTemplateMeta{
42-
Name: name,
43-
Description: description,
44-
Icon: icon,
45-
MaxTTLMillis: maxTTL.Milliseconds(),
42+
Name: name,
43+
Description: description,
44+
Icon: icon,
45+
DefaultTTLMillis: defaultTTL.Milliseconds(),
4646
}
4747

4848
_, err = client.UpdateTemplateMeta(cmd.Context(), template.ID, req)
@@ -57,7 +57,7 @@ func templateEdit() *cobra.Command {
5757
cmd.Flags().StringVarP(&name, "name", "", "", "Edit the template name")
5858
cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template description")
5959
cmd.Flags().StringVarP(&icon, "icon", "", "", "Edit the template icon path")
60-
cmd.Flags().DurationVarP(&maxTTL, "max-ttl", "", 0, "Edit the template maximum time before shutdown - workspaces created from this template cannot stay running longer than this.")
60+
cmd.Flags().DurationVarP(&defaultTTL, "default-ttl", "", 0, "Edit the template default time before shutdown - workspaces created from this template to this value.")
6161
cliui.AllowSkipPrompt(cmd)
6262

6363
return cmd

‎cli/templateedit_test.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,22 @@ func TestTemplateEdit(t *testing.T) {
2626
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) {
2727
ctr.Description = "original description"
2828
ctr.Icon = "/icons/default-icon.png"
29-
ctr.MaxTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds())
30-
ctr.MinAutostartIntervalMillis = ptr.Ref(time.Hour.Milliseconds())
29+
ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds())
3130
})
3231

3332
// Test the cli command.
3433
name := "new-template-name"
3534
desc := "lorem ipsum dolor sit amet et cetera"
3635
icon := "/icons/new-icon.png"
37-
maxTTL := 12 * time.Hour
38-
minAutostartInterval := time.Minute
36+
defaultTTL := 12 * time.Hour
3937
cmdArgs := []string{
4038
"templates",
4139
"edit",
4240
template.Name,
4341
"--name", name,
4442
"--description", desc,
4543
"--icon", icon,
46-
"--max-ttl", maxTTL.String(),
47-
"--min-autostart-interval", minAutostartInterval.String(),
44+
"--default-ttl", defaultTTL.String(),
4845
}
4946
cmd, root := clitest.New(t, cmdArgs...)
5047
clitest.SetupConfig(t, client, root)
@@ -59,8 +56,7 @@ func TestTemplateEdit(t *testing.T) {
5956
assert.Equal(t, name, updated.Name)
6057
assert.Equal(t, desc, updated.Description)
6158
assert.Equal(t, icon, updated.Icon)
62-
assert.Equal(t, maxTTL.Milliseconds(), updated.MaxTTLMillis)
63-
assert.Equal(t, minAutostartInterval.Milliseconds(), updated.MinAutostartIntervalMillis)
59+
assert.Equal(t, defaultTTL.Milliseconds(), updated.DefaultTTLMillis)
6460
})
6561

6662
t.Run("NotModified", func(t *testing.T) {
@@ -72,8 +68,7 @@ func TestTemplateEdit(t *testing.T) {
7268
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) {
7369
ctr.Description = "original description"
7470
ctr.Icon = "/icons/default-icon.png"
75-
ctr.MaxTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds())
76-
ctr.MinAutostartIntervalMillis = ptr.Ref(time.Hour.Milliseconds())
71+
ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds())
7772
})
7873

7974
// Test the cli command.
@@ -84,8 +79,7 @@ func TestTemplateEdit(t *testing.T) {
8479
"--name", template.Name,
8580
"--description", template.Description,
8681
"--icon", template.Icon,
87-
"--max-ttl", (time.Duration(template.MaxTTLMillis) * time.Millisecond).String(),
88-
"--min-autostart-interval", (time.Duration(template.MinAutostartIntervalMillis) * time.Millisecond).String(),
82+
"--default-ttl", (time.Duration(template.DefaultTTLMillis) * time.Millisecond).String(),
8983
}
9084
cmd, root := clitest.New(t, cmdArgs...)
9185
clitest.SetupConfig(t, client, root)
@@ -100,7 +94,7 @@ func TestTemplateEdit(t *testing.T) {
10094
assert.Equal(t, template.Name, updated.Name)
10195
assert.Equal(t, template.Description, updated.Description)
10296
assert.Equal(t, template.Icon, updated.Icon)
103-
assert.Equal(t, template.MaxTTLMillis, updated.MaxTTLMillis)
97+
assert.Equal(t, template.DefaultTTLMillis, updated.DefaultTTLMillis)
10498
assert.Equal(t, template.MinAutostartIntervalMillis, updated.MinAutostartIntervalMillis)
10599
})
106100
}

‎cli/templates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func displayTemplates(filterColumns []string, templates ...codersdk.Template) (s
7575
Provisioner: template.Provisioner,
7676
ActiveVersionID: template.ActiveVersionID,
7777
UsedBy: cliui.Styles.Fuchsia.Render(formatActiveDevelopers(template.ActiveUserCount)),
78-
MaxTTL: (time.Duration(template.MaxTTLMillis) * time.Millisecond),
78+
MaxTTL: (time.Duration(template.DefaultTTLMillis) * time.Millisecond),
7979
MinAutostartInterval: (time.Duration(template.MinAutostartIntervalMillis) * time.Millisecond),
8080
}
8181
}

‎coderd/database/databasefake/databasefake.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ func (q *fakeQuerier) UpdateTemplateMetaByID(_ context.Context, arg database.Upd
13881388
tpl.Name = arg.Name
13891389
tpl.Description = arg.Description
13901390
tpl.Icon = arg.Icon
1391-
tpl.MaxTtl = arg.MaxTtl
1391+
tpl.DefaultTtl = arg.DefaultTtl
13921392
q.templates[idx] = tpl
13931393
return tpl, nil
13941394
}
@@ -2172,7 +2172,7 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
21722172
Provisioner: arg.Provisioner,
21732173
ActiveVersionID: arg.ActiveVersionID,
21742174
Description: arg.Description,
2175-
MaxTtl: arg.MaxTtl,
2175+
DefaultTtl: arg.DefaultTtl,
21762176
CreatedBy: arg.CreatedBy,
21772177
UserACL: arg.UserACL,
21782178
GroupACL: arg.GroupACL,

‎coderd/database/dump.sql

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000069_remove_min_autostart.down.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
-- add "slug" min_autostart_interval to "templates" table
22
ALTER TABLE "templates" ADD COLUMN "min_autostart_interval" int DEFAULT 0;
3+
4+
-- rename "default_ttl" to "max_ttl" on "templates" table
5+
ALTER TABLE "templates" RENAME COLUMN "default_ttl" TO "max_ttl";

‎coderd/database/migrations/000069_remove_min_autostart.up.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
-- drop "min_autostart_interval" column from "templates" table
22
ALTER TABLE "templates" DROP COLUMN "min_autostart_interval";
3+
4+
-- rename "max_ttl" to "default_ttl" on "templates" table
5+
ALTER TABLE "templates" RENAME COLUMN "max_ttl" TO "default_ttl";

‎coderd/database/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/templates.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ INSERT INTO
6565
provisioner,
6666
active_version_id,
6767
description,
68-
max_ttl,
68+
default_ttl,
6969
created_by,
7070
icon,
7171
user_acl,
@@ -98,7 +98,7 @@ UPDATE
9898
SET
9999
updated_at = $2,
100100
description = $3,
101-
max_ttl = $4,
101+
default_ttl = $4,
102102
name = $5,
103103
icon = $6
104104
WHERE

0 commit comments

Comments
 (0)