synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Set initialism for DefaultTTL (from DefaultTtl) (#4996)

Browse Source
This commit is contained in:
Mathias Fredriksson
2022-11-14 20:14:08 +02:00
committed by GitHub
parent 97dbd4dc5d
commit e872e18883
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coderd/database/databasefake/databasefake.go
View File

@ -1306,7 +1306,7 @@ func (q *fakeQuerier) UpdateTemplateMetaByID(_ context.Context, arg database.Upd
tpl.DisplayName = arg.DisplayName
tpl.Description = arg.Description
tpl.Icon = arg.Icon
tpl.DefaultTtl = arg.DefaultTtl
tpl.DefaultTTL = arg.DefaultTTL
q.templates[idx] = tpl
return tpl, nil
}
@ -2087,7 +2087,7 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
Provisioner: arg.Provisioner,
ActiveVersionID: arg.ActiveVersionID,
Description: arg.Description,
DefaultTtl: arg.DefaultTtl,
DefaultTTL: arg.DefaultTTL,
CreatedBy: arg.CreatedBy,
UserACL: arg.UserACL,
GroupACL: arg.GroupACL,

2
coderd/database/models.go
View File

@ -585,7 +585,7 @@ type Template struct {
ActiveVersionID uuid.UUID `db:"active_version_id" json:"active_version_id"`
Description string `db:"description" json:"description"`
// The default duration for auto-stop for workspaces created from this template.
DefaultTtl int64 `db:"default_ttl" json:"default_ttl"`
DefaultTTL int64 `db:"default_ttl" json:"default_ttl"`
CreatedBy uuid.UUID `db:"created_by" json:"created_by"`
Icon string `db:"icon" json:"icon"`
UserACL TemplateACL `db:"user_acl" json:"user_acl"`

22
coderd/database/queries.sql.go
View File

@ -3105,7 +3105,7 @@ func (q *sqlQuerier) GetTemplateByID(ctx context.Context, id uuid.UUID) (Templat
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3147,7 +3147,7 @@ func (q *sqlQuerier) GetTemplateByOrganizationAndName(ctx context.Context, arg G
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3181,7 +3181,7 @@ func (q *sqlQuerier) GetTemplates(ctx context.Context) ([]Template, error) {
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3261,7 +3261,7 @@ func (q *sqlQuerier) GetTemplatesWithFilter(ctx context.Context, arg GetTemplate
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3312,7 +3312,7 @@ type InsertTemplateParams struct {
Provisioner ProvisionerType `db:"provisioner" json:"provisioner"`
ActiveVersionID uuid.UUID `db:"active_version_id" json:"active_version_id"`
Description string `db:"description" json:"description"`
DefaultTtl int64 `db:"default_ttl" json:"default_ttl"`
DefaultTTL int64 `db:"default_ttl" json:"default_ttl"`
CreatedBy uuid.UUID `db:"created_by" json:"created_by"`
Icon string `db:"icon" json:"icon"`
UserACL TemplateACL `db:"user_acl" json:"user_acl"`
@ -3330,7 +3330,7 @@ func (q *sqlQuerier) InsertTemplate(ctx context.Context, arg InsertTemplateParam
arg.Provisioner,
arg.ActiveVersionID,
arg.Description,
arg.DefaultTtl,
arg.DefaultTTL,
arg.CreatedBy,
arg.Icon,
arg.UserACL,
@ -3348,7 +3348,7 @@ func (q *sqlQuerier) InsertTemplate(ctx context.Context, arg InsertTemplateParam
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3389,7 +3389,7 @@ func (q *sqlQuerier) UpdateTemplateACLByID(ctx context.Context, arg UpdateTempla
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,
@ -3461,7 +3461,7 @@ type UpdateTemplateMetaByIDParams struct {
ID uuid.UUID `db:"id" json:"id"`
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
Description string `db:"description" json:"description"`
DefaultTtl int64 `db:"default_ttl" json:"default_ttl"`
DefaultTTL int64 `db:"default_ttl" json:"default_ttl"`
Name string `db:"name" json:"name"`
Icon string `db:"icon" json:"icon"`
DisplayName string `db:"display_name" json:"display_name"`
@ -3472,7 +3472,7 @@ func (q *sqlQuerier) UpdateTemplateMetaByID(ctx context.Context, arg UpdateTempl
arg.ID,
arg.UpdatedAt,
arg.Description,
arg.DefaultTtl,
arg.DefaultTTL,
arg.Name,
arg.Icon,
arg.DisplayName,
@ -3488,7 +3488,7 @@ func (q *sqlQuerier) UpdateTemplateMetaByID(ctx context.Context, arg UpdateTempl
&i.Provisioner,
&i.ActiveVersionID,
&i.Description,
&i.DefaultTtl,
&i.DefaultTTL,
&i.CreatedBy,
&i.Icon,
&i.UserACL,

1
coderd/database/sqlc.yaml
View File

@ -48,3 +48,4 @@ rename:
user_acl: UserACL
group_acl: GroupACL
troubleshooting_url: TroubleshootingURL
default_ttl: DefaultTTL

10
coderd/templates.go
View File

@ -233,7 +233,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
Provisioner: importJob.Provisioner,
ActiveVersionID: templateVersion.ID,
Description: createTemplate.Description,
DefaultTtl: int64(ttl),
DefaultTTL: int64(ttl),
CreatedBy: apiKey.UserID,
UserACL: database.TemplateACL{},
GroupACL: database.TemplateACL{
@ -476,7 +476,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
req.Description == template.Description &&
req.DisplayName == template.DisplayName &&
req.Icon == template.Icon &&
req.DefaultTTLMillis == time.Duration(template.DefaultTtl).Milliseconds() {
req.DefaultTTLMillis == time.Duration(template.DefaultTTL).Milliseconds() {
return nil
}
@ -504,7 +504,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
DisplayName: displayName,
Description: desc,
Icon: icon,
DefaultTtl: int64(maxTTL),
DefaultTTL: int64(maxTTL),
})
if err != nil {
return err
@ -648,7 +648,7 @@ func (api *API) autoImportTemplate(ctx context.Context, opts autoImportTemplateO
Provisioner: job.Provisioner,
ActiveVersionID: templateVersion.ID,
Description: "This template was auto-imported by Coder.",
DefaultTtl: 0,
DefaultTTL: 0,
CreatedBy: opts.userID,
UserACL: database.TemplateACL{},
GroupACL: database.TemplateACL{
@ -754,7 +754,7 @@ func (api *API) convertTemplate(
BuildTimeStats: buildTimeStats,
Description: template.Description,
Icon: template.Icon,
DefaultTTLMillis: time.Duration(template.DefaultTtl).Milliseconds(),
DefaultTTLMillis: time.Duration(template.DefaultTTL).Milliseconds(),
CreatedByID: template.CreatedBy,
CreatedByName: createdByName,
}

4
coderd/workspaces.go
View File

@ -310,7 +310,7 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
return
}
dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, template.DefaultTtl)
dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, template.DefaultTTL)
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Invalid Workspace Time to Shutdown.",
@ -679,7 +679,7 @@ func (api *API) putWorkspaceTTL(rw http.ResponseWriter, r *http.Request) {
return xerrors.Errorf("fetch workspace template: %w", err)
}
dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTtl)
dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTTL)
if err != nil {
return codersdk.ValidationError{Field: "ttl_ms", Detail: err.Error()}
}