Merge branch 'bugfix/various' into 'develop'

Bugfix/various See merge request core/sevenbridges-python!53
sbg · Nov 25, 2019 · c618611 · c618611
2 parents 6f2a350 + a4b2b1c
commit c618611
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/sevenbridges/models/compound/tasks/__init__.py b/sevenbridges/models/compound/tasks/__init__.py
@@ -19,6 +19,7 @@ def map_input_output(item, api):
             data = {
                 'id': item['path']
             }
+            data.update({k: item[k] for k in item if k != 'path'})
             if _secondary_files:
                 data.update({
                     '_secondary_files': _secondary_files,

diff --git a/sevenbridges/models/project.py b/sevenbridges/models/project.py
@@ -191,7 +191,7 @@ def add_member(self, user, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding member using username', extra=extra)
+        logger.info('Adding member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()
@@ -205,7 +205,7 @@ def add_member_team(self, team, permissions):
         :return: Member object.
         """
         team = Transform.to_team(team)
-        data = {'id': team, 'type': 'TEAM'}
+        data = {'username': team, 'type': 'TEAM'}
         if isinstance(permissions, dict):
             data.update({
                 'permissions': permissions
@@ -218,7 +218,7 @@ def add_member_team(self, team, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding team member using team id', extra=extra)
+        logger.info('Adding team member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()
@@ -232,7 +232,7 @@ def add_member_division(self, division, permissions):
         :return: Member object.
         """
         division = Transform.to_division(division)
-        data = {'id': division, 'type': 'DIVISION'}
+        data = {'username': division, 'type': 'DIVISION'}
         if isinstance(permissions, dict):
             data.update({
                 'permissions': permissions
@@ -245,7 +245,7 @@ def add_member_division(self, division, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding team member using division id', extra=extra)
+        logger.info('Adding division member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()

diff --git a/sevenbridges/models/volume.py b/sevenbridges/models/volume.py
@@ -343,7 +343,7 @@ def add_member(self, user, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding volume member using username', extra=extra)
+        logger.info('Adding volume member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()
@@ -357,7 +357,7 @@ def add_member_team(self, team, permissions):
         :return: Member object.
         """
         team = Transform.to_team(team)
-        data = {'id': team, 'type': 'TEAM'}
+        data = {'username': team, 'type': 'TEAM'}
 
         if 'execute' in permissions:
             permissions.pop('execute')
@@ -374,7 +374,7 @@ def add_member_team(self, team, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding volume team member using team id', extra=extra)
+        logger.info('Adding volume team member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()
@@ -392,7 +392,7 @@ def add_member_division(self, division, permissions):
         if 'execute' in permissions:
             permissions.pop('execute')
 
-        data = {'id': division, 'type': 'DIVISION'}
+        data = {'username': division, 'type': 'DIVISION'}
         if isinstance(permissions, dict):
             data.update({
                 'permissions': permissions
@@ -405,7 +405,7 @@ def add_member_division(self, division, permissions):
                 'data': data,
             }
         }
-        logger.info('Adding volume team member using division id', extra=extra)
+        logger.info('Adding volume division member', extra=extra)
         response = self._api.post(
             url=self._URL['members_query'].format(id=self.id), data=data)
         member_data = response.json()
@@ -431,7 +431,7 @@ def remove_member(self, user):
         Remove member from the volume.
         :param user: User to be removed.
         """
-        member = Transform.to_user(user)
+        username = Transform.to_user(user)
         extra = {
             'resource': self.__class__.__name__,
             'query': {
@@ -441,5 +441,5 @@ def remove_member(self, user):
         }
         logger.info('Removing volume member', extra=extra)
         self._api.delete(
-            url=self._URL['member'].format(id=self.id, member=member)
+            url=self._URL['member'].format(id=self.id, username=username)
         )