Merge pull request #299 from manuelstein/fix-gitlab-add-collaborator

gitlab: AddCollaborator tell when user is a member
jenkins-x · Aug 31, 2023 · 1a237c8 · 1a237c8
2 parents 218168b + 3bfe234
commit 1a237c8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scm/driver/gitlab/repo.go b/scm/driver/gitlab/repo.go
@@ -252,10 +252,15 @@ func (s *repositoryService) AddCollaborator(ctx context.Context, repo, username,
  AccessLevel: stringToAccessLevel(permission),
  }
  res, err := s.client.do(ctx, "POST", path, in, &out)
+ if res.Status == 409 {
+ // GitLab returns 409 Conflict and message "Member already exists"
+ return false, true, res, err
+ }
  if err != nil {
  return false, false, res, err
  }
- return true, false, res, nil
+ // Return that user has become a member already (no invite/accept in GitLab)
+ return true, true, res, nil
 }
 
 func (s *repositoryService) IsCollaborator(ctx context.Context, repo, user string) (bool, *scm.Response, error) {