Changing join type so that latest_build_status is non-nullable

dannykopping · dannykopping · commit b118044549d2 · 2024-03-27T11:12:16.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -405,7 +405,7 @@ func (q *FakeQuerier) convertToWorkspaceRowsNoLock(ctx context.Context, workspac
 			}
 
 			if pj, err := q.getProvisionerJobByIDNoLock(ctx, build.JobID); err == nil {
-				wr.LatestBuildStatus = database.NullProvisionerJobStatus{ProvisionerJobStatus: pj.JobStatus, Valid: true}
+				wr.LatestBuildStatus = pj.JobStatus
 			}
 
 			wr.LatestBuildTransition = build.Transition
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
@@ -119,7 +119,7 @@ LEFT JOIN LATERAL (
 		provisioner_jobs.job_status
 	FROM
 		workspace_builds
-	LEFT JOIN
+	JOIN
 		provisioner_jobs
 	ON
 		provisioner_jobs.id = workspace_builds.job_id
diff --git a/coderd/prometheusmetrics/prometheusmetrics.go b/coderd/prometheusmetrics/prometheusmetrics.go
@@ -152,15 +152,7 @@ func Workspaces(ctx context.Context, logger slog.Logger, registerer prometheus.R
 
 		workspaceDetails.Reset()
 		for _, w := range ws {
-			// TODO: there may be a more elegant/idiomatic way to do this?
-			buildStatus := string(database.ProvisionerJobStatusUnknown)
-			if val, err := w.LatestBuildStatus.Value(); err == nil {
-				if status, ok := val.(string); ok {
-					buildStatus = status
-				}
-			}
-
-			workspaceDetails.WithLabelValues(buildStatus, w.TemplateName, w.TemplateVersionName.String, w.Name, w.Username, string(w.LatestBuildTransition)).Set(1)
+			workspaceDetails.WithLabelValues(string(w.LatestBuildStatus), w.TemplateName, w.TemplateVersionName.String, w.Name, w.Username, string(w.LatestBuildTransition)).Set(1)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ func (q *FakeQuerier) convertToWorkspaceRowsNoLock(ctx context.Context, workspac`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`if pj, err := q.getProvisionerJobByIDNoLock(ctx, build.JobID); err == nil {`
`408`		`- wr.LatestBuildStatus = database.NullProvisionerJobStatus{ProvisionerJobStatus: pj.JobStatus, Valid: true}`
	`408`	`+ wr.LatestBuildStatus = pj.JobStatus`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`wr.LatestBuildTransition = build.Transition`