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

mafredri · web-flow · commit e872e188837d · 2022-11-14T20:14:08.000+02:00
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -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,
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -48,3 +48,4 @@ rename:
   user_acl: UserACL
   group_acl: GroupACL
   troubleshooting_url: TroubleshootingURL
+  default_ttl: DefaultTTL
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -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,
 	}
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -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()}
 		}
diff --git a/enterprise/audit/diff_internal_test.go b/enterprise/audit/diff_internal_test.go
@@ -250,7 +250,7 @@ func Test_diff(t *testing.T) {
 				Name:            "rust",
 				Provisioner:     database.ProvisionerTypeTerraform,
 				ActiveVersionID: uuid.UUID{3},
-				DefaultTtl:      int64(time.Hour),
+				DefaultTTL:      int64(time.Hour),
 				CreatedBy:       uuid.UUID{4},
 			},
 			exp: audit.Map{

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ func (api API) postWorkspacesByOrganization(rw http.ResponseWriter, r http.Req`
`310`	`310`	`return`
`311`	`311`	`}`
`312`	`312`
`313`		`- dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, template.DefaultTtl)`
	`313`	`+ dbTTL, err := validWorkspaceTTLMillis(createWorkspace.TTLMillis, template.DefaultTTL)`
`314`	`314`	`if err != nil {`
`315`	`315`	`httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{`
`316`	`316`	`Message: "Invalid Workspace Time to Shutdown.",`
`@@ -679,7 +679,7 @@ func (api API) putWorkspaceTTL(rw http.ResponseWriter, r http.Request) {`
`679`	`679`	`return xerrors.Errorf("fetch workspace template: %w", err)`
`680`	`680`	`}`
`681`	`681`
`682`		`- dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTtl)`
	`682`	`+ dbTTL, err = validWorkspaceTTLMillis(req.TTLMillis, template.DefaultTTL)`
`683`	`683`	`if err != nil {`
`684`	`684`	`return codersdk.ValidationError{Field: "ttl_ms", Detail: err.Error()}`
`685`	`685`	`}`