fix: make scopes work with multiple scope-names

klorenz · klorenz · commit 912f62285e58 · 2021-03-06T11:44:45.000+01:00
diff --git a/gitlab/types.py b/gitlab/types.py
@@ -45,6 +45,22 @@ def get_for_api(self):
         return ",".join(self._value)
 
 
+class ScopesListAttribute(ListAttribute):
+    def set_from_cli(self, cli_value):
+        if not cli_value.strip():
+            self._value = []
+        else:
+            self._value = [item.strip() for item in cli_value.split(",")]
+
+
+    def get_for_api(self):
+        # Do not comma-split single value passed as string
+        if isinstance(self._value, str):
+            return [self._value]
+
+        return self._value
+
+
 class LowercaseStringAttribute(GitlabAttribute):
     def get_for_api(self):
         return str(self._value).lower()
diff --git a/gitlab/v4/objects/__init__.py b/gitlab/v4/objects/__init__.py
@@ -229,7 +229,7 @@ class UserIdentityProviderManager(DeleteMixin, RESTManager):
 
 
 class UserImpersonationToken(ObjectDeleteMixin, RESTObject):
-    pass
+    _short_print_attr = "token"
 
 
 class UserImpersonationTokenManager(NoUpdateMixin, RESTManager):
@@ -238,6 +238,7 @@ class UserImpersonationTokenManager(NoUpdateMixin, RESTManager):
     _from_parent_attrs = {"user_id": "id"}
     _create_attrs = (("name", "scopes"), ("expires_at",))
     _list_filters = ("state",)
+    _types = {"scopes": types.ScopesListAttribute}
 
 
 class UserMembership(RESTObject):
@@ -734,6 +735,7 @@ class ProjectDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager
             "username",
         ),
     )
+    _types = {"scopes": types.ScopesListAttribute}
 
 
 class GroupDeployToken(ObjectDeleteMixin, RESTObject):
@@ -754,6 +756,7 @@ class GroupDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
             "username",
         ),
     )
+    _types = {"scopes": types.ScopesListAttribute}
 
 
 class NotificationSettings(SaveMixin, RESTObject):
@@ -5786,3 +5789,4 @@ class ApplicationManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
     _path = "/applications"
     _obj_cls = Application
     _create_attrs = (("name", "redirect_uri", "scopes"), ("confidential",))
+    _types = {"scopes": types.ScopesListAttribute}
