RED: add deadline to workspace builds

johnstcn · johnstcn · commit 8987e9ec38e4 · 2022-05-26T16:48:10.000Z
diff --git a/coderd/autobuild/executor/lifecycle_executor.go b/coderd/autobuild/executor/lifecycle_executor.go
@@ -88,18 +88,16 @@ func (e *Executor) runOnce(t time.Time) error {
 			switch priorHistory.Transition {
 			case database.WorkspaceTransitionStart:
 				validTransition = database.WorkspaceTransitionStop
-				if !ws.Ttl.Valid || ws.Ttl.Int64 == 0 {
-					e.log.Debug(e.ctx, "invalid or zero ws ttl, skipping",
+				if priorHistory.Deadline.IsZero() {
+					e.log.Debug(e.ctx, "latest workspace build has zero deadline, skipping",
 						slog.F("workspace_id", ws.ID),
-						slog.F("ttl", time.Duration(ws.Ttl.Int64)),
+						slog.F("workspace_build_id", priorHistory.ID),
 					)
 					continue
 				}
-				ttl := time.Duration(ws.Ttl.Int64)
-				// Measure TTL from the time the workspace finished building.
 				// Truncate to nearest minute for consistency with autostart
 				// behavior, and add one minute for padding.
-				nextTransition = priorHistory.UpdatedAt.Truncate(time.Minute).Add(ttl + time.Minute)
+				nextTransition = priorHistory.Deadline.Truncate(time.Minute)
 			case database.WorkspaceTransitionStop:
 				validTransition = database.WorkspaceTransitionStart
 				sched, err := schedule.Weekly(ws.AutostartSchedule.String)
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1485,6 +1485,7 @@ func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser
 		InitiatorID:       arg.InitiatorID,
 		JobID:             arg.JobID,
 		ProvisionerState:  arg.ProvisionerState,
+		Deadline:          arg.Deadline,
 	}
 	q.workspaceBuilds = append(q.workspaceBuilds, workspaceBuild)
 	return workspaceBuild, nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000014_workspacebuild_deadline.down.sql b/coderd/database/migrations/000014_workspacebuild_deadline.down.sql
@@ -0,0 +1 @@
+ALTER TABLE ONLY workspace_builds DROP COLUMN deadline;
diff --git a/coderd/database/migrations/000014_workspacebuild_deadline.up.sql b/coderd/database/migrations/000014_workspacebuild_deadline.up.sql
@@ -0,0 +1 @@
+ALTER TABLE ONLY workspace_builds ADD COLUMN deadline TIMESTAMPTZ NOT NULL DEFAULT TIMESTAMPTZ '0001-01-01 00:00:00+00:00';
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/workspacebuilds.sql b/coderd/database/queries/workspacebuilds.sql
@@ -101,10 +101,11 @@ INSERT INTO
 		transition,
 		initiator_id,
 		job_id,
-		provisioner_state
+		provisioner_state,
+		deadline
 	)
 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: UpdateWorkspaceBuildByID :exec
 UPDATE
diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go
@@ -32,6 +32,7 @@ type WorkspaceBuild struct {
 	Transition        WorkspaceTransition `json:"transition"`
 	InitiatorID       uuid.UUID           `json:"initiator_id"`
 	Job               ProvisionerJob      `json:"job"`
+	Deadline          time.Time           `json:"deadline"`
 }
 
 // WorkspaceBuild returns a single workspace build for a workspace.
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -28,6 +28,7 @@ type Workspace struct {
 	Name              string         `json:"name"`
 	AutostartSchedule string         `json:"autostart_schedule"`
 	TTL               *time.Duration `json:"ttl"`
+	Deadline          time.Time      `json:"deadline"`
 }
 
 // CreateWorkspaceBuildRequest provides options to update the latest workspace build.
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -82,7 +82,7 @@ export interface CreateUserRequest {
   readonly organization_id: string
 }
 
-// From codersdk/workspaces.go:34:6
+// From codersdk/workspaces.go:35:6
 export interface CreateWorkspaceBuildRequest {
   readonly template_version_id?: string
   readonly transition: WorkspaceTransition
@@ -216,9 +216,9 @@ export interface ProvisionerJobLog {
   readonly output: string
 }
 
-// From codersdk/workspaces.go:182:6
-export interface PutWorkspaceDeadlineRequest {
-  readonly stop_at: string
+// From codersdk/workspaces.go:183:6
+export interface PutExtendWorkspaceRequest {
+  readonly deadline: string
 }
 
 // From codersdk/roles.go:12:6
@@ -292,12 +292,12 @@ export interface UpdateUserProfileRequest {
   readonly username: string
 }
 
-// From codersdk/workspaces.go:141:6
+// From codersdk/workspaces.go:142:6
 export interface UpdateWorkspaceAutostartRequest {
   readonly schedule: string
 }
 
-// From codersdk/workspaces.go:161:6
+// From codersdk/workspaces.go:162:6
 export interface UpdateWorkspaceTTLRequest {
   // This is likely an enum in an external package ("time.Duration")
   readonly ttl?: number
@@ -368,6 +368,7 @@ export interface Workspace {
   readonly autostart_schedule: string
   // This is likely an enum in an external package ("time.Duration")
   readonly ttl?: number
+  readonly deadline: string
 }
 
 // From codersdk/workspaceresources.go:31:6
@@ -428,14 +429,15 @@ export interface WorkspaceBuild {
   readonly transition: WorkspaceTransition
   readonly initiator_id: string
   readonly job: ProvisionerJob
+  readonly deadline: string
 }
 
-// From codersdk/workspaces.go:64:6
+// From codersdk/workspaces.go:65:6
 export interface WorkspaceBuildsRequest extends Pagination {
   readonly WorkspaceID: string
 }
 
-// From codersdk/workspaces.go:200:6
+// From codersdk/workspaces.go:201:6
 export interface WorkspaceFilter {
   readonly OrganizationID: string
   readonly Owner: string

Original file line number	Diff line number	Diff line change
`@@ -1485,6 +1485,7 @@ func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser`
`1485`	`1485`	`InitiatorID: arg.InitiatorID,`
`1486`	`1486`	`JobID: arg.JobID,`
`1487`	`1487`	`ProvisionerState: arg.ProvisionerState,`
	`1488`	`+ Deadline: arg.Deadline,`
`1488`	`1489`	`}`
`1489`	`1490`	`q.workspaceBuilds = append(q.workspaceBuilds, workspaceBuild)`
`1490`	`1491`	`return workspaceBuild, nil`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE ONLY workspace_builds DROP COLUMN deadline;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE ONLY workspace_builds ADD COLUMN deadline TIMESTAMPTZ NOT NULL DEFAULT TIMESTAMPTZ '0001-01-01 00:00:00+00:00';`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ type WorkspaceBuild struct {`
`32`	`32`	Transition WorkspaceTransition `json:"transition"`
`33`	`33`	InitiatorID uuid.UUID `json:"initiator_id"`
`34`	`34`	Job ProvisionerJob `json:"job"`
	`35`	+ Deadline time.Time `json:"deadline"`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`// WorkspaceBuild returns a single workspace build for a workspace.`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ type Workspace struct {`
`28`	`28`	Name string `json:"name"`
`29`	`29`	AutostartSchedule string `json:"autostart_schedule"`
`30`	`30`	TTL *time.Duration `json:"ttl"`
	`31`	+ Deadline time.Time `json:"deadline"`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`// CreateWorkspaceBuildRequest provides options to update the latest workspace build.`