Merge branch 'main' into v1.5680.0

Author: Laure-di

scaleway-async/scaleway_async/container/v1beta1/api.py

@@ -630,6 +630,7 @@ async def create_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:
@@ -728,6 +729,7 @@ async def update_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:

scaleway-async/scaleway_async/container/v1beta1/marshalling.py

@@ -59,6 +59,12 @@ def unmarshal_ContainerScalingOption(data: Any) -> ContainerScalingOption:
     else:
         args["concurrent_requests_threshold"] = None
 
+    field = data.get("cpu_usage_threshold", None)
+    if field is not None:
+        args["cpu_usage_threshold"] = field
+    else:
+        args["cpu_usage_threshold"] = None
+
     return ContainerScalingOption(**args)
 
 
@@ -702,6 +708,7 @@ def marshal_ContainerScalingOption(
                     "concurrent_requests_threshold",
                     request.concurrent_requests_threshold,
                 ),
+                OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold),
             ]
         ),
     )

scaleway-async/scaleway_async/container/v1beta1/types.py

@@ -195,6 +195,8 @@ def __str__(self) -> str:
 class ContainerScalingOption:
     concurrent_requests_threshold: Optional[int]
 
+    cpu_usage_threshold: Optional[int]
+
 
 @dataclass
 class SecretHashedValue:
@@ -447,6 +449,7 @@ class Container:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
     created_at: Optional[datetime]
@@ -790,6 +793,7 @@ class CreateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 
@@ -1462,6 +1466,7 @@ class UpdateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 

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

@@ -1077,16 +1077,16 @@ async def create_user(
         *,
         instance_id: str,
         name: str,
+        password: str,
         region: Optional[Region] = None,
-        password: Optional[str] = None,
     ) -> User:
         """
         Create an user on a Database Instance.
         Create an user on a Database Instance. You must define the `name`, `password` of the user and `instance_id` parameters in the request.
         :param instance_id: UUID of the Database Instance the user belongs to.
         :param name: Name of the database user.
-        :param region: Region to target. If none is passed will use default region from the config.
         :param password: Password of the database user.
+        :param region: Region to target. If none is passed will use default region from the config.
         :return: :class:`User <User>`
 
         Usage:
@@ -1095,6 +1095,7 @@ async def create_user(
             result = await api.create_user(
                 instance_id="example",
                 name="example",
+                password="example",
             )
         """
 
@@ -1111,8 +1112,8 @@ async def create_user(
                 CreateUserRequest(
                     instance_id=instance_id,
                     name=name,
-                    region=region,
                     password=password,
+                    region=region,
                 ),
                 self.client,
             ),

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

@@ -604,14 +604,14 @@ class CreateUserRequest:
     Name of the database user.
     """
 
-    region: Optional[Region]
+    password: str
     """
-    Region to target. If none is passed will use default region from the config.
+    Password of the database user.
     """
 
-    password: Optional[str]
+    region: Optional[Region]
     """
-    Password of the database user.
+    Region to target. If none is passed will use default region from the config.
     """
 
 

scaleway/scaleway/container/v1beta1/api.py

@@ -626,6 +626,7 @@ def create_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:
@@ -724,6 +725,7 @@ def update_container(
         :param local_storage_limit: Local storage limit of the container (in MB).
         :param scaling_option: Possible values:
         - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+        - cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
         :return: :class:`Container <Container>`
 
         Usage:

scaleway/scaleway/container/v1beta1/marshalling.py

@@ -59,6 +59,12 @@ def unmarshal_ContainerScalingOption(data: Any) -> ContainerScalingOption:
     else:
         args["concurrent_requests_threshold"] = None
 
+    field = data.get("cpu_usage_threshold", None)
+    if field is not None:
+        args["cpu_usage_threshold"] = field
+    else:
+        args["cpu_usage_threshold"] = None
+
     return ContainerScalingOption(**args)
 
 
@@ -702,6 +708,7 @@ def marshal_ContainerScalingOption(
                     "concurrent_requests_threshold",
                     request.concurrent_requests_threshold,
                 ),
+                OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold),
             ]
         ),
     )

scaleway/scaleway/container/v1beta1/types.py

@@ -195,6 +195,8 @@ def __str__(self) -> str:
 class ContainerScalingOption:
     concurrent_requests_threshold: Optional[int]
 
+    cpu_usage_threshold: Optional[int]
+
 
 @dataclass
 class SecretHashedValue:
@@ -447,6 +449,7 @@ class Container:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
     created_at: Optional[datetime]
@@ -790,6 +793,7 @@ class CreateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 
@@ -1462,6 +1466,7 @@ class UpdateContainerRequest:
     """
     Possible values:
 - concurrent_requests_threshold: Scale depending on the number of concurrent requests being processed per container instance.
+- cpu_usage_threshold: Scale depending on the CPU usage of a container instance.
     """
 
 

scaleway/scaleway/mongodb/v1alpha1/api.py

@@ -1073,16 +1073,16 @@ def create_user(
         *,
         instance_id: str,
         name: str,
+        password: str,
         region: Optional[Region] = None,
-        password: Optional[str] = None,
     ) -> User:
         """
         Create an user on a Database Instance.
         Create an user on a Database Instance. You must define the `name`, `password` of the user and `instance_id` parameters in the request.
         :param instance_id: UUID of the Database Instance the user belongs to.
         :param name: Name of the database user.
-        :param region: Region to target. If none is passed will use default region from the config.
         :param password: Password of the database user.
+        :param region: Region to target. If none is passed will use default region from the config.
         :return: :class:`User <User>`
 
         Usage:
@@ -1091,6 +1091,7 @@ def create_user(
             result = api.create_user(
                 instance_id="example",
                 name="example",
+                password="example",
             )
         """
 
@@ -1107,8 +1108,8 @@ def create_user(
                 CreateUserRequest(
                     instance_id=instance_id,
                     name=name,
-                    region=region,
                     password=password,
+                    region=region,
                 ),
                 self.client,
             ),

scaleway/scaleway/mongodb/v1alpha1/types.py

@@ -604,14 +604,14 @@ class CreateUserRequest:
     Name of the database user.
     """
 
-    region: Optional[Region]
+    password: str
     """
-    Region to target. If none is passed will use default region from the config.
+    Password of the database user.
     """
 
-    password: Optional[str]
+    region: Optional[Region]
     """
-    Password of the database user.
+    Region to target. If none is passed will use default region from the config.
     """