coder
diff --git a/‎coderd/activitybump.go
Lines changed: 4 additions & 0 deletions b/‎coderd/activitybump.go
Lines changed: 4 additions & 0 deletions
diff --git a/‎coderd/database/dump.sql
Lines changed: 4 additions & 2 deletions b/‎coderd/database/dump.sql
Lines changed: 4 additions & 2 deletions
diff --git a/‎coderd/database/migrations/000097_workspace_build_max_deadline.down.sql
Lines changed: 3 additions & 0 deletions b/‎coderd/database/migrations/000097_workspace_build_max_deadline.down.sql
Lines changed: 3 additions & 0 deletions
diff --git a/‎coderd/database/migrations/000097_workspace_build_max_deadline.up.sql
Lines changed: 3 additions & 0 deletions b/‎coderd/database/migrations/000097_workspace_build_max_deadline.up.sql
Lines changed: 3 additions & 0 deletions
diff --git a/‎coderd/database/models.go
Lines changed: 3 additions & 1 deletion b/‎coderd/database/models.go
Lines changed: 3 additions & 1 deletion
@@ -70,12 +70,16 @@ func activityBumpWorkspace(log slog.Logger, db database.Store, workspaceID uuid.
 		}
 
 		newDeadline := database.Now().Add(bumpAmount)
+		if !build.MaxDeadline.IsZero() && newDeadline.After(build.MaxDeadline) {
+			newDeadline = build.MaxDeadline
+		}
 
 		if _, err := s.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
 			ID:               build.ID,
 			UpdatedAt:        database.Now(),
 			ProvisionerState: build.ProvisionerState,
 			Deadline:         newDeadline,
+			MaxDeadline:      build.MaxDeadline,
 		}); err != nil {
 			return xerrors.Errorf("update workspace build: %w", err)
 		}
 
@@ -0,0 +1,3 @@
+ALTER TABLE "workspace_builds" DROP COLUMN "max_deadline";
+
+ALTER TABLE "templates" DROP COLUMN "max_ttl";
@@ -0,0 +1,3 @@
+ALTER TABLE "templates" ADD COLUMN "max_ttl" bigint DEFAULT '0'::bigint NOT NULL;
+
+ALTER TABLE "workspace_builds" ADD COLUMN "max_deadline" timestamp with time zone DEFAULT '0001-01-01 00:00:00+00'::timestamp with time zone NOT NULL;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE "workspace_builds" DROP COLUMN "max_deadline";`
	`2`	`+`
	`3`	`+ALTER TABLE "templates" DROP COLUMN "max_ttl";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE "templates" ADD COLUMN "max_ttl" bigint DEFAULT '0'::bigint NOT NULL;`
	`2`	`+`
	`3`	`+ALTER TABLE "workspace_builds" ADD COLUMN "max_deadline" timestamp with time zone DEFAULT '0001-01-01 00:00:00+00'::timestamp with time zone NOT NULL;`