Skip to content

Commit 888b97f

Browse files
authored
chore: use JobStatus computed from the db (#10079)
Fixes `main`
1 parent 246dae0 commit 888b97f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

coderd/database/db2sdk/db2sdk_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestProvisionerJobStatus(t *testing.T) {
139139
// Make sure the inserted job has the right values.
140140
require.Equal(t, tc.job.StartedAt.Time.UTC(), inserted.StartedAt.Time.UTC(), "started at")
141141
require.Equal(t, tc.job.CompletedAt.Time.UTC(), inserted.CompletedAt.Time.UTC(), "completed at")
142-
require.Equal(t, tc.job.CanceledAt.Time.UTC(), inserted.CanceledAt.Time.UTC(), "cancelled at")
142+
require.Equal(t, tc.job.CanceledAt.Time.UTC(), inserted.CanceledAt.Time.UTC(), "canceled at")
143143
require.Equal(t, tc.job.Error, inserted.Error, "error")
144144
require.Equal(t, tc.job.ErrorCode, inserted.ErrorCode, "error code")
145145

coderd/templateversions.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
"github.com/coder/coder/v2/coderd/audit"
2222
"github.com/coder/coder/v2/coderd/database"
23-
"github.com/coder/coder/v2/coderd/database/db2sdk"
2423
"github.com/coder/coder/v2/coderd/database/dbtime"
2524
"github.com/coder/coder/v2/coderd/database/provisionerjobs"
2625
"github.com/coder/coder/v2/coderd/externalauth"
@@ -1049,11 +1048,10 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
10491048
})
10501049
return
10511050
}
1052-
jobStatus := db2sdk.ProvisionerJobStatus(job)
1053-
if jobStatus != codersdk.ProvisionerJobSucceeded {
1051+
if job.JobStatus != database.ProvisionerJobStatusSucceeded {
10541052
httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
10551053
Message: "Only versions that have been built successfully can be promoted.",
1056-
Detail: fmt.Sprintf("Attempted to promote a version with a %s build", jobStatus),
1054+
Detail: fmt.Sprintf("Attempted to promote a version with a %s build", job.JobStatus),
10571055
})
10581056
return
10591057
}

0 commit comments

Comments
 (0)