opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated PreconditionFailed status occurences to more appropriate statuses. (#5513)

Browse Source
This commit is contained in:
Ben A
2023-01-13 08:30:48 -06:00
committed by GitHub
parent 967d25fdf7
commit 54cc587dad
15 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/coderd/groups.go
+3 -3
View File
@@ -144,7 +144,7 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
UserID: uuid.MustParse(id),
})
if xerrors.Is(err, sql.ErrNoRows) {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("User %q must be a member of organization %q", id, group.ID),
})
return
@@ -215,14 +215,14 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
return nil
}, nil)
if database.IsUniqueViolation(err) {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Cannot add the same user to a group twice!",
Detail: err.Error(),
})
return
}
if xerrors.Is(err, sql.ErrNoRows) {
httpapi.Write(ctx, rw, http.StatusPreconditionFailed, codersdk.Response{
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Failed to add or remove non-existent group member",
Detail: err.Error(),
})
enterprise/coderd/groups_test.go
+2 -2
View File
@@ -322,7 +322,7 @@ func TestPatchGroup(t *testing.T) {
require.Error(t, err)
cerr, ok := codersdk.AsError(err)
require.True(t, ok)
require.Equal(t, http.StatusPreconditionFailed, cerr.StatusCode())
require.Equal(t, http.StatusBadRequest, cerr.StatusCode())
})
t.Run("MalformedUUID", func(t *testing.T) {
@@ -372,7 +372,7 @@ func TestPatchGroup(t *testing.T) {
cerr, ok := codersdk.AsError(err)
require.True(t, ok)
require.Equal(t, http.StatusPreconditionFailed, cerr.StatusCode())
require.Equal(t, http.StatusBadRequest, cerr.StatusCode())
})
t.Run("allUsers", func(t *testing.T) {