Skip to content

fix: only allow promoting successful template versions #9998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 5, 2023
Merged

fix: only allow promoting successful template versions #9998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2448ab3
chore: rename `AwaitTemplateVersionJobCompleted` and `AwaitWorkspaceB…
aslilac Oct 2, 2023
e8b84eb
for real tho
aslilac Oct 2, 2023
6dc8fc3
fix: only allow promoting successful template versions
aslilac Oct 2, 2023
dcdeed2
Merge branch 'main' into only-promote-successful-builds
aslilac Oct 3, 2023
e3d8cd5
actually, don't filter canceled versions (at least not on the frontend)
aslilac Oct 3, 2023
7cbadbc
redundant story
aslilac Oct 3, 2023
d7c15e9
real nice
aslilac Oct 3, 2023
e2c773e
happy opposite day
aslilac Oct 3, 2023
5ea0c76
Merge branch 'main' into only-promote-successful-builds
aslilac Oct 4, 2023
a015ee5
412 -> 403
aslilac Oct 4, 2023
f333c19
Merge branch 'main' into only-promote-successful-builds
aslilac Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
412 -> 403
  • Loading branch information
@aslilac
aslilac committed Oct 4, 2023
commit a015ee57565cae25802e4118b0b059ddbaec3977
6 changes: 3 additions & 3 deletions coderd/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (api *API) templateVersionRichParameters(rw http.ResponseWriter, r *http.Re
return
}
if !job.CompletedAt.Valid {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
Message: "Job hasn't completed!",
})
return
Expand Down Expand Up @@ -384,7 +384,7 @@ func (api *API) templateVersionVariables(rw http.ResponseWriter, r *http.Request
return
}
if !job.CompletedAt.Valid {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
Message: "Job hasn't completed!",
})
return
Expand Down Expand Up @@ -1051,7 +1051,7 @@ func (api *API) patchActiveTemplateVersion(rw http.ResponseWriter, r *http.Reque
}
jobStatus := db2sdk.ProvisionerJobStatus(job)
if jobStatus != codersdk.ProvisionerJobSucceeded {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
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),
})
Expand Down
4 changes: 2 additions & 2 deletions coderd/templateversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
})
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode())
require.Equal(t, http.StatusForbidden, apiErr.StatusCode())
require.Contains(t, apiErr.Detail, "canceled")
})

Expand All @@ -592,7 +592,7 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
})
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode())
require.Equal(t, http.StatusForbidden, apiErr.StatusCode())
require.Contains(t, apiErr.Detail, "pending")
})

Expand Down