Skip to content
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

Jump to bottom

Bugfix: Do not stop syncing if user was deleted and therefore no longer member of the group #219

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Do not stop syncing if user was deleted and therefore no longer member of the group #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions internal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
aws_sdk_sess "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/identitystore"
"github.com/aws/aws-sdk-go/service/identitystore/identitystoreiface"
"github.com/aws/aws-sdk-go/aws/awserr"
log "github.com/sirupsen/logrus"
admin "google.golang.org/api/admin/directory/v1"
)
Expand Down Expand Up @@ -1052,6 +1053,17 @@ func (s *syncGSuite) RemoveUserFromGroup(userID *string, groupID *string) error
)

if err != nil {
var awsErr awserr.Error
if errors.As(err, &awsErr) {
switch awsErr.Code() {
case identitystore.ErrCodeResourceNotFoundException:
log.WithField("groupID", groupID).Debug("No operation: User not a member of the group")
return nil
default:
return err
}
}

return err
}

Expand Down