Merge branch 'main' into v1.6511.0

Author: Laure-di

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

@@ -127,14 +127,13 @@ async def list_file_systems(
     ) -> ListFileSystemsResponse:
         """
         List all filesystems.
-        Retrieve all filesystems in the specified region. Results are ordered by creation date in ascending order by default.
-        Use the order_by parameter to modify the sorting behavior.
+        Retrieve all filesystems in the specified region. By default, the filesystems listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param order_by: Criteria to use when ordering the list.
         :param project_id: Filter by project ID.
         :param page: Page number (starting at 1).
         :param page_size: Number of entries per page (default: 20, max: 100).
-        :param name: Filter the return filesystems by their names.
+        :param name: Filter the returned filesystems by their names.
         :param tags: Filter by tags. Only filesystems with one or more matching tags will be returned.
         :return: :class:`ListFileSystemsResponse <ListFileSystemsResponse>`
 
@@ -177,14 +176,13 @@ async def list_file_systems_all(
     ) -> List[FileSystem]:
         """
         List all filesystems.
-        Retrieve all filesystems in the specified region. Results are ordered by creation date in ascending order by default.
-        Use the order_by parameter to modify the sorting behavior.
+        Retrieve all filesystems in the specified region. By default, the filesystems listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param order_by: Criteria to use when ordering the list.
         :param project_id: Filter by project ID.
         :param page: Page number (starting at 1).
         :param page_size: Number of entries per page (default: 20, max: 100).
-        :param name: Filter the return filesystems by their names.
+        :param name: Filter the returned filesystems by their names.
         :param tags: Filter by tags. Only filesystems with one or more matching tags will be returned.
         :return: :class:`List[FileSystem] <List[FileSystem]>`
 
@@ -223,8 +221,7 @@ async def list_attachments(
         """
         List filesystems attachments.
         List all existing attachments in a specified region.
-        By default, the attachments listed are ordered by creation date in ascending order.
-        This can be modified using the `order_by` field.
+        By default, the attachments listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param filesystem_id: UUID of the File Storage volume.
         :param resource_id: Filter by resource ID.
@@ -274,8 +271,7 @@ async def list_attachments_all(
         """
         List filesystems attachments.
         List all existing attachments in a specified region.
-        By default, the attachments listed are ordered by creation date in ascending order.
-        This can be modified using the `order_by` field.
+        By default, the attachments listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param filesystem_id: UUID of the File Storage volume.
         :param resource_id: Filter by resource ID.
@@ -317,7 +313,7 @@ async def create_file_system(
     ) -> FileSystem:
         """
         Create a new filesystem.
-        To create a new filesystem, you need to provide a name, a size, and a project ID.
+        To create a new filesystem, you must specify a name, a size, and a project ID.
         :param name: Name of the filesystem.
         :param size: Must be compliant with the minimum (100 GB) and maximum (10 TB) allowed size.
         :param region: Region to target. If none is passed will use default region from the config.

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

@@ -297,7 +297,7 @@ class ListFileSystemsRequest:
 
     name: Optional[str]
     """
-    Filter the return filesystems by their names.
+    Filter the returned filesystems by their names.
     """
 
     tags: Optional[List[str]]

scaleway-async/scaleway_async/key_manager/v1alpha1/__init__.py

@@ -7,6 +7,7 @@
 from .types import KeyOrigin
 from .types import KeyState
 from .types import ListKeysRequestOrderBy
+from .types import ListKeysRequestUsage
 from .types import KeyRotationPolicy
 from .types import KeyUsage
 from .types import Key
@@ -45,6 +46,7 @@
     "KeyOrigin",
     "KeyState",
     "ListKeysRequestOrderBy",
+    "ListKeysRequestUsage",
     "KeyRotationPolicy",
     "KeyUsage",
     "Key",

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

@@ -15,6 +15,7 @@
     DataKeyAlgorithmSymmetricEncryption,
     KeyOrigin,
     ListKeysRequestOrderBy,
+    ListKeysRequestUsage,
     CreateKeyRequest,
     DataKey,
     DecryptRequest,
@@ -459,6 +460,7 @@ async def list_keys(
         page_size: Optional[int] = None,
         tags: Optional[List[str]] = None,
         name: Optional[str] = None,
+        usage: Optional[ListKeysRequestUsage] = None,
     ) -> ListKeysResponse:
         """
         List keys.
@@ -471,6 +473,7 @@ async def list_keys(
         :param page_size:
         :param tags: (Optional) List of tags to filter on.
         :param name: (Optional) Filter by key name.
+        :param usage: Select from symmetric encryption, asymmetric encryption, or asymmetric signing.
         :return: :class:`ListKeysResponse <ListKeysResponse>`
 
         Usage:
@@ -495,6 +498,7 @@ async def list_keys(
                 "page_size": page_size or self.client.default_page_size,
                 "project_id": project_id or self.client.default_project_id,
                 "tags": tags,
+                "usage": usage,
             },
         )
 
@@ -512,6 +516,7 @@ async def list_keys_all(
         page_size: Optional[int] = None,
         tags: Optional[List[str]] = None,
         name: Optional[str] = None,
+        usage: Optional[ListKeysRequestUsage] = None,
     ) -> List[Key]:
         """
         List keys.
@@ -524,6 +529,7 @@ async def list_keys_all(
         :param page_size:
         :param tags: (Optional) List of tags to filter on.
         :param name: (Optional) Filter by key name.
+        :param usage: Select from symmetric encryption, asymmetric encryption, or asymmetric signing.
         :return: :class:`List[Key] <List[Key]>`
 
         Usage:
@@ -545,6 +551,7 @@ async def list_keys_all(
                 "page_size": page_size,
                 "tags": tags,
                 "name": name,
+                "usage": usage,
             },
         )
 

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

@@ -87,6 +87,16 @@ def __str__(self) -> str:
         return str(self.value)
 
 
+class ListKeysRequestUsage(str, Enum, metaclass=StrEnumMeta):
+    UNKNOWN_USAGE = "unknown_usage"
+    SYMMETRIC_ENCRYPTION = "symmetric_encryption"
+    ASYMMETRIC_ENCRYPTION = "asymmetric_encryption"
+    ASYMMETRIC_SIGNING = "asymmetric_signing"
+
+    def __str__(self) -> str:
+        return str(self.value)
+
+
 @dataclass
 class KeyRotationPolicy:
     rotation_period: Optional[str]
@@ -503,6 +513,11 @@ class ListKeysRequest:
     (Optional) Filter by key name.
     """
 
+    usage: Optional[ListKeysRequestUsage]
+    """
+    Select from symmetric encryption, asymmetric encryption, or asymmetric signing.
+    """
+
 
 @dataclass
 class ListKeysResponse:

scaleway-async/scaleway_async/product_catalog/v2alpha1/__init__.py

@@ -1,6 +1,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # If you have any remark or suggestion do not hesitate to open an issue.
 from .types import PublicCatalogProductPropertiesHardwareCPUArch
+from .types import PublicCatalogProductStatus
 from .types import PublicCatalogProductUnitOfMeasureCountableUnit
 from .types import PublicCatalogProductPropertiesHardwareCPUPhysical
 from .types import PublicCatalogProductPropertiesHardwareCPUVirtual
@@ -26,6 +27,7 @@
 
 __all__ = [
     "PublicCatalogProductPropertiesHardwareCPUArch",
+    "PublicCatalogProductStatus",
     "PublicCatalogProductUnitOfMeasureCountableUnit",
     "PublicCatalogProductPropertiesHardwareCPUPhysical",
     "PublicCatalogProductPropertiesHardwareCPUVirtual",

scaleway-async/scaleway_async/product_catalog/v2alpha1/marshalling.py

@@ -2,6 +2,7 @@
 # If you have any remark or suggestion do not hesitate to open an issue.
 
 from typing import Any, Dict
+from dateutil import parser
 
 from scaleway_core.bridge import (
     unmarshal_Money,
@@ -332,6 +333,14 @@ def unmarshal_PublicCatalogProductPropertiesInstance(
     if field is not None:
         args["range"] = field
 
+    field = data.get("offer_id", None)
+    if field is not None:
+        args["offer_id"] = field
+
+    field = data.get("recommended_replacement_offer_ids", None)
+    if field is not None:
+        args["recommended_replacement_offer_ids"] = field
+
     return PublicCatalogProductPropertiesInstance(**args)
 
 
@@ -508,6 +517,10 @@ def unmarshal_PublicCatalogProduct(data: Any) -> PublicCatalogProduct:
     if field is not None:
         args["description"] = field
 
+    field = data.get("status", None)
+    if field is not None:
+        args["status"] = field
+
     field = data.get("locality", None)
     if field is not None:
         args["locality"] = unmarshal_PublicCatalogProductLocality(field)
@@ -540,6 +553,14 @@ def unmarshal_PublicCatalogProduct(data: Any) -> PublicCatalogProduct:
     else:
         args["unit_of_measure"] = None
 
+    field = data.get("end_of_life_at", None)
+    if field is not None:
+        args["end_of_life_at"] = (
+            parser.isoparse(field) if isinstance(field, str) else field
+        )
+    else:
+        args["end_of_life_at"] = None
+
     return PublicCatalogProduct(**args)
 
 

scaleway-async/scaleway_async/product_catalog/v2alpha1/types.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from datetime import datetime
 from enum import Enum
 from typing import List, Optional
 
@@ -27,6 +28,18 @@ def __str__(self) -> str:
         return str(self.value)
 
 
+class PublicCatalogProductStatus(str, Enum, metaclass=StrEnumMeta):
+    UNKNOWN_STATUS = "unknown_status"
+    PUBLIC_BETA = "public_beta"
+    PREVIEW = "preview"
+    GENERAL_AVAILABILITY = "general_availability"
+    END_OF_DEPLOYMENT = "end_of_deployment"
+    END_OF_SUPPORT = "end_of_support"
+
+    def __str__(self) -> str:
+        return str(self.value)
+
+
 class PublicCatalogProductUnitOfMeasureCountableUnit(str, Enum, metaclass=StrEnumMeta):
     UNKNOWN_COUNTABLE_UNIT = "unknown_countable_unit"
     CHUNK = "chunk"
@@ -253,6 +266,16 @@ class PublicCatalogProductPropertiesInstance:
     The range of the Instance server.
     """
 
+    offer_id: str
+    """
+    The offer ID of the Instance server.
+    """
+
+    recommended_replacement_offer_ids: List[str]
+    """
+    The recommended replacement offer IDs of the Instance server.
+    """
+
 
 @dataclass
 class PublicCatalogProductEnvironmentalImpactEstimation:
@@ -330,6 +353,11 @@ class PublicCatalogProduct:
     The product description.
     """
 
+    status: PublicCatalogProductStatus
+    """
+    The status of the product.
+    """
+
     locality: Optional[PublicCatalogProductLocality]
     """
     The locality of the product.
@@ -357,6 +385,11 @@ class PublicCatalogProduct:
     The unit of measure of the product.
     """
 
+    end_of_life_at: Optional[datetime]
+    """
+    The end of life date of the product.
+    """
+
 
 @dataclass
 class ListPublicCatalogProductsResponse:

scaleway/scaleway/file/v1alpha1/api.py

@@ -125,14 +125,13 @@ def list_file_systems(
     ) -> ListFileSystemsResponse:
         """
         List all filesystems.
-        Retrieve all filesystems in the specified region. Results are ordered by creation date in ascending order by default.
-        Use the order_by parameter to modify the sorting behavior.
+        Retrieve all filesystems in the specified region. By default, the filesystems listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param order_by: Criteria to use when ordering the list.
         :param project_id: Filter by project ID.
         :param page: Page number (starting at 1).
         :param page_size: Number of entries per page (default: 20, max: 100).
-        :param name: Filter the return filesystems by their names.
+        :param name: Filter the returned filesystems by their names.
         :param tags: Filter by tags. Only filesystems with one or more matching tags will be returned.
         :return: :class:`ListFileSystemsResponse <ListFileSystemsResponse>`
 
@@ -175,14 +174,13 @@ def list_file_systems_all(
     ) -> List[FileSystem]:
         """
         List all filesystems.
-        Retrieve all filesystems in the specified region. Results are ordered by creation date in ascending order by default.
-        Use the order_by parameter to modify the sorting behavior.
+        Retrieve all filesystems in the specified region. By default, the filesystems listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param order_by: Criteria to use when ordering the list.
         :param project_id: Filter by project ID.
         :param page: Page number (starting at 1).
         :param page_size: Number of entries per page (default: 20, max: 100).
-        :param name: Filter the return filesystems by their names.
+        :param name: Filter the returned filesystems by their names.
         :param tags: Filter by tags. Only filesystems with one or more matching tags will be returned.
         :return: :class:`List[FileSystem] <List[FileSystem]>`
 
@@ -221,8 +219,7 @@ def list_attachments(
         """
         List filesystems attachments.
         List all existing attachments in a specified region.
-        By default, the attachments listed are ordered by creation date in ascending order.
-        This can be modified using the `order_by` field.
+        By default, the attachments listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param filesystem_id: UUID of the File Storage volume.
         :param resource_id: Filter by resource ID.
@@ -272,8 +269,7 @@ def list_attachments_all(
         """
         List filesystems attachments.
         List all existing attachments in a specified region.
-        By default, the attachments listed are ordered by creation date in ascending order.
-        This can be modified using the `order_by` field.
+        By default, the attachments listed are ordered by creation date in ascending order. This can be modified using the `order_by` field.
         :param region: Region to target. If none is passed will use default region from the config.
         :param filesystem_id: UUID of the File Storage volume.
         :param resource_id: Filter by resource ID.
@@ -315,7 +311,7 @@ def create_file_system(
     ) -> FileSystem:
         """
         Create a new filesystem.
-        To create a new filesystem, you need to provide a name, a size, and a project ID.
+        To create a new filesystem, you must specify a name, a size, and a project ID.
         :param name: Name of the filesystem.
         :param size: Must be compliant with the minimum (100 GB) and maximum (10 TB) allowed size.
         :param region: Region to target. If none is passed will use default region from the config.

scaleway/scaleway/file/v1alpha1/types.py

@@ -297,7 +297,7 @@ class ListFileSystemsRequest:
 
     name: Optional[str]
     """
-    Filter the return filesystems by their names.
+    Filter the returned filesystems by their names.
     """
 
     tags: Optional[List[str]]