Skip to content

feat: don't return 200 for deleted workspaces #1556

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 4 commits into from
May 19, 2022
Merged

feat: don't return 200 for deleted workspaces #1556

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7984cd
feat: don't return 200 for deleted workspaces
deansheather May 18, 2022
7d627c5
fixup! feat: don't return 200 for deleted workspaces
deansheather May 18, 2022
205ea93
chore: code review
deansheather May 19, 2022
36db26d
merge main
deansheather May 19, 2022
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
chore: code review
  • Loading branch information
@deansheather
deansheather committed May 19, 2022
commit 205ea93343b4c9daa93cd24820484b9390611f8d
23 changes: 11 additions & 12 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,28 @@ func (api *api) workspace(rw http.ResponseWriter, r *http.Request) {
}

// The `deleted` query parameter (which defaults to `false`) MUST match the
// `deleted` field on the workspace otherwise you will get a 410 Gone.
// `Deleted` field on the workspace otherwise you will get a 410 Gone.
var (
deletedStr = r.URL.Query().Get("deleted")
deleted = false
deletedStr = r.URL.Query().Get("deleted")
showDeleted = false
)
if deletedStr != "" {
var err error
deleted, err = strconv.ParseBool(deletedStr)
showDeleted, err = strconv.ParseBool(deletedStr)
if err != nil {
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
Message: fmt.Sprintf("invalid bool for 'deleted' query param: %s", err),
})
return
}
}
if workspace.Deleted != deleted {
if workspace.Deleted {
httpapi.Write(rw, http.StatusGone, httpapi.Response{
Message: fmt.Sprintf("workspace %q was deleted, you can view this workspace by specifying '?deleted=true' and trying again", workspace.ID.String()),
})
return
}

if workspace.Deleted && !showDeleted {
httpapi.Write(rw, http.StatusGone, httpapi.Response{
Message: fmt.Sprintf("workspace %q was deleted, you can view this workspace by specifying '?deleted=true' and trying again", workspace.ID.String()),
})
return
}
if !workspace.Deleted && showDeleted {
httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
Message: fmt.Sprintf("workspace %q is not deleted, please remove '?deleted=true' and try again", workspace.ID.String()),
})
Expand Down