Merge branch 'main' into v1.5674.0

Author: Laure-di

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

@@ -209,6 +209,30 @@ def unmarshal_Function(data: Any) -> Function:
             else None
         )
 
+    field = data.get("timeout", None)
+    if field is not None:
+        args["timeout"] = field
+    else:
+        args["timeout"] = None
+
+    field = data.get("error_message", None)
+    if field is not None:
+        args["error_message"] = field
+    else:
+        args["error_message"] = None
+
+    field = data.get("build_message", None)
+    if field is not None:
+        args["build_message"] = field
+    else:
+        args["build_message"] = None
+
+    field = data.get("description", None)
+    if field is not None:
+        args["description"] = field
+    else:
+        args["description"] = None
+
     field = data.get("region", None)
     if field is not None:
         args["region"] = field
@@ -225,29 +249,23 @@ def unmarshal_Function(data: Any) -> Function:
     if field is not None:
         args["sandbox"] = field
 
-    field = data.get("timeout", None)
+    field = data.get("created_at", None)
     if field is not None:
-        args["timeout"] = field
+        args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
     else:
-        args["timeout"] = None
+        args["created_at"] = None
 
-    field = data.get("error_message", None)
+    field = data.get("updated_at", None)
     if field is not None:
-        args["error_message"] = field
+        args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
     else:
-        args["error_message"] = None
+        args["updated_at"] = None
 
-    field = data.get("build_message", None)
+    field = data.get("ready_at", None)
     if field is not None:
-        args["build_message"] = field
+        args["ready_at"] = parser.isoparse(field) if isinstance(field, str) else field
     else:
-        args["build_message"] = None
-
-    field = data.get("description", None)
-    if field is not None:
-        args["description"] = field
-    else:
-        args["description"] = None
+        args["ready_at"] = None
 
     return Function(**args)
 

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

@@ -519,6 +519,26 @@ class Function:
     Secret environment variables of the function.
     """
 
+    timeout: Optional[str]
+    """
+    Request processing time limit for the function.
+    """
+
+    error_message: Optional[str]
+    """
+    Error message if the function is in "error" state.
+    """
+
+    build_message: Optional[str]
+    """
+    Description of the current build step.
+    """
+
+    description: Optional[str]
+    """
+    Description of the function.
+    """
+
     region: Region
     """
     Region in which the function is deployed.
@@ -538,24 +558,19 @@ class Function:
     Execution environment of the function.
     """
 
-    timeout: Optional[str]
+    created_at: Optional[datetime]
     """
-    Request processing time limit for the function.
+    Creation date of the function.
     """
 
-    error_message: Optional[str]
+    updated_at: Optional[datetime]
     """
-    Error message if the function is in "error" state.
+    Last update date of the function.
     """
 
-    build_message: Optional[str]
-    """
-    Description of the current build step.
+    ready_at: Optional[datetime]
     """
-
-    description: Optional[str]
-    """
-    Description of the function.
+    Last date when the function was successfully deployed and set to ready.
     """
 
 

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

@@ -281,7 +281,7 @@ class Model:
 
     has_eula: bool
     """
-    Defines whether the model has an end user licence agreement.
+    Defines whether the model has an end user license agreement.
     """
 
     region: Region
@@ -521,7 +521,7 @@ class DeleteEndpointRequest:
 class Eula:
     content: str
     """
-    Content of the end user licence agreement.
+    Content of the end user license agreement.
     """
 
 

scaleway-async/scaleway_async/instance/v1/api.py

@@ -1832,9 +1832,9 @@ async def export_snapshot(
     ) -> ExportSnapshotResponse:
         """
         Export a snapshot.
-        Export a snapshot to a specified S3 bucket in the same region.
-        :param bucket: S3 bucket name.
-        :param key: S3 object key.
+        Export a snapshot to a specified Object Storage bucket in the same region.
+        :param bucket: Object Storage bucket name.
+        :param key: Object key.
         :param snapshot_id: Snapshot ID.
         :param zone: Zone to target. If none is passed will use default zone from the config.
         :return: :class:`ExportSnapshotResponse <ExportSnapshotResponse>`

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

@@ -2093,12 +2093,12 @@ class DetachServerVolumeResponse:
 class ExportSnapshotRequest:
     bucket: str
     """
-    S3 bucket name.
+    Object Storage bucket name.
     """
 
     key: str
     """
-    S3 object key.
+    Object key.
     """
 
     snapshot_id: str

scaleway-async/scaleway_async/iot/v1/api.py

@@ -1222,15 +1222,15 @@ async def create_route(
           <b>You need to manage the database by yourself</b>.
         - REST Route.
           Create a route that will call a REST API on received subscribed MQTT messages.
-        - S3 Routes.
-          Create a route that will put subscribed MQTT messages into an S3 bucket.
+        - Amazon S3 Routes.
+          Create a route that will put subscribed MQTT messages into an Object Storage bucket.
           You need to create the bucket yourself and grant write access.
           Granting can be done with s3cmd (`s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031`).
         :param hub_id: Hub ID of the route.
         :param topic: Topic the route subscribes to. It must be a valid MQTT topic and up to 65535 characters.
         :param region: Region to target. If none is passed will use default region from the config.
         :param name: Route name.
-        :param s3_config: If creating S3 Route, S3-specific configuration fields.
+        :param s3_config: If creating Amazon S3 Routes, Amazon S3-specific configuration fields.
         One-Of ('config'): at most one of 's3_config', 'db_config', 'rest_config' could be set.
         :param db_config: If creating Database Route, DB-specific configuration fields.
         One-Of ('config'): at most one of 's3_config', 'db_config', 'rest_config' could be set.
@@ -1289,7 +1289,7 @@ async def update_route(
         :param region: Region to target. If none is passed will use default region from the config.
         :param name: Route name.
         :param topic: Topic the route subscribes to. It must be a valid MQTT topic and up to 65535 characters.
-        :param s3_config: When updating S3 Route, S3-specific configuration fields.
+        :param s3_config: When updating Amazon S3 Route, Amazon S3-specific configuration fields.
         One-Of ('config'): at most one of 's3_config', 'db_config', 'rest_config' could be set.
         :param db_config: When updating Database Route, DB-specific configuration fields.
         One-Of ('config'): at most one of 's3_config', 'db_config', 'rest_config' could be set.

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

@@ -544,12 +544,12 @@ class RouteRestConfig:
 class RouteS3Config:
     bucket_region: str
     """
-    Region of the S3 route's destination bucket (e.g., 'fr-par').
+    Region of the Amazon S3 route's destination bucket (e.g., 'fr-par').
     """
 
     bucket_name: str
     """
-    Destination bucket name of the S3 route.
+    Destination bucket name of the Amazon S3 route.
     """
 
     object_prefix: str
@@ -559,7 +559,7 @@ class RouteS3Config:
 
     strategy: RouteS3ConfigS3Strategy
     """
-    How the S3 route's objects will be created: one per topic or one per message.
+    How the Amazon S3 route's objects will be created: one per topic or one per message.
     """
 
 

scaleway-async/scaleway_async/lb/v1/api.py

@@ -970,7 +970,7 @@ async def create_backend(
         :param timeout_tunnel: Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout).
         :param on_marked_down_action: Action to take when a backend server is marked as down.
         :param proxy_protocol: Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software.
-        :param failover_host: Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+        :param failover_host: Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
         :param ssl_bridging: Defines whether to enable SSL bridging between the Load Balancer and backend servers.
         :param ignore_ssl_server_verify: Defines whether the server certificate verification should be ignored.
         :param redispatch_attempt_count: Whether to use another backend server on each attempt.
@@ -1107,7 +1107,7 @@ async def update_backend(
         :param timeout_tunnel: Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout).
         :param on_marked_down_action: Action to take when a backend server is marked as down.
         :param proxy_protocol: Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software.
-        :param failover_host: Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+        :param failover_host: Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
         :param ssl_bridging: Defines whether to enable SSL bridging between the Load Balancer and backend servers.
         :param ignore_ssl_server_verify: Defines whether the server certificate verification should be ignored.
         :param redispatch_attempt_count: Whether to use another backend server on each attempt.
@@ -3995,7 +3995,7 @@ async def create_backend(
         :param timeout_tunnel: Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout).
         :param on_marked_down_action: Action to take when a backend server is marked as down.
         :param proxy_protocol: Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software.
-        :param failover_host: Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+        :param failover_host: Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
         :param ssl_bridging: Defines whether to enable SSL bridging between the Load Balancer and backend servers.
         :param ignore_ssl_server_verify: Defines whether the server certificate verification should be ignored.
         :param redispatch_attempt_count: Whether to use another backend server on each attempt.
@@ -4134,7 +4134,7 @@ async def update_backend(
         :param timeout_tunnel: Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout).
         :param on_marked_down_action: Action to take when a backend server is marked as down.
         :param proxy_protocol: Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software.
-        :param failover_host: Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+        :param failover_host: Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
         :param ssl_bridging: Defines whether to enable SSL bridging between the Load Balancer and backend servers.
         :param ignore_ssl_server_verify: Defines whether the server certificate verification should be ignored.
         :param redispatch_attempt_count: Whether to use another backend server on each attempt.

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

@@ -744,7 +744,7 @@ class Backend:
 
     failover_host: Optional[str]
     """
-    Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+    Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
     """
 
     ssl_bridging: Optional[bool]
@@ -1373,7 +1373,7 @@ class CreateBackendRequest:
 
     failover_host: Optional[str]
     """
-    Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+    Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
     """
 
     ssl_bridging: Optional[bool]
@@ -2581,7 +2581,7 @@ class UpdateBackendRequest:
 
     failover_host: Optional[str]
     """
-    Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+    Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
     """
 
     ssl_bridging: Optional[bool]
@@ -3017,7 +3017,7 @@ class ZonedApiCreateBackendRequest:
 
     failover_host: Optional[str]
     """
-    Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+    Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
     """
 
     ssl_bridging: Optional[bool]
@@ -4079,7 +4079,7 @@ class ZonedApiUpdateBackendRequest:
 
     failover_host: Optional[str]
     """
-    Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
+    Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud.
     """
 
     ssl_bridging: Optional[bool]

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

@@ -841,7 +841,7 @@ class InstanceLog:
 
     download_url: Optional[str]
     """
-    Presigned S3 URL to download your log file.
+    Presigned Object Storage URL to download your log file.
     """
 
     expires_at: Optional[datetime]