Merge branch 'main' into dependabot/pip/scaleway-core/ruff-0.7.1

Author: Laure-di

scaleway-async/poetry.lock

@@ -28,7 +28,7 @@ scaleway-core = "*"
 
 [tool.poetry.group.dev.dependencies]
 scaleway-core = { path = "../scaleway-core", develop = true }
-ruff = ">=0.5.0,<0.6.9"
+ruff = ">=0.5.0,<0.7.2"
 mypy = "^1.5.1"
 
 [build-system]

scaleway-async/pyproject.toml

@@ -266,6 +266,10 @@ def unmarshal_Server(data: Any) -> Server:
     if field is not None:
         args["sudo_password"] = field
 
+    field = data.get("vnc_port", None)
+    if field is not None:
+        args["vnc_port"] = field
+
     field = data.get("status", None)
     if field is not None:
         args["status"] = field

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

@@ -225,6 +225,11 @@ class Server:
     Admin password required to execute commands.
     """
 
+    vnc_port: int
+    """
+    VNC port to use for remote desktop connection.
+    """
+
     status: ServerStatus
     """
     Current status of the server.

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

@@ -23,6 +23,9 @@
 from .types import TriggerInputType
 from .types import TriggerStatus
 from .content import TRIGGER_TRANSIENT_STATUSES
+from .types import ContainerHealthCheckSpecHTTPProbe
+from .types import ContainerHealthCheckSpecTCPProbe
+from .types import ContainerHealthCheckSpec
 from .types import ContainerScalingOption
 from .types import SecretHashedValue
 from .types import TriggerMnqNatsClientConfig
@@ -100,6 +103,9 @@
     "TriggerInputType",
     "TriggerStatus",
     "TRIGGER_TRANSIENT_STATUSES",
+    "ContainerHealthCheckSpecHTTPProbe",
+    "ContainerHealthCheckSpecTCPProbe",
+    "ContainerHealthCheckSpec",
     "ContainerScalingOption",
     "SecretHashedValue",
     "TriggerMnqNatsClientConfig",

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

@@ -29,6 +29,7 @@
     ListTokensRequestOrderBy,
     ListTriggersRequestOrderBy,
     Container,
+    ContainerHealthCheckSpec,
     ContainerScalingOption,
     CreateContainerRequest,
     CreateCronRequest,
@@ -603,6 +604,7 @@ async def create_container(
         sandbox: Optional[ContainerSandbox] = None,
         local_storage_limit: Optional[int] = None,
         scaling_option: Optional[ContainerScalingOption] = None,
+        health_check: Optional[ContainerHealthCheckSpec] = None,
     ) -> Container:
         """
         Create a new container.
@@ -630,6 +632,8 @@ 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.
+        :param health_check: Health check configuration of the container.
         :return: :class:`Container <Container>`
 
         Usage:
@@ -670,6 +674,7 @@ async def create_container(
                     sandbox=sandbox,
                     local_storage_limit=local_storage_limit,
                     scaling_option=scaling_option,
+                    health_check=health_check,
                 ),
                 self.client,
             ),
@@ -701,6 +706,7 @@ async def update_container(
         sandbox: Optional[ContainerSandbox] = None,
         local_storage_limit: Optional[int] = None,
         scaling_option: Optional[ContainerScalingOption] = None,
+        health_check: Optional[ContainerHealthCheckSpec] = None,
     ) -> Container:
         """
         Update an existing container.
@@ -728,6 +734,9 @@ 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.
+        :param health_check: Health check configuration of the container.
+
         :return: :class:`Container <Container>`
 
         Usage:
@@ -768,6 +777,7 @@ async def update_container(
                     sandbox=sandbox,
                     local_storage_limit=local_storage_limit,
                     scaling_option=scaling_option,
+                    health_check=health_check,
                 ),
                 self.client,
             ),