fix: Check for job status on another incoming (#1117)

kylecarbs · web-flow · commit 23295f7f070b · 2022-04-25T02:22:36.000Z
If a job silently failed, it wasn't possible for another one
to execute. This fixes it by using the API status to return
active state.
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -166,7 +166,7 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
 	priorHistory, err := api.Database.GetWorkspaceBuildByWorkspaceIDWithoutAfter(r.Context(), workspace.ID)
 	if err == nil {
 		priorJob, err := api.Database.GetProvisionerJobByID(r.Context(), priorHistory.JobID)
-		if err == nil && !priorJob.CompletedAt.Valid {
+		if err == nil && convertProvisionerJob(priorJob).Status.Active() {
 			httpapi.Write(rw, http.StatusConflict, httpapi.Response{
 				Message: "a workspace build is already active",
 			})
diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go
@@ -25,6 +25,15 @@ type ProvisionerDaemon database.ProvisionerDaemon
 // ProvisionerJobStaus represents the at-time state of a job.
 type ProvisionerJobStatus string
 
+// Active returns whether the job is still active or not.
+// It returns true if canceling as well, since the job isn't
+// in an entirely inactive state yet.
+func (p ProvisionerJobStatus) Active() bool {
+	return p == ProvisionerJobPending ||
+		p == ProvisionerJobRunning ||
+		p == ProvisionerJobCanceling
+}
+
 const (
 	ProvisionerJobPending   ProvisionerJobStatus = "pending"
 	ProvisionerJobRunning   ProvisionerJobStatus = "running"
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -46,13 +46,13 @@ export interface CreateParameterRequest {
   readonly source_value: string
 }
 
-// From codersdk/provisionerdaemons.go:37:6.
+// From codersdk/provisionerdaemons.go:46:6.
 export interface ProvisionerJob {
   readonly error: string
   readonly status: ProvisionerJobStatus
 }
 
-// From codersdk/provisionerdaemons.go:47:6.
+// From codersdk/provisionerdaemons.go:56:6.
 export interface ProvisionerJobLog {
   readonly stage: string
   readonly output: string

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,13 @@ export interface CreateParameterRequest {`
`46`	`46`	`readonly source_value: string`
`47`	`47`	`}`
`48`	`48`
`49`		`-// From codersdk/provisionerdaemons.go:37:6.`
	`49`	`+// From codersdk/provisionerdaemons.go:46:6.`
`50`	`50`	`export interface ProvisionerJob {`
`51`	`51`	`readonly error: string`
`52`	`52`	`readonly status: ProvisionerJobStatus`
`53`	`53`	`}`
`54`	`54`
`55`		`-// From codersdk/provisionerdaemons.go:47:6.`
	`55`	`+// From codersdk/provisionerdaemons.go:56:6.`
`56`	`56`	`export interface ProvisionerJobLog {`
`57`	`57`	`readonly stage: string`
`58`	`58`	`readonly output: string`