Skip to content

Commit bf10589

Browse files
authored
refactor(mnq): make Permissions optional (#149)
1 parent 72dba11 commit bf10589

File tree

6 files changed

+12
-64
lines changed

6 files changed

+12
-64
lines changed

scaleway-async/scaleway_async/mnq/v1alpha1/api.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ async def create_credential(
298298
:param namespace_id: Namespace containing the credentials.
299299
:param name: Name of the credentials.
300300
:param permissions: Permissions associated with these credentials.
301-
302-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
303301
:return: :class:`Credential <Credential>`
304302
305303
Usage:
@@ -456,8 +454,6 @@ async def update_credential(
456454
:param credential_id: ID of the credentials to update.
457455
:param name: Name of the credentials.
458456
:param permissions: Permissions associated with these credentials.
459-
460-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
461457
:return: :class:`Credential <Credential>`
462458
463459
Usage:

scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
from typing import Any, Dict
55

66
from scaleway_core.profile import ProfileDefaults
7-
from scaleway_core.utils import (
8-
OneOfPossibility,
9-
resolve_one_of,
10-
)
117
from dateutil import parser
128
from .types import (
139
NamespaceProtocol,
@@ -244,18 +240,11 @@ def marshal_CreateCredentialRequest(
244240
defaults: ProfileDefaults,
245241
) -> Dict[str, Any]:
246242
return {
247-
**resolve_one_of(
248-
[
249-
OneOfPossibility(
250-
"permissions",
251-
marshal_Permissions(request.permissions, defaults)
252-
if request.permissions is not None
253-
else None,
254-
),
255-
]
256-
),
257243
"name": request.name,
258244
"namespace_id": request.namespace_id,
245+
"permissions": marshal_Permissions(request.permissions, defaults)
246+
if request.permissions is not None
247+
else None,
259248
}
260249

261250

@@ -277,17 +266,10 @@ def marshal_UpdateCredentialRequest(
277266
defaults: ProfileDefaults,
278267
) -> Dict[str, Any]:
279268
return {
280-
**resolve_one_of(
281-
[
282-
OneOfPossibility(
283-
"permissions",
284-
marshal_Permissions(request.permissions, defaults)
285-
if request.permissions is not None
286-
else None,
287-
),
288-
]
289-
),
290269
"name": request.name,
270+
"permissions": marshal_Permissions(request.permissions, defaults)
271+
if request.permissions is not None
272+
else None,
291273
}
292274

293275

scaleway-async/scaleway_async/mnq/v1alpha1/types.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ class CreateCredentialRequest:
396396
permissions: Optional[Permissions]
397397
"""
398398
Permissions associated with these credentials.
399-
400-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
401399
"""
402400

403401

@@ -462,8 +460,6 @@ class UpdateCredentialRequest:
462460
permissions: Optional[Permissions]
463461
"""
464462
Permissions associated with these credentials.
465-
466-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
467463
"""
468464

469465

scaleway/scaleway/mnq/v1alpha1/api.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ def create_credential(
298298
:param namespace_id: Namespace containing the credentials.
299299
:param name: Name of the credentials.
300300
:param permissions: Permissions associated with these credentials.
301-
302-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
303301
:return: :class:`Credential <Credential>`
304302
305303
Usage:
@@ -456,8 +454,6 @@ def update_credential(
456454
:param credential_id: ID of the credentials to update.
457455
:param name: Name of the credentials.
458456
:param permissions: Permissions associated with these credentials.
459-
460-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
461457
:return: :class:`Credential <Credential>`
462458
463459
Usage:

scaleway/scaleway/mnq/v1alpha1/marshalling.py

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
from typing import Any, Dict
55

66
from scaleway_core.profile import ProfileDefaults
7-
from scaleway_core.utils import (
8-
OneOfPossibility,
9-
resolve_one_of,
10-
)
117
from dateutil import parser
128
from .types import (
139
NamespaceProtocol,
@@ -244,18 +240,11 @@ def marshal_CreateCredentialRequest(
244240
defaults: ProfileDefaults,
245241
) -> Dict[str, Any]:
246242
return {
247-
**resolve_one_of(
248-
[
249-
OneOfPossibility(
250-
"permissions",
251-
marshal_Permissions(request.permissions, defaults)
252-
if request.permissions is not None
253-
else None,
254-
),
255-
]
256-
),
257243
"name": request.name,
258244
"namespace_id": request.namespace_id,
245+
"permissions": marshal_Permissions(request.permissions, defaults)
246+
if request.permissions is not None
247+
else None,
259248
}
260249

261250

@@ -277,17 +266,10 @@ def marshal_UpdateCredentialRequest(
277266
defaults: ProfileDefaults,
278267
) -> Dict[str, Any]:
279268
return {
280-
**resolve_one_of(
281-
[
282-
OneOfPossibility(
283-
"permissions",
284-
marshal_Permissions(request.permissions, defaults)
285-
if request.permissions is not None
286-
else None,
287-
),
288-
]
289-
),
290269
"name": request.name,
270+
"permissions": marshal_Permissions(request.permissions, defaults)
271+
if request.permissions is not None
272+
else None,
291273
}
292274

293275

scaleway/scaleway/mnq/v1alpha1/types.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ class CreateCredentialRequest:
396396
permissions: Optional[Permissions]
397397
"""
398398
Permissions associated with these credentials.
399-
400-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
401399
"""
402400

403401

@@ -462,8 +460,6 @@ class UpdateCredentialRequest:
462460
permissions: Optional[Permissions]
463461
"""
464462
Permissions associated with these credentials.
465-
466-
One-of ('optional_permissions'): at most one of 'permissions' could be set.
467463
"""
468464

469465

0 commit comments

Comments
 (0)