Skip to content

Commit db589ac

Browse files
f0sself0ssel
committed
fix: remove unused min autostart feature
1 parent 5f099ea commit db589ac

File tree

8 files changed

+87
-129
lines changed

8 files changed

+87
-129
lines changed

‎cli/templateedit.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import (
1313

1414
func templateEdit() *cobra.Command {
1515
var (
16-
name string
17-
description string
18-
icon string
19-
maxTTL time.Duration
20-
minAutostartInterval time.Duration
16+
name string
17+
description string
18+
icon string
19+
maxTTL time.Duration
2120
)
2221

2322
cmd := &cobra.Command{
@@ -40,11 +39,10 @@ func templateEdit() *cobra.Command {
4039

4140
// NOTE: coderd will ignore empty fields.
4241
req := codersdk.UpdateTemplateMeta{
43-
Name: name,
44-
Description: description,
45-
Icon: icon,
46-
MaxTTLMillis: maxTTL.Milliseconds(),
47-
MinAutostartIntervalMillis: minAutostartInterval.Milliseconds(),
42+
Name: name,
43+
Description: description,
44+
Icon: icon,
45+
MaxTTLMillis: maxTTL.Milliseconds(),
4846
}
4947

5048
_, err = client.UpdateTemplateMeta(cmd.Context(), template.ID, req)
@@ -60,7 +58,6 @@ func templateEdit() *cobra.Command {
6058
cmd.Flags().StringVarP(&description, "description", "", "", "Edit the template description")
6159
cmd.Flags().StringVarP(&icon, "icon", "", "", "Edit the template icon path")
6260
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.")
63-
cmd.Flags().DurationVarP(&minAutostartInterval, "min-autostart-interval", "", 0, "Edit the template minimum autostart interval - workspaces created from this template must wait at least this long between autostarts.")
6461
cliui.AllowSkipPrompt(cmd)
6562

6663
return cmd

‎coderd/database/databasefake/databasefake.go

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,6 @@ func (q *fakeQuerier) UpdateTemplateMetaByID(_ context.Context, arg database.Upd
13891389
tpl.Description = arg.Description
13901390
tpl.Icon = arg.Icon
13911391
tpl.MaxTtl = arg.MaxTtl
1392-
tpl.MinAutostartInterval = arg.MinAutostartInterval
13931392
q.templates[idx] = tpl
13941393
return tpl, nil
13951394
}
@@ -2160,25 +2159,20 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
21602159
q.mutex.Lock()
21612160
defer q.mutex.Unlock()
21622161

2163-
if arg.MinAutostartInterval == 0 {
2164-
arg.MinAutostartInterval = int64(time.Hour)
2165-
}
2166-
21672162
//nolint:gosimple
21682163
template := database.Template{
2169-
ID: arg.ID,
2170-
CreatedAt: arg.CreatedAt,
2171-
UpdatedAt: arg.UpdatedAt,
2172-
OrganizationID: arg.OrganizationID,
2173-
Name: arg.Name,
2174-
Provisioner: arg.Provisioner,
2175-
ActiveVersionID: arg.ActiveVersionID,
2176-
Description: arg.Description,
2177-
MaxTtl: arg.MaxTtl,
2178-
MinAutostartInterval: arg.MinAutostartInterval,
2179-
CreatedBy: arg.CreatedBy,
2180-
UserACL: arg.UserACL,
2181-
GroupACL: arg.GroupACL,
2164+
ID: arg.ID,
2165+
CreatedAt: arg.CreatedAt,
2166+
UpdatedAt: arg.UpdatedAt,
2167+
OrganizationID: arg.OrganizationID,
2168+
Name: arg.Name,
2169+
Provisioner: arg.Provisioner,
2170+
ActiveVersionID: arg.ActiveVersionID,
2171+
Description: arg.Description,
2172+
MaxTtl: arg.MaxTtl,
2173+
CreatedBy: arg.CreatedBy,
2174+
UserACL: arg.UserACL,
2175+
GroupACL: arg.GroupACL,
21822176
}
21832177
q.templates = append(q.templates, template)
21842178
return template, nil

‎coderd/database/queries.sql.go

Lines changed: 22 additions & 28 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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ INSERT INTO
6666
active_version_id,
6767
description,
6868
max_ttl,
69-
min_autostart_interval,
7069
created_by,
7170
icon,
7271
user_acl,
7372
group_acl
7473
)
7574
VALUES
76-
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) RETURNING *;
75+
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) RETURNING *;
7776

7877
-- name: UpdateTemplateActiveVersionByID :exec
7978
UPDATE
@@ -100,9 +99,8 @@ SET
10099
updated_at = $2,
101100
description = $3,
102101
max_ttl = $4,
103-
min_autostart_interval = $5,
104-
name = $6,
105-
icon = $7
102+
name = $5,
103+
icon = $6
106104
WHERE
107105
id = $1
108106
RETURNING

‎coderd/templates.go

Lines changed: 29 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/coder/coder/coderd/httpmw"
2323
"github.com/coder/coder/coderd/rbac"
2424
"github.com/coder/coder/coderd/telemetry"
25-
"github.com/coder/coder/coderd/util/ptr"
2625
"github.com/coder/coder/codersdk"
2726
)
2827

@@ -236,28 +235,22 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
236235
return
237236
}
238237

239-
minAutostartInterval := minAutostartIntervalDefault
240-
if !ptr.NilOrZero(createTemplate.MinAutostartIntervalMillis) {
241-
minAutostartInterval = time.Duration(*createTemplate.MinAutostartIntervalMillis) * time.Millisecond
242-
}
243-
244238
var dbTemplate database.Template
245239
var template codersdk.Template
246240
err = api.Database.InTx(func(tx database.Store) error {
247241
now := database.Now()
248242
dbTemplate, err = tx.InsertTemplate(ctx, database.InsertTemplateParams{
249-
ID: uuid.New(),
250-
CreatedAt: now,
251-
UpdatedAt: now,
252-
OrganizationID: organization.ID,
253-
Name: createTemplate.Name,
254-
Provisioner: importJob.Provisioner,
255-
ActiveVersionID: templateVersion.ID,
256-
Description: createTemplate.Description,
257-
MaxTtl: int64(maxTTL),
258-
MinAutostartInterval: int64(minAutostartInterval),
259-
CreatedBy: apiKey.UserID,
260-
UserACL: database.TemplateACL{},
243+
ID: uuid.New(),
244+
CreatedAt: now,
245+
UpdatedAt: now,
246+
OrganizationID: organization.ID,
247+
Name: createTemplate.Name,
248+
Provisioner: importJob.Provisioner,
249+
ActiveVersionID: templateVersion.ID,
250+
Description: createTemplate.Description,
251+
MaxTtl: int64(maxTTL),
252+
CreatedBy: apiKey.UserID,
253+
UserACL: database.TemplateACL{},
261254
GroupACL: database.TemplateACL{
262255
organization.ID.String(): []rbac.Action{rbac.ActionRead},
263256
},
@@ -467,9 +460,6 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
467460
if req.MaxTTLMillis < 0 {
468461
validErrs = append(validErrs, codersdk.ValidationError{Field: "max_ttl_ms", Detail: "Must be a positive integer."})
469462
}
470-
if req.MinAutostartIntervalMillis < 0 {
471-
validErrs = append(validErrs, codersdk.ValidationError{Field: "min_autostart_interval_ms", Detail: "Must be a positive integer."})
472-
}
473463
if req.MaxTTLMillis > maxTTLDefault.Milliseconds() {
474464
validErrs = append(validErrs, codersdk.ValidationError{Field: "max_ttl_ms", Detail: "Cannot be greater than " + maxTTLDefault.String()})
475465
}
@@ -501,8 +491,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
501491
if req.Name == template.Name &&
502492
req.Description == template.Description &&
503493
req.Icon == template.Icon &&
504-
req.MaxTTLMillis == time.Duration(template.MaxTtl).Milliseconds() &&
505-
req.MinAutostartIntervalMillis == time.Duration(template.MinAutostartInterval).Milliseconds() {
494+
req.MaxTTLMillis == time.Duration(template.MaxTtl).Milliseconds() {
506495
return nil
507496
}
508497

@@ -511,26 +500,21 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
511500
desc := req.Description
512501
icon := req.Icon
513502
maxTTL := time.Duration(req.MaxTTLMillis) * time.Millisecond
514-
minAutostartInterval := time.Duration(req.MinAutostartIntervalMillis) * time.Millisecond
515503

516504
if name == "" {
517505
name = template.Name
518506
}
519507
if desc == "" {
520508
desc = template.Description
521509
}
522-
if minAutostartInterval == 0 {
523-
minAutostartInterval = time.Duration(template.MinAutostartInterval)
524-
}
525510

526511
updated, err = tx.UpdateTemplateMetaByID(ctx, database.UpdateTemplateMetaByIDParams{
527-
ID: template.ID,
528-
UpdatedAt: database.Now(),
529-
Name: name,
530-
Description: desc,
531-
Icon: icon,
532-
MaxTtl: int64(maxTTL),
533-
MinAutostartInterval: int64(minAutostartInterval),
512+
ID: template.ID,
513+
UpdatedAt: database.Now(),
514+
Name: name,
515+
Description: desc,
516+
Icon: icon,
517+
MaxTtl: int64(maxTTL),
534518
})
535519
if err != nil {
536520
return err
@@ -666,18 +650,17 @@ func (api *API) autoImportTemplate(ctx context.Context, opts autoImportTemplateO
666650

667651
// Create template
668652
template, err = tx.InsertTemplate(ctx, database.InsertTemplateParams{
669-
ID: uuid.New(),
670-
CreatedAt: now,
671-
UpdatedAt: now,
672-
OrganizationID: opts.orgID,
673-
Name: opts.name,
674-
Provisioner: job.Provisioner,
675-
ActiveVersionID: templateVersion.ID,
676-
Description: "This template was auto-imported by Coder.",
677-
MaxTtl: int64(maxTTLDefault),
678-
MinAutostartInterval: int64(minAutostartIntervalDefault),
679-
CreatedBy: opts.userID,
680-
UserACL: database.TemplateACL{},
653+
ID: uuid.New(),
654+
CreatedAt: now,
655+
UpdatedAt: now,
656+
OrganizationID: opts.orgID,
657+
Name: opts.name,
658+
Provisioner: job.Provisioner,
659+
ActiveVersionID: templateVersion.ID,
660+
Description: "This template was auto-imported by Coder.",
661+
MaxTtl: int64(maxTTLDefault),
662+
CreatedBy: opts.userID,
663+
UserACL: database.TemplateACL{},
681664
GroupACL: database.TemplateACL{
682665
opts.orgID.String(): []rbac.Action{rbac.ActionRead},
683666
},

0 commit comments

Comments
 (0)