chore(iam): handle deprecated_optional fields (#1685)

Co-authored-by: Mia-Cross <lmarabese@scaleway.com>

Author: estellesoulard

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

@@ -21,7 +21,6 @@
     SamlCertificateOrigin,
     SamlCertificateType,
     SamlStatus,
-    UserStatus,
     UserType,
     JWT,
     APIKey,
@@ -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)
 
@@ -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
@@ -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)
 
 

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

@@ -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
@@ -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.
@@ -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:

scaleway/scaleway/iam/v1alpha1/marshalling.py

@@ -21,7 +21,6 @@
     SamlCertificateOrigin,
     SamlCertificateType,
     SamlStatus,
-    UserStatus,
     UserType,
     JWT,
     APIKey,
@@ -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)
 
@@ -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
@@ -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)
 
 

scaleway/scaleway/iam/v1alpha1/types.py

@@ -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
@@ -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.
@@ -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: