Add workspace ttl bump

coder · Emyrk · Nov 7, 2023 · Nov 7, 2023 · Nov 8, 2023 · Nov 8, 2023
commit 107b9c84c52a2fea1fed9f8633d3920c535e9f19
diff --git a/cli/templates.go b/cli/templates.go
@@ -95,6 +95,7 @@ type templateTableRow struct {
 	ActiveVersionID uuid.UUID                `json:"-" table:"active version id"`
 	UsedBy          string                   `json:"-" table:"used by"`
 	DefaultTTL      time.Duration            `json:"-" table:"default ttl"`
+	DefaultTTLBump  time.Duration            `json:"-" table:"default ttl bump"`
 }
 
 // templateToRows converts a list of templates to a list of templateTableRow for
@@ -111,7 +112,8 @@ func templatesToRows(templates ...codersdk.Template) []templateTableRow {
 			Provisioner:     template.Provisioner,
 			ActiveVersionID: template.ActiveVersionID,
 			UsedBy:          pretty.Sprint(cliui.DefaultStyles.Fuchsia, formatActiveDevelopers(template.ActiveUserCount)),
-			DefaultTTL:      (time.Duration(template.DefaultTTLMillis) * time.Millisecond),
+			DefaultTTL:      time.Duration(template.DefaultTTLMillis) * time.Millisecond,
+			DefaultTTLBump:  time.Duration(template.DefaultTTLBumpMillis) * time.Millisecond,
 		}
 	}
 

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -350,6 +350,7 @@ func (q *FakeQuerier) convertToWorkspaceRowsNoLock(ctx context.Context, workspac
 			Name:              w.Name,
 			AutostartSchedule: w.AutostartSchedule,
 			Ttl:               w.Ttl,
+			TtlBump:           w.TtlBump,
 			LastUsedAt:        w.LastUsedAt,
 			DormantAt:         w.DormantAt,
 			DeletingAt:        w.DeletingAt,
@@ -830,8 +831,8 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, workspaceID uui
 		}
 		if !template.AllowUserAutostop {
 			ttlDur = time.Duration(template.DefaultTTL)
-			if template.DefaultTtlBump > 0 {
-				ttlDur += time.Duration(template.DefaultTtlBump)
+			if template.DefaultTTLBump > 0 {
+				ttlDur += time.Duration(template.DefaultTTLBump)
 			}
 		}
 		if ttlDur <= 0 {
@@ -5076,6 +5077,7 @@ func (q *FakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork
 		Name:              arg.Name,
 		AutostartSchedule: arg.AutostartSchedule,
 		Ttl:               arg.Ttl,
+		TtlBump:           arg.TtlBump,
 		LastUsedAt:        arg.LastUsedAt,
 		AutomaticUpdates:  arg.AutomaticUpdates,
 	}
@@ -5947,6 +5949,7 @@ func (q *FakeQuerier) UpdateTemplateScheduleByID(_ context.Context, arg database
 		tpl.AllowUserAutostop = arg.AllowUserAutostop
 		tpl.UpdatedAt = dbtime.Now()
 		tpl.DefaultTTL = arg.DefaultTTL
+		tpl.DefaultTTLBump = arg.DefaultTTLBump
 		tpl.MaxTTL = arg.MaxTTL
 		tpl.AutostopRequirementDaysOfWeek = arg.AutostopRequirementDaysOfWeek
 		tpl.AutostopRequirementWeeks = arg.AutostopRequirementWeeks
@@ -6677,6 +6680,7 @@ func (q *FakeQuerier) UpdateWorkspaceTTL(_ context.Context, arg database.UpdateW
 			continue
 		}
 		workspace.Ttl = arg.Ttl
+		workspace.TtlBump = arg.TtlBump
 		q.workspaces[index] = workspace
 		return nil
 	}

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/queries/workspaces.sql b/coderd/database/queries/workspaces.sql
@@ -243,7 +243,7 @@ WHERE
 	-- workspaces since they are considered soft-deleted.
 	AND CASE
 		WHEN @is_dormant :: text != '' THEN
-			dormant_at IS NOT NULL 
+			dormant_at IS NOT NULL
 		ELSE
 			dormant_at IS NULL
 	END
@@ -299,11 +299,12 @@ INSERT INTO
 		name,
 		autostart_schedule,
 		ttl,
+	    ttl_bump,
 		last_used_at,
 		automatic_updates
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *;
 
 -- name: UpdateWorkspaceDeletedByID :exec
 UPDATE
@@ -335,7 +336,8 @@ WHERE
 UPDATE
 	workspaces
 SET
-	ttl = $2
+	ttl = $2,
+	ttl_bump = $3
 WHERE
 	id = $1;
 

diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -67,6 +67,7 @@ overrides:
       group_acl: GroupACL
       troubleshooting_url: TroubleshootingURL
       default_ttl: DefaultTTL
+      default_ttl_bump: DefaultTTLBump
       max_ttl: MaxTTL
       template_max_ttl: TemplateMaxTTL
       motd_file: MOTDFile

diff --git a/coderd/schedule/template.go b/coderd/schedule/template.go
@@ -184,6 +184,7 @@ func (*agplTemplateScheduleStore) Get(ctx context.Context, db database.Store, te
 		UserAutostartEnabled: true,
 		UserAutostopEnabled:  true,
 		DefaultTTL:           time.Duration(tpl.DefaultTTL),
+		DefaultTTLBump:       time.Duration(tpl.DefaultTTLBump),
 		// Disregard the values in the database, since AutostopRequirement,
 		// FailureTTL, TimeTilDormant, and TimeTilDormantAutoDelete are enterprise features.
 		UseAutostopRequirement: false,
@@ -208,7 +209,7 @@ func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tp
 	ctx, span := tracing.StartSpan(ctx)
 	defer span.End()
 
-	if int64(opts.DefaultTTL) == tpl.DefaultTTL && int64(opts.DefaultTTLBump) == tpl.DefaultTtlBump {
+	if int64(opts.DefaultTTL) == tpl.DefaultTTL && int64(opts.DefaultTTLBump) == tpl.DefaultTTLBump {
 		// Avoid updating the UpdatedAt timestamp if nothing will be changed.
 		return tpl, nil
 	}
@@ -219,7 +220,7 @@ func (*agplTemplateScheduleStore) Set(ctx context.Context, db database.Store, tp
 			ID:             tpl.ID,
 			UpdatedAt:      dbtime.Now(),
 			DefaultTTL:     int64(opts.DefaultTTL),
-			DefaultTtlBump: int64(opts.DefaultTTLBump),
+			DefaultTTLBump: int64(opts.DefaultTTLBump),
 			// Don't allow changing these settings, but keep the value in the DB (to
 			// avoid clearing settings if the license has an issue).
 			MaxTTL:                        tpl.MaxTTL,

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -549,7 +549,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 	// If the user does not specify a value for the default bump,
 	// set it to the existing value.
 	if req.DefaultTTLBumpMillis == nil {
-		ms := time.Duration(template.DefaultTtlBump).Milliseconds()
+		ms := time.Duration(template.DefaultTTLBump).Milliseconds()
 		req.DefaultTTLBumpMillis = &ms
 	}
 
@@ -634,7 +634,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 	var updated database.Template
 
 	err = api.Database.InTx(func(tx database.Store) error {
-		defaultTTLBump := time.Duration(template.DefaultTtlBump)
+		defaultTTLBump := time.Duration(template.DefaultTTLBump)
 		// This should never be nil at this point, but we'll check anyway.
 		if req.DefaultTTLBumpMillis != nil {
 			defaultTTLBump = time.Duration(*req.DefaultTTLBumpMillis) * time.Millisecond
@@ -648,7 +648,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 			req.AllowUserAutostop == template.AllowUserAutostop &&
 			req.AllowUserCancelWorkspaceJobs == template.AllowUserCancelWorkspaceJobs &&
 			req.DefaultTTLMillis == time.Duration(template.DefaultTTL).Milliseconds() &&
-			defaultTTLBump == time.Duration(template.DefaultTtlBump) &&
+			defaultTTLBump == time.Duration(template.DefaultTTLBump) &&
 			req.MaxTTLMillis == time.Duration(template.MaxTTL).Milliseconds() &&
 			autostopRequirementDaysOfWeekParsed == scheduleOpts.AutostopRequirement.DaysOfWeek &&
 			autostartRequirementDaysOfWeekParsed == scheduleOpts.AutostartRequirement.DaysOfWeek &&
@@ -701,7 +701,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		timeTilDormantAutoDelete := time.Duration(req.TimeTilDormantAutoDeleteMillis) * time.Millisecond
 
 		if defaultTTL != time.Duration(template.DefaultTTL) ||
-			defaultTTLBump != time.Duration(template.DefaultTtlBump) ||
+			defaultTTLBump != time.Duration(template.DefaultTTLBump) ||
 			maxTTL != time.Duration(template.MaxTTL) ||
 			autostopRequirementDaysOfWeekParsed != scheduleOpts.AutostopRequirement.DaysOfWeek ||
 			autostartRequirementDaysOfWeekParsed != scheduleOpts.AutostartRequirement.DaysOfWeek ||
@@ -861,6 +861,7 @@ func (api *API) convertTemplate(
 		Description:                    template.Description,
 		Icon:                           template.Icon,
 		DefaultTTLMillis:               time.Duration(template.DefaultTTL).Milliseconds(),
+		DefaultTTLBumpMillis:           time.Duration(template.DefaultTTLBump).Milliseconds(),
 		MaxTTLMillis:                   time.Duration(template.MaxTTL).Milliseconds(),
 		CreatedByID:                    template.CreatedBy,
 		CreatedByName:                  template.CreatedByUsername,