Skip to content

Added error handling for group already existing #1902

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 2 commits into from
Apr 25, 2022
Merged

Added error handling for group already existing #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9077f3a
Added error handling for group already existing
jinapurapu Apr 25, 2022
4cebfb1
Merge branch 'master' into existing_group_fix1
dvaldivia Apr 25, 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
9 changes: 8 additions & 1 deletion restapi/admin_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ func getAddGroupResponse(session *models.Principal, params *models.AddGroupReque
if params == nil {
return prepareError(errGroupBodyNotInRequest)
}

mAdmin, err := NewMinioAdminClient(session)
if err != nil {
return prepareError(err)
Expand All @@ -162,6 +161,14 @@ func getAddGroupResponse(session *models.Principal, params *models.AddGroupReque
// defining the client to be used
adminClient := AdminClient{Client: mAdmin}

groupList, _ := adminClient.listGroups(ctx)

for _, b := range groupList {
if b == *params.Group {
return prepareError(errGroupAlreadyExists)
}
}

if err := addGroup(ctx, adminClient, *params.Group, params.Members); err != nil {
return prepareError(err)
}
Expand Down
5 changes: 5 additions & 0 deletions restapi/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var (
errBucketNameNotInRequest = errors.New("error bucket name not in request")
errGroupBodyNotInRequest = errors.New("error group body not in request")
errGroupNameNotInRequest = errors.New("error group name not in request")
errGroupAlreadyExists = errors.New("error group name already in use")
errPolicyNameNotInRequest = errors.New("error policy name not in request")
errPolicyBodyNotInRequest = errors.New("error policy body not in request")
errInvalidEncryptionAlgorithm = errors.New("error invalid encryption algorithm")
Expand Down Expand Up @@ -106,6 +107,10 @@ func prepareError(err ...error) *models.Error {
errorCode = 400
errorMessage = errGroupNameNotInRequest.Error()
}
if errors.Is(err[0], errGroupAlreadyExists) {
errorCode = 400
errorMessage = errGroupAlreadyExists.Error()
}
if errors.Is(err[0], errPolicyNameNotInRequest) {
errorCode = 400
errorMessage = errPolicyNameNotInRequest.Error()
Expand Down