Tests for zero bump

deansheather · deansheather · commit ae39e4096562 · 2024-01-22T14:24:22.000Z
diff --git a/coderd/agentapi/activitybump_test.go b/coderd/agentapi/activitybump_test.go
@@ -148,6 +148,16 @@ func Test_ActivityBumpWorkspace(t *testing.T) {
 			templateActivityBump: 5 * time.Hour, // instead of default 1h
 			expectedBump:         5 * time.Hour,
 		},
+		{
+			// Activity bump duration is 0.
+			name:                 "TemplateCustomActivityBumpZero",
+			transition:           database.WorkspaceTransitionStart,
+			jobCompletedAt:       sql.NullTime{Valid: true, Time: dbtime.Now().Add(-30 * time.Minute)},
+			buildDeadlineOffset:  ptr.Ref(-30 * time.Minute),
+			workspaceTTL:         8 * time.Hour,
+			templateActivityBump: -1, // negative values get changed to 0 in the test
+			expectedBump:         0,
+		},
 	} {
 		tt := tt
 		for _, tz := range timezones {
@@ -198,7 +208,10 @@ func Test_ActivityBumpWorkspace(t *testing.T) {
 				)
 
 				activityBump := 1 * time.Hour
-				if tt.templateActivityBump != 0 {
+				if tt.templateActivityBump < 0 {
+					// less than 0 => 0
+					activityBump = 0
+				} else if tt.templateActivityBump != 0 {
 					activityBump = tt.templateActivityBump
 				}
 				require.NoError(t, db.UpdateTemplateScheduleByID(ctx, database.UpdateTemplateScheduleByIDParams{
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -839,6 +839,9 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, arg database.Ac
 		if err != nil {
 			return err
 		}
+		if template.ActivityBump == 0 {
+			return nil
+		}
 		activityBump := time.Duration(template.ActivityBump)
 
 		var ttlDur time.Duration
diff --git a/coderd/database/queries/activitybump.sql b/coderd/database/queries/activitybump.sql
@@ -12,6 +12,7 @@ WITH latest AS (
 		workspace_builds.max_deadline::timestamp with time zone AS build_max_deadline,
 		workspace_builds.transition AS build_transition,
 		provisioner_jobs.completed_at::timestamp with time zone AS job_completed_at,
+		templates.activity_bump AS activity_bump,
 		(
 			CASE
 				-- If the extension would push us over the next_autostart
@@ -67,6 +68,8 @@ SET
 FROM latest l
 WHERE wb.id = l.build_id
 AND l.job_completed_at IS NOT NULL
+-- We only bump if the template has an activity bump duration set.
+AND l.activity_bump IS NOT NULL
 AND l.build_transition = 'start'
 -- We only bump if the raw interval is positive and non-zero.
 AND l.ttl_interval > '0 seconds'::interval

Original file line number	Diff line number	Diff line change
`@@ -839,6 +839,9 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, arg database.Ac`
`839`	`839`	`if err != nil {`
`840`	`840`	`return err`
`841`	`841`	`}`
	`842`	`+ if template.ActivityBump == 0 {`
	`843`	`+ return nil`
	`844`	`+ }`
`842`	`845`	`activityBump := time.Duration(template.ActivityBump)`
`843`	`846`
`844`	`847`	`var ttlDur time.Duration`