[SWR] rename auth to user_auth for permissions (#421)

anton-sidelnikov · web-flow · commit 51d3bf4dfe58 · 2024-03-18T12:15:19.000Z
[SWR] rename auth to user_auth for permissions

auth is reserved field in ansible-collections

Reviewed-by: Vladimir Vshivkov
Reviewed-by: Artem Lifshits
diff --git a/examples/swr/create_organization_permissions.py b/examples/swr/create_organization_permissions.py
@@ -26,7 +26,7 @@
         {
             "user_id": "5a23ecb3999b458d92d51d524bb7fb4c",
             "user_name": "test",
-            "auth": 1
+            "user_auth": 1
         }
     ],
 }
diff --git a/examples/swr/update_organization_permissions.py b/examples/swr/update_organization_permissions.py
@@ -26,7 +26,7 @@
         {
             "user_id": "5a23ecb3999b458d92d51d524bb7fb4c",
             "user_name": "test",
-            "auth": 3
+            "user_auth": 3
         }
     ],
 }
diff --git a/otcextensions/sdk/swr/v2/_proxy.py b/otcextensions/sdk/swr/v2/_proxy.py
@@ -18,6 +18,12 @@
 from otcextensions.sdk.swr.v2 import domain as _domain
 
 
+def update_permissions_attrs(attrs):
+    for permission in attrs.get('permissions', []):
+        permission['auth'] = permission.pop('user_auth', None)
+    return attrs
+
+
 class Proxy(proxy.Proxy):
     skip_discovery = True
 
@@ -112,6 +118,7 @@ def create_organization_permissions(self, **attrs):
         :returns: The results of organization creation
         :rtype: :class:`~otcextensions.sdk.swr.v2.organization.Permission`
         """
+        attrs = update_permissions_attrs(attrs)
         return self._create(_organization.Permission, **attrs)
 
     def organization_permissions(self, namespace, **query):
@@ -153,6 +160,7 @@ def update_organization_permissions(self, **attrs):
 
         :rtype: :class:`~otcextensions.sdk.swr.v2.organization.Permission`
         """
+        attrs = update_permissions_attrs(attrs)
         return self._update(_organization.Permission, **attrs)
 
     def create_repository(self, **attrs):
@@ -235,6 +243,7 @@ def create_repository_permissions(self, **attrs):
         :returns: The results of repository permission creation
         :rtype: :class:`~otcextensions.sdk.swr.v2.repository.Permission`
         """
+        attrs = update_permissions_attrs(attrs)
         return self._create(_repository.Permission, **attrs)
 
     def repository_permissions(self, namespace, repository, **query):
@@ -281,6 +290,7 @@ def update_repository_permissions(self, **attrs):
 
         :rtype: :class:`~otcextensions.sdk.swr.v2.repository.Permission`
         """
+        attrs = update_permissions_attrs(attrs)
         return self._update(_repository.Permission, **attrs)
 
     def create_domain(self, **attrs):
diff --git a/otcextensions/sdk/swr/v2/organization.py b/otcextensions/sdk/swr/v2/organization.py
@@ -42,7 +42,7 @@ class Organization(resource.Resource):
     #: 3: Write
     #: 1: Read
     #: *Type:int*
-    auth = resource.Body('auth', type=int)
+    user_auth = resource.Body('auth', type=int)
 
 
 class Auth(resource.Resource):
@@ -55,7 +55,7 @@ class Auth(resource.Resource):
     #: 7: Manage
     #: 3: Write
     #: 1: Read
-    auth = resource.Body('auth', type=int)
+    user_auth = resource.Body('auth', type=int)
 
 
 class Permission(_base.Resource):
diff --git a/otcextensions/tests/functional/sdk/swr/v2/test_organization.py b/otcextensions/tests/functional/sdk/swr/v2/test_organization.py
@@ -31,7 +31,7 @@ def setUp(self):
                 {
                     "user_id": "5a23ecb3999b458d92d51d524bb7fb4b",
                     "user_name": "pgubina",
-                    "auth": 1
+                    "user_auth": 1
                 }
             ]
             self.org_perm = self.client.create_organization_permissions(
@@ -47,12 +47,12 @@ def test_list_organizations(self):
     def test_get_organization(self):
         o = self.client.get_organization(self.org.namespace)
         self.assertEqual(self.org.namespace, o.name)
-        self.assertEqual(7, o.auth)
+        self.assertEqual(7, o.user_auth)
 
     def test_find_organization(self):
         o = self.client.find_organization(self.org_name)
         self.assertEqual(self.org.namespace, o.name)
-        self.assertEqual(7, o.auth)
+        self.assertEqual(7, o.user_auth)
 
     def test_organization_permissions(self):
         o = list(self.client.organization_permissions(self.org.namespace))
@@ -65,11 +65,11 @@ def test_update_organization_permissions(self):
                     {
                         "user_id": "5a23ecb3999b458d92d51d524bb7fb4b",
                         "user_name": "pgubina",
-                        "auth": 3
+                        "user_auth": 3
                     }
                 ]
             )
-            self.assertEqual(3, o.permissions[0].auth)
+            self.assertEqual(3, o.permissions[0].user_auth)
 
     def test_delete_organization_permissions(self):
         if os.getenv("OS_SWR_PERMISSIONS_RUN"):
diff --git a/otcextensions/tests/functional/sdk/swr/v2/test_repository.py b/otcextensions/tests/functional/sdk/swr/v2/test_repository.py
@@ -37,7 +37,7 @@ def setUp(self):
                 {
                     "user_id": "5a23ecb3999b458d92d51d524bb7fb4b",
                     "user_name": "pgubina",
-                    "auth": 1
+                    "user_auth": 1
                 }
             ]
             self.repo_perm = self.client.create_repository_permissions(
@@ -102,8 +102,8 @@ def test_update_repository_permissions(self):
                     {
                         "user_id": "5a23ecb3999b458d92d51d524bb7fb4b",
                         "user_name": "pgubina",
-                        "auth": 3
+                        "user_auth": 3
                     }
                 ]
             )
-            self.assertEqual(3, o.permissions[0].auth)
+            self.assertEqual(3, o.permissions[0].user_auth)
diff --git a/otcextensions/tests/unit/sdk/swr/v2/test_organization.py b/otcextensions/tests/unit/sdk/swr/v2/test_organization.py
@@ -18,15 +18,15 @@
     "namespace": "test_create_org_v2",
     "id": 21,
     "creator_name": "anton",
-    "auth": 7,
+    "user_auth": 7,
 }
 
 EXAMPLE_PERMISSION = {
     "permissions": [
         {
             "user_id": "5a23ecb3999b458d92d51d524bb7fb4b",
             "user_name": "test",
-            "auth": 1
+            "user_auth": 1
         }
     ],
     "namespace": "test_create_org_v2"
@@ -50,7 +50,7 @@ def test_make_it(self):
         self.assertEqual(EXAMPLE['id'], sot.id)
         self.assertEqual(EXAMPLE['namespace'], sot.namespace)
         self.assertEqual(EXAMPLE['creator_name'], sot.creator_name)
-        self.assertEqual(EXAMPLE['auth'], sot.auth)
+        self.assertEqual(EXAMPLE['user_auth'], sot.user_auth)
 
 
 class TestOrganizationPermissions(base.TestCase):
@@ -73,8 +73,8 @@ def test_make_it(self):
             sot.permissions[0].user_id
         )
         self.assertEqual(
-            EXAMPLE_PERMISSION['permissions'][0]["auth"],
-            sot.permissions[0].auth
+            EXAMPLE_PERMISSION['permissions'][0]["user_auth"],
+            sot.permissions[0].user_auth
         )
         self.assertEqual(
             EXAMPLE_PERMISSION['permissions'][0]["user_name"],
diff --git a/otcextensions/tests/unit/sdk/swr/v2/test_proxy.py b/otcextensions/tests/unit/sdk/swr/v2/test_proxy.py
@@ -74,7 +74,7 @@ def test_organization_permission_update(self):
                                    {
                                        'user_id': '123',
                                        'user_name': 'test',
-                                       'auth': 1
+                                       'user_auth': 1
                                    }
                                ],
                            },
@@ -147,7 +147,7 @@ def test_repository_permission_create(self):
                                    {
                                        'user_id': '123',
                                        'user_name': 'test',
-                                       'auth': 1
+                                       'user_auth': 1
                                    }
                                ],
                            },
@@ -188,7 +188,7 @@ def test_repository_permission_update(self):
                                    {
                                        'user_id': '123',
                                        'user_name': 'test',
-                                       'auth': 1
+                                       'user_auth': 1
                                    }
                                ],
                            },
diff --git a/otcextensions/tests/unit/sdk/swr/v2/test_repository.py b/otcextensions/tests/unit/sdk/swr/v2/test_repository.py
@@ -27,7 +27,7 @@
         {
             'user_id': '5a23ecb3999b458d92d51d524bb7fb4b',
             'user_name': 'test',
-            'auth': 1
+            'user_auth': 1
         }
     ],
     'namespace': 'test_create_org_v2',
@@ -75,8 +75,8 @@ def test_make_it(self):
             sot.permissions[0].user_id
         )
         self.assertEqual(
-            EXAMPLE_PERMISSION['permissions'][0]['auth'],
-            sot.permissions[0].auth
+            EXAMPLE_PERMISSION['permissions'][0]['user_auth'],
+            sot.permissions[0].user_auth
         )
         self.assertEqual(
             EXAMPLE_PERMISSION['permissions'][0]['user_name'],

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`{`
`27`	`27`	`"user_id": "5a23ecb3999b458d92d51d524bb7fb4c",`
`28`	`28`	`"user_name": "test",`
`29`		`- "auth": 1`
	`29`	`+ "user_auth": 1`
`30`	`30`	`}`
`31`	`31`	`],`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ def setUp(self):`
`31`	`31`	`{`
`32`	`32`	`"user_id": "5a23ecb3999b458d92d51d524bb7fb4b",`
`33`	`33`	`"user_name": "pgubina",`
`34`		`- "auth": 1`
	`34`	`+ "user_auth": 1`
`35`	`35`	`}`
`36`	`36`	`]`
`37`	`37`	`self.org_perm = self.client.create_organization_permissions(`
`@@ -47,12 +47,12 @@ def test_list_organizations(self):`
`47`	`47`	`def test_get_organization(self):`
`48`	`48`	`o = self.client.get_organization(self.org.namespace)`
`49`	`49`	`self.assertEqual(self.org.namespace, o.name)`
`50`		`- self.assertEqual(7, o.auth)`
	`50`	`+ self.assertEqual(7, o.user_auth)`
`51`	`51`
`52`	`52`	`def test_find_organization(self):`
`53`	`53`	`o = self.client.find_organization(self.org_name)`
`54`	`54`	`self.assertEqual(self.org.namespace, o.name)`
`55`		`- self.assertEqual(7, o.auth)`
	`55`	`+ self.assertEqual(7, o.user_auth)`
`56`	`56`
`57`	`57`	`def test_organization_permissions(self):`
`58`	`58`	`o = list(self.client.organization_permissions(self.org.namespace))`
`@@ -65,11 +65,11 @@ def test_update_organization_permissions(self):`
`65`	`65`	`{`
`66`	`66`	`"user_id": "5a23ecb3999b458d92d51d524bb7fb4b",`
`67`	`67`	`"user_name": "pgubina",`
`68`		`- "auth": 3`
	`68`	`+ "user_auth": 3`
`69`	`69`	`}`
`70`	`70`	`]`
`71`	`71`	`)`
`72`		`- self.assertEqual(3, o.permissions[0].auth)`
	`72`	`+ self.assertEqual(3, o.permissions[0].user_auth)`
`73`	`73`
`74`	`74`	`def test_delete_organization_permissions(self):`
`75`	`75`	`if os.getenv("OS_SWR_PERMISSIONS_RUN"):`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ def setUp(self):`
`37`	`37`	`{`
`38`	`38`	`"user_id": "5a23ecb3999b458d92d51d524bb7fb4b",`
`39`	`39`	`"user_name": "pgubina",`
`40`		`- "auth": 1`
	`40`	`+ "user_auth": 1`
`41`	`41`	`}`
`42`	`42`	`]`
`43`	`43`	`self.repo_perm = self.client.create_repository_permissions(`
`@@ -102,8 +102,8 @@ def test_update_repository_permissions(self):`
`102`	`102`	`{`
`103`	`103`	`"user_id": "5a23ecb3999b458d92d51d524bb7fb4b",`
`104`	`104`	`"user_name": "pgubina",`
`105`		`- "auth": 3`
	`105`	`+ "user_auth": 3`
`106`	`106`	`}`
`107`	`107`	`]`
`108`	`108`	`)`
`109`		`- self.assertEqual(3, o.permissions[0].auth)`
	`109`	`+ self.assertEqual(3, o.permissions[0].user_auth)`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def test_organization_permission_update(self):`
`74`	`74`	`{`
`75`	`75`	`'user_id': '123',`
`76`	`76`	`'user_name': 'test',`
`77`		`- 'auth': 1`
	`77`	`+ 'user_auth': 1`
`78`	`78`	`}`
`79`	`79`	`],`
`80`	`80`	`},`
`@@ -147,7 +147,7 @@ def test_repository_permission_create(self):`
`147`	`147`	`{`
`148`	`148`	`'user_id': '123',`
`149`	`149`	`'user_name': 'test',`
`150`		`- 'auth': 1`
	`150`	`+ 'user_auth': 1`
`151`	`151`	`}`
`152`	`152`	`],`
`153`	`153`	`},`
`@@ -188,7 +188,7 @@ def test_repository_permission_update(self):`
`188`	`188`	`{`
`189`	`189`	`'user_id': '123',`
`190`	`190`	`'user_name': 'test',`
`191`		`- 'auth': 1`
	`191`	`+ 'user_auth': 1`
`192`	`192`	`}`
`193`	`193`	`],`
`194`	`194`	`},`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`{`
`28`	`28`	`'user_id': '5a23ecb3999b458d92d51d524bb7fb4b',`
`29`	`29`	`'user_name': 'test',`
`30`		`- 'auth': 1`
	`30`	`+ 'user_auth': 1`
`31`	`31`	`}`
`32`	`32`	`],`
`33`	`33`	`'namespace': 'test_create_org_v2',`
`@@ -75,8 +75,8 @@ def test_make_it(self):`
`75`	`75`	`sot.permissions[0].user_id`
`76`	`76`	`)`
`77`	`77`	`self.assertEqual(`
`78`		`- EXAMPLE_PERMISSION['permissions'][0]['auth'],`
`79`		`- sot.permissions[0].auth`
	`78`	`+ EXAMPLE_PERMISSION['permissions'][0]['user_auth'],`
	`79`	`+ sot.permissions[0].user_auth`
`80`	`80`	`)`
`81`	`81`	`self.assertEqual(`
`82`	`82`	`EXAMPLE_PERMISSION['permissions'][0]['user_name'],`