chore(rdb): handle deprecated_optional fields (#1688)

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

Author: estellesoulard

scaleway-async/scaleway_async/rdb/v1/marshalling.py

@@ -1045,7 +1045,7 @@ def unmarshal_ACLRule(data: Any) -> ACLRule:
     if field is not None:
         args["port"] = field
     else:
-        args["port"] = 0
+        args["port"] = None
 
     return ACLRule(**args)
 
@@ -1625,18 +1625,6 @@ def unmarshal_NodeType(data: Any) -> NodeType:
     else:
         args["memory"] = 0
 
-    field = data.get("volume_constraint", None)
-    if field is not None:
-        args["volume_constraint"] = unmarshal_NodeTypeVolumeConstraintSizes(field)
-    else:
-        args["volume_constraint"] = None
-
-    field = data.get("is_bssd_compatible", None)
-    if field is not None:
-        args["is_bssd_compatible"] = field
-    else:
-        args["is_bssd_compatible"] = False
-
     field = data.get("disabled", None)
     if field is not None:
         args["disabled"] = field
@@ -1649,6 +1637,18 @@ def unmarshal_NodeType(data: Any) -> NodeType:
     else:
         args["beta"] = False
 
+    field = data.get("volume_constraint", None)
+    if field is not None:
+        args["volume_constraint"] = unmarshal_NodeTypeVolumeConstraintSizes(field)
+    else:
+        args["volume_constraint"] = None
+
+    field = data.get("is_bssd_compatible", None)
+    if field is not None:
+        args["is_bssd_compatible"] = field
+    else:
+        args["is_bssd_compatible"] = None
+
     field = data.get("available_volume_types", None)
     if field is not None:
         args["available_volume_types"] = (

scaleway-async/scaleway_async/rdb/v1/types.py

@@ -667,7 +667,7 @@ class ACLRule:
     direction: ACLRuleDirection
     action: ACLRuleAction
     description: str
-    port: int
+    port: Optional[int] = None
 
 
 @dataclass
@@ -992,11 +992,6 @@ class NodeType:
     Quantity of RAM.
     """
 
-    is_bssd_compatible: bool
-    """
-    The Node Type is compliant with Block Storage.
-    """
-
     disabled: bool
     """
     The Node Type is currently disabled.
@@ -1037,6 +1032,11 @@ class NodeType:
     [deprecated] Node Type volume constraints.
     """
 
+    is_bssd_compatible: Optional[bool] = None
+    """
+    The Node Type is compliant with Block Storage.
+    """
+
 
 @dataclass
 class Privilege:

scaleway/scaleway/rdb/v1/marshalling.py

@@ -1045,7 +1045,7 @@ def unmarshal_ACLRule(data: Any) -> ACLRule:
     if field is not None:
         args["port"] = field
     else:
-        args["port"] = 0
+        args["port"] = None
 
     return ACLRule(**args)
 
@@ -1625,18 +1625,6 @@ def unmarshal_NodeType(data: Any) -> NodeType:
     else:
         args["memory"] = 0
 
-    field = data.get("volume_constraint", None)
-    if field is not None:
-        args["volume_constraint"] = unmarshal_NodeTypeVolumeConstraintSizes(field)
-    else:
-        args["volume_constraint"] = None
-
-    field = data.get("is_bssd_compatible", None)
-    if field is not None:
-        args["is_bssd_compatible"] = field
-    else:
-        args["is_bssd_compatible"] = False
-
     field = data.get("disabled", None)
     if field is not None:
         args["disabled"] = field
@@ -1649,6 +1637,18 @@ def unmarshal_NodeType(data: Any) -> NodeType:
     else:
         args["beta"] = False
 
+    field = data.get("volume_constraint", None)
+    if field is not None:
+        args["volume_constraint"] = unmarshal_NodeTypeVolumeConstraintSizes(field)
+    else:
+        args["volume_constraint"] = None
+
+    field = data.get("is_bssd_compatible", None)
+    if field is not None:
+        args["is_bssd_compatible"] = field
+    else:
+        args["is_bssd_compatible"] = None
+
     field = data.get("available_volume_types", None)
     if field is not None:
         args["available_volume_types"] = (

scaleway/scaleway/rdb/v1/types.py

@@ -667,7 +667,7 @@ class ACLRule:
     direction: ACLRuleDirection
     action: ACLRuleAction
     description: str
-    port: int
+    port: Optional[int] = None
 
 
 @dataclass
@@ -992,11 +992,6 @@ class NodeType:
     Quantity of RAM.
     """
 
-    is_bssd_compatible: bool
-    """
-    The Node Type is compliant with Block Storage.
-    """
-
     disabled: bool
     """
     The Node Type is currently disabled.
@@ -1037,6 +1032,11 @@ class NodeType:
     [deprecated] Node Type volume constraints.
     """
 
+    is_bssd_compatible: Optional[bool] = None
+    """
+    The Node Type is compliant with Block Storage.
+    """
+
 
 @dataclass
 class Privilege: