Skip to content

Commit 6fdd314

Browse files
f0sself0ssel
committed
make gen
1 parent 71875fd commit 6fdd314

File tree

6 files changed

+56
-81
lines changed

6 files changed

+56
-81
lines changed

‎coderd/database/dump.sql

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

‎coderd/database/models.go

Lines changed: 14 additions & 15 deletions
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: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/templates.go

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -750,21 +750,20 @@ func (api *API) convertTemplate(
750750
buildTimeStats := api.metricsCache.TemplateBuildTimeStats(template.ID)
751751

752752
return codersdk.Template{
753-
ID: template.ID,
754-
CreatedAt: template.CreatedAt,
755-
UpdatedAt: template.UpdatedAt,
756-
OrganizationID: template.OrganizationID,
757-
Name: template.Name,
758-
Provisioner: codersdk.ProvisionerType(template.Provisioner),
759-
ActiveVersionID: template.ActiveVersionID,
760-
WorkspaceOwnerCount: workspaceOwnerCount,
761-
ActiveUserCount: activeCount,
762-
BuildTimeStats: buildTimeStats,
763-
Description: template.Description,
764-
Icon: template.Icon,
765-
MaxTTLMillis: time.Duration(template.MaxTtl).Milliseconds(),
766-
MinAutostartIntervalMillis: time.Duration(template.MinAutostartInterval).Milliseconds(),
767-
CreatedByID: template.CreatedBy,
768-
CreatedByName: createdByName,
753+
ID: template.ID,
754+
CreatedAt: template.CreatedAt,
755+
UpdatedAt: template.UpdatedAt,
756+
OrganizationID: template.OrganizationID,
757+
Name: template.Name,
758+
Provisioner: codersdk.ProvisionerType(template.Provisioner),
759+
ActiveVersionID: template.ActiveVersionID,
760+
WorkspaceOwnerCount: workspaceOwnerCount,
761+
ActiveUserCount: activeCount,
762+
BuildTimeStats: buildTimeStats,
763+
Description: template.Description,
764+
Icon: template.Icon,
765+
MaxTTLMillis: time.Duration(template.MaxTtl).Milliseconds(),
766+
CreatedByID: template.CreatedBy,
767+
CreatedByName: createdByName,
769768
}
770769
}

‎coderd/workspaces.go

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
333333
return
334334
}
335335

336-
dbAutostartSchedule, err := validWorkspaceSchedule(createWorkspace.AutostartSchedule, time.Duration(template.MinAutostartInterval))
336+
dbAutostartSchedule, err := validWorkspaceSchedule(createWorkspace.AutostartSchedule)
337337
if err != nil {
338338
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
339339
Message: "Invalid Autostart Schedule.",
@@ -666,16 +666,7 @@ func (api *API) putWorkspaceAutostart(rw http.ResponseWriter, r *http.Request) {
666666
return
667667
}
668668

669-
template, err := api.Database.GetTemplateByID(ctx, workspace.TemplateID)
670-
if err != nil {
671-
api.Logger.Error(ctx, "fetch workspace template", slog.F("workspace_id", workspace.ID), slog.F("template_id", workspace.TemplateID), slog.Error(err))
672-
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
673-
Message: "Error fetching workspace template.",
674-
})
675-
return
676-
}
677-
678-
dbSched, err := validWorkspaceSchedule(req.Schedule, time.Duration(template.MinAutostartInterval))
669+
dbSched, err := validWorkspaceSchedule(req.Schedule)
679670
if err != nil {
680671
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
681672
Message: "Invalid autostart schedule.",
@@ -1149,20 +1140,16 @@ func validWorkspaceDeadline(startedAt, newDeadline time.Time, max time.Duration)
11491140
return nil
11501141
}
11511142

1152-
func validWorkspaceSchedule(s *string, min time.Duration) (sql.NullString, error) {
1143+
func validWorkspaceSchedule(s *string) (sql.NullString, error) {
11531144
if ptr.NilOrEmpty(s) {
11541145
return sql.NullString{}, nil
11551146
}
11561147

1157-
sched, err := schedule.Weekly(*s)
1148+
_, err := schedule.Weekly(*s)
11581149
if err != nil {
11591150
return sql.NullString{}, err
11601151
}
11611152

1162-
if schedMin := sched.Min(); schedMin < min {
1163-
return sql.NullString{}, xerrors.Errorf("Minimum autostart interval %s below template minimum %s", schedMin, min)
1164-
}
1165-
11661153
return sql.NullString{
11671154
Valid: true,
11681155
String: *s,

‎enterprise/audit/diff_internal_test.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -242,26 +242,24 @@ func Test_diff(t *testing.T) {
242242
name: "Create",
243243
left: audit.Empty[database.Template](),
244244
right: database.Template{
245-
ID: uuid.UUID{1},
246-
CreatedAt: time.Now(),
247-
UpdatedAt: time.Now(),
248-
OrganizationID: uuid.UUID{2},
249-
Deleted: false,
250-
Name: "rust",
251-
Provisioner: database.ProvisionerTypeTerraform,
252-
ActiveVersionID: uuid.UUID{3},
253-
MaxTtl: int64(time.Hour),
254-
MinAutostartInterval: int64(time.Minute),
255-
CreatedBy: uuid.UUID{4},
245+
ID: uuid.UUID{1},
246+
CreatedAt: time.Now(),
247+
UpdatedAt: time.Now(),
248+
OrganizationID: uuid.UUID{2},
249+
Deleted: false,
250+
Name: "rust",
251+
Provisioner: database.ProvisionerTypeTerraform,
252+
ActiveVersionID: uuid.UUID{3},
253+
MaxTtl: int64(time.Hour),
254+
CreatedBy: uuid.UUID{4},
256255
},
257256
exp: audit.Map{
258-
"id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()},
259-
"name": audit.OldNew{Old: "", New: "rust"},
260-
"provisioner": audit.OldNew{Old: database.ProvisionerType(""), New: database.ProvisionerTypeTerraform},
261-
"active_version_id": audit.OldNew{Old: "", New: uuid.UUID{3}.String()},
262-
"max_ttl": audit.OldNew{Old: int64(0), New: int64(time.Hour)},
263-
"min_autostart_interval": audit.OldNew{Old: int64(0), New: int64(time.Minute)},
264-
"created_by": audit.OldNew{Old: "", New: uuid.UUID{4}.String()},
257+
"id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()},
258+
"name": audit.OldNew{Old: "", New: "rust"},
259+
"provisioner": audit.OldNew{Old: database.ProvisionerType(""), New: database.ProvisionerTypeTerraform},
260+
"active_version_id": audit.OldNew{Old: "", New: uuid.UUID{3}.String()},
261+
"max_ttl": audit.OldNew{Old: int64(0), New: int64(time.Hour)},
262+
"created_by": audit.OldNew{Old: "", New: uuid.UUID{4}.String()},
265263
},
266264
},
267265
})

0 commit comments

Comments
 (0)