fix(conflict-handling): on succesfully handled conflict (e.g. already… (

#50) * fix(conflict-handling): on succesfully handled conflict (e.g. already exists) make sure to return the actual member * fix(comments): fix comments for conflict handling
uc-cdis · Dec 18, 2018 · 8a9a46b · 8a9a46b
1 parent 9eb5b61
commit 8a9a46b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cirrus/google_cloud/manager.py b/cirrus/google_cloud/manager.py
@@ -1167,18 +1167,18 @@ def add_member_to_group(self, member_email, group_id):
                 return member_to_add
             else:
                 # Google's API erroneously returns 400 sometimes
-                # we check to see if the SA was actually deleted
+                # we check to see if the SA was actually added
                 logger.warning(
                     "When adding {} to group ({}), Google API "
                     "returned status {}".format(member_email, group_id, err.resp.status)
                 )
                 if not self._is_member_in_group(member_email, group_id):
                     raise
 
-                return {}
+                return member_to_add
         except Exception as exc:
-            # Google's API erroneously returns 400 sometimes
-            # we check to see if the SA was actually deleted
+            # Google's API erroneously returns error sometimes
+            # we check to see if the SA was actually added
             logger.warning(
                 "When adding {} to group ({}), Exception was raised: {}".format(
                     member_email, group_id, exc
@@ -1187,7 +1187,7 @@ def add_member_to_group(self, member_email, group_id):
             if not self._is_member_in_group(member_email, group_id):
                 raise
 
-            return {}
+            return member_to_add
 
     def _is_member_in_group(self, member_email, group_id):
         member_emails = [