diff --git a/coderd/database/db2sdk/db2sdk_test.go b/coderd/database/db2sdk/db2sdk_test.go index a25b44ad92..bfee2f52cb 100644 --- a/coderd/database/db2sdk/db2sdk_test.go +++ b/coderd/database/db2sdk/db2sdk_test.go @@ -139,7 +139,7 @@ func TestProvisionerJobStatus(t *testing.T) { // Make sure the inserted job has the right values. require.Equal(t, tc.job.StartedAt.Time.UTC(), inserted.StartedAt.Time.UTC(), "started at") require.Equal(t, tc.job.CompletedAt.Time.UTC(), inserted.CompletedAt.Time.UTC(), "completed at") - require.Equal(t, tc.job.CanceledAt.Time.UTC(), inserted.CanceledAt.Time.UTC(), "cancelled at") + require.Equal(t, tc.job.CanceledAt.Time.UTC(), inserted.CanceledAt.Time.UTC(), "canceled at") require.Equal(t, tc.job.Error, inserted.Error, "error") require.Equal(t, tc.job.ErrorCode, inserted.ErrorCode, "error code") diff --git a/coderd/templateversions.go b/coderd/templateversions.go index 0ee2d15040..12fad17a64 100644 --- a/coderd/templateversions.go +++ b/coderd/templateversions.go @@ -20,7 +20,6 @@ import ( "github.com/coder/coder/v2/coderd/audit" "github.com/coder/coder/v2/coderd/database" - "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/database/provisionerjobs" "github.com/coder/coder/v2/coderd/externalauth" @@ -1049,11 +1048,10 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque }) return } - jobStatus := db2sdk.ProvisionerJobStatus(job) - if jobStatus != codersdk.ProvisionerJobSucceeded { + if job.JobStatus != database.ProvisionerJobStatusSucceeded { httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{ Message: "Only versions that have been built successfully can be promoted.", - Detail: fmt.Sprintf("Attempted to promote a version with a %s build", jobStatus), + Detail: fmt.Sprintf("Attempted to promote a version with a %s build", job.JobStatus), }) return }