Skip to content

chore(iam): handle deprecated_optional fields #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estellesoulard merged 2 commits into from
Mar 27, 2026
Merged

chore(iam): handle deprecated_optional fields #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d7376a
chore(iam): handle deprecated_optional fields
estellesoulard Mar 27, 2026
a7711ed
Merge branch 'main' into chore/iam-deprecated-optional
Mia-Cross Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
SamlCertificateOrigin,
SamlCertificateType,
SamlStatus,
UserStatus,
UserType,
JWT,
APIKey,
Expand Down Expand Up @@ -685,13 +684,13 @@ def unmarshal_Quotum(data: Any) -> Quotum:
if field is not None:
args["limit"] = field
else:
args["limit"] = 0
args["limit"] = None

field = data.get("unlimited", None)
if field is not None:
args["unlimited"] = field
else:
args["unlimited"] = False
args["unlimited"] = None

return Quotum(**args)

Expand Down Expand Up @@ -927,18 +926,6 @@ def unmarshal_User(data: Any) -> User:
else:
args["type_"] = UserType.UNKNOWN_TYPE

field = data.get("two_factor_enabled", None)
if field is not None:
args["two_factor_enabled"] = field
else:
args["two_factor_enabled"] = False

field = data.get("status", None)
if field is not None:
args["status"] = field
else:
args["status"] = UserStatus.UNKNOWN_STATUS

field = data.get("mfa", None)
if field is not None:
args["mfa"] = field
Expand All @@ -963,6 +950,18 @@ def unmarshal_User(data: Any) -> User:
else:
args["locked"] = False

field = data.get("two_factor_enabled", None)
if field is not None:
args["two_factor_enabled"] = field
else:
args["two_factor_enabled"] = None

field = data.get("status", None)
if field is not None:
args["status"] = field
else:
args["status"] = None

return User(**args)


Expand Down
24 changes: 12 additions & 12 deletions scaleway-async/scaleway_async/iam/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,9 @@ class Quotum:
Limits per locality.
"""

limit: Optional[int] = 0
limit: Optional[int] = None

unlimited: Optional[bool] = False
unlimited: Optional[bool] = None


@dataclass
Expand Down Expand Up @@ -977,16 +977,6 @@ class User:
Type of user.
"""

two_factor_enabled: bool
"""
Deprecated, use "mfa" instead.
"""

status: UserStatus
"""
Status of user invitation.
"""

mfa: bool
"""
Defines whether MFA is enabled.
Expand Down Expand Up @@ -1022,6 +1012,16 @@ class User:
Date of the last login.
"""

two_factor_enabled: Optional[bool] = None
"""
Deprecated, use "mfa" instead.
"""

status: Optional[UserStatus] = None
"""
Status of user invitation.
"""


@dataclass
class SamlServiceProvider:
Expand Down
29 changes: 14 additions & 15 deletions scaleway/scaleway/iam/v1alpha1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
SamlCertificateOrigin,
SamlCertificateType,
SamlStatus,
UserStatus,
UserType,
JWT,
APIKey,
Expand Down Expand Up @@ -685,13 +684,13 @@ def unmarshal_Quotum(data: Any) -> Quotum:
if field is not None:
args["limit"] = field
else:
args["limit"] = 0
args["limit"] = None

field = data.get("unlimited", None)
if field is not None:
args["unlimited"] = field
else:
args["unlimited"] = False
args["unlimited"] = None

return Quotum(**args)

Expand Down Expand Up @@ -927,18 +926,6 @@ def unmarshal_User(data: Any) -> User:
else:
args["type_"] = UserType.UNKNOWN_TYPE

field = data.get("two_factor_enabled", None)
if field is not None:
args["two_factor_enabled"] = field
else:
args["two_factor_enabled"] = False

field = data.get("status", None)
if field is not None:
args["status"] = field
else:
args["status"] = UserStatus.UNKNOWN_STATUS

field = data.get("mfa", None)
if field is not None:
args["mfa"] = field
Expand All @@ -963,6 +950,18 @@ def unmarshal_User(data: Any) -> User:
else:
args["locked"] = False

field = data.get("two_factor_enabled", None)
if field is not None:
args["two_factor_enabled"] = field
else:
args["two_factor_enabled"] = None

field = data.get("status", None)
if field is not None:
args["status"] = field
else:
args["status"] = None

return User(**args)


Expand Down
24 changes: 12 additions & 12 deletions scaleway/scaleway/iam/v1alpha1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,9 @@ class Quotum:
Limits per locality.
"""

limit: Optional[int] = 0
limit: Optional[int] = None

unlimited: Optional[bool] = False
unlimited: Optional[bool] = None


@dataclass
Expand Down Expand Up @@ -977,16 +977,6 @@ class User:
Type of user.
"""

two_factor_enabled: bool
"""
Deprecated, use "mfa" instead.
"""

status: UserStatus
"""
Status of user invitation.
"""

mfa: bool
"""
Defines whether MFA is enabled.
Expand Down Expand Up @@ -1022,6 +1012,16 @@ class User:
Date of the last login.
"""

two_factor_enabled: Optional[bool] = None
"""
Deprecated, use "mfa" instead.
"""

status: Optional[UserStatus] = None
"""
Status of user invitation.
"""


@dataclass
class SamlServiceProvider:
Expand Down
Loading