python-gitlab · klorenz · Mar 6, 2021 · Mar 6, 2021 · Mar 6, 2021 · Mar 7, 2021
diff --git a/gitlab/types.py b/gitlab/types.py
@@ -45,6 +45,15 @@ def get_for_api(self):
        return ",".join(self._value)


+class ScopesListAttribute(ListAttribute):
+    def get_for_api(self):
+        # scopes are expected to be a list of strings
+        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/applications.py b/gitlab/v4/objects/applications.py
@@ -1,5 +1,6 @@
 from gitlab.base import RESTManager, RESTObject
 from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin
+from gitlab.types import ScopesListAttribute

 __all__ = [
    "Application",
@@ -16,3 +17,5 @@ class ApplicationManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
    _path = "/applications"
    _obj_cls = Application
    _create_attrs = (("name", "redirect_uri", "scopes"), ("confidential",))
+
+    _types = {"scopes": ScopesListAttribute}
diff --git a/gitlab/v4/objects/deploy_tokens.py b/gitlab/v4/objects/deploy_tokens.py
@@ -1,6 +1,6 @@
 from gitlab.base import RESTManager, RESTObject
 from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin
-
+from gitlab.types import ScopesListAttribute

 __all__ = [
    "DeployToken",
@@ -39,6 +39,7 @@ class GroupDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
            "username",
        ),
    )
+    _types = {"scopes": ScopesListAttribute}


 class ProjectDeployToken(ObjectDeleteMixin, RESTObject):
@@ -59,3 +60,4 @@ class ProjectDeployTokenManager(ListMixin, CreateMixin, DeleteMixin, RESTManager
            "username",
        ),
    )
+    _types = {"scopes": ScopesListAttribute}
diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py
@@ -13,6 +13,7 @@
    SaveMixin,
    UpdateMixin,
 )
+from gitlab.types import ScopesListAttribute

 from .custom_attributes import UserCustomAttributeManager
 from .events import UserEventManager
@@ -406,6 +407,7 @@ class UserImpersonationTokenManager(NoUpdateMixin, RESTManager):
    _from_parent_attrs = {"user_id": "id"}
    _create_attrs = (("name", "scopes"), ("expires_at",))
    _list_filters = ("state",)
+    _types = {"scopes": ScopesListAttribute}


 class UserMembership(RESTObject):

diff --git a/tools/functional/cli/test_cli_v4.py b/tools/functional/cli/test_cli_v4.py
@@ -561,11 +561,10 @@ def test_create_project_with_values_from_file(gitlab_cli, tmpdir):
    assert description in ret.stdout


-def test_create_project_deploy_token(gitlab_cli, project):
+def do_test_create_project_deploy_token(gitlab_cli, project, scopes, expected_scopes):
 @pytest.mark.parametrize( 
     "config_string,expected_agent", 
     [ 
         (valid_config, USER_AGENT), 
         (custom_user_agent_config, custom_user_agent), 
     ], 
 ) 
 def test_config_user_agent(m_open, path_exists, config_string, expected_agent): 
     fd = io.StringIO(config_string) 
     fd.close = mock.Mock(return_value=None) 
     m_open.return_value = fd 
     cp = config.GitlabConfigParser() 
     assert cp.user_agent == expected_agent 
 @pytest.mark.parametrize( 
     "config_string,expected_agent", 
     [ 
         (valid_config, USER_AGENT), 
         (custom_user_agent_config, custom_user_agent), 
     ], 
 ) 
 def test_config_user_agent(m_open, path_exists, config_string, expected_agent): 
     fd = io.StringIO(config_string) 
     fd.close = mock.Mock(return_value=None) 
     m_open.return_value = fd 
  
     cp = config.GitlabConfigParser() 
     assert cp.user_agent == expected_agent 
    name = "project-token"
    username = "root"
    expires_at = "2021-09-09"
-    scopes = "read_registry"

    cmd = [
        "-v",
@@ -588,7 +587,19 @@ def test_create_project_deploy_token(gitlab_cli, project):
    assert name in ret.stdout
    assert username in ret.stdout
    assert expires_at in ret.stdout
-    assert scopes in ret.stdout
+    assert expected_scopes in ret.stdout
+
+
+def test_create_project_deploy_token_one_scope(gitlab_cli, project):
+    scopes = "read_registry"
+    expected_scopes = "['read_registry']"
+    do_test_create_project_deploy_token(gitlab_cli, project, scopes, expected_scopes)
+
+
+def test_create_project_deploy_token_many_scopes(gitlab_cli, project):
+    scopes = "read_registry,read_repository"
+    expected_scopes = "['read_repository', 'read_registry']"
+    do_test_create_project_deploy_token(gitlab_cli, project, scopes, expected_scopes)


 def test_list_all_deploy_tokens(gitlab_cli, deploy_token):