Merge branch 'main' into v1.6201.0

Author: remyleone

scaleway-async/scaleway_async/billing/v2beta1/api.py

@@ -438,7 +438,10 @@ async def list_discounts(
     ) -> ListDiscountsResponse:
         """
         List discounts.
-        List all discounts for your organization and usable categories, products, offers, references, regions and zones where the discount can be applied.
+        List all discounts for your Organization and usable categories, products, offers, references, regions and zones where the discount can be applied. As a reseller:
+        - If you do not specify an `organization_id` you will list the discounts applied to your own Organization and your customers
+        - If you indicate your `organization_id` you will list only the discounts applied to your Organization
+        - If you indicate `the organization_id` of one of your customers, you will list the discounts applied to their Organization.
         :param order_by: Order discounts in the response by their description.
         :param page: Positive integer to choose the page to return.
         :param page_size: Positive integer lower or equal to 100 to select the number of items to return.
@@ -476,7 +479,10 @@ async def list_discounts_all(
     ) -> List[Discount]:
         """
         List discounts.
-        List all discounts for your organization and usable categories, products, offers, references, regions and zones where the discount can be applied.
+        List all discounts for your Organization and usable categories, products, offers, references, regions and zones where the discount can be applied. As a reseller:
+        - If you do not specify an `organization_id` you will list the discounts applied to your own Organization and your customers
+        - If you indicate your `organization_id` you will list only the discounts applied to your Organization
+        - If you indicate `the organization_id` of one of your customers, you will list the discounts applied to their Organization.
         :param order_by: Order discounts in the response by their description.
         :param page: Positive integer to choose the page to return.
         :param page_size: Positive integer lower or equal to 100 to select the number of items to return.

scaleway-async/scaleway_async/billing/v2beta1/types.py

@@ -211,7 +211,7 @@ class Discount:
 
     organization_id: str
     """
-    The organization ID of the discount.
+    The Organization ID of the discount.
     """
 
     description: str

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

@@ -100,6 +100,7 @@ class UserRoleRole(str, Enum, metaclass=StrEnumMeta):
     READ = "read"
     READ_WRITE = "read_write"
     DB_ADMIN = "db_admin"
+    SYNC = "sync"
 
     def __str__(self) -> str:
         return str(self.value)

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

@@ -39,8 +39,6 @@
 from .types import ListTagsRequest
 from .types import ListTagsResponse
 from .types import ProtectSecretRequest
-from .types import RestoreSecretRequest
-from .types import RestoreSecretVersionRequest
 from .types import SSHKey
 from .types import UnprotectSecretRequest
 from .types import UpdateSecretRequest
@@ -87,8 +85,6 @@
     "ListTagsRequest",
     "ListTagsResponse",
     "ProtectSecretRequest",
-    "RestoreSecretRequest",
-    "RestoreSecretVersionRequest",
     "SSHKey",
     "UnprotectSecretRequest",
     "UpdateSecretRequest",

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

@@ -1130,77 +1130,3 @@ async def list_secret_types_all(
                 "page_size": page_size,
             },
         )
-
-    async def restore_secret_version(
-        self,
-        *,
-        secret_id: str,
-        revision: str,
-        region: Optional[ScwRegion] = None,
-    ) -> SecretVersion:
-        """
-        Restore a version.
-        Restore a secret's version specified by the `region`, `secret_id` and `revision` parameters.
-        :param secret_id:
-        :param revision:
-        :param region: Region to target. If none is passed will use default region from the config.
-        :return: :class:`SecretVersion <SecretVersion>`
-
-        Usage:
-        ::
-
-            result = await api.restore_secret_version(
-                secret_id="example",
-                revision="example",
-            )
-        """
-
-        param_region = validate_path_param(
-            "region", region or self.client.default_region
-        )
-        param_secret_id = validate_path_param("secret_id", secret_id)
-        param_revision = validate_path_param("revision", revision)
-
-        res = self._request(
-            "POST",
-            f"/secret-manager/v1beta1/regions/{param_region}/secrets/{param_secret_id}/versions/{param_revision}/restore",
-            body={},
-        )
-
-        self._throw_on_error(res)
-        return unmarshal_SecretVersion(res.json())
-
-    async def restore_secret(
-        self,
-        *,
-        secret_id: str,
-        region: Optional[ScwRegion] = None,
-    ) -> Secret:
-        """
-        Restore a secret.
-        Restore a secret and all its versions scheduled for deletion specified by the `region` and `secret_id` parameters.
-        :param secret_id:
-        :param region: Region to target. If none is passed will use default region from the config.
-        :return: :class:`Secret <Secret>`
-
-        Usage:
-        ::
-
-            result = await api.restore_secret(
-                secret_id="example",
-            )
-        """
-
-        param_region = validate_path_param(
-            "region", region or self.client.default_region
-        )
-        param_secret_id = validate_path_param("secret_id", secret_id)
-
-        res = self._request(
-            "POST",
-            f"/secret-manager/v1beta1/regions/{param_region}/secrets/{param_secret_id}/restore",
-            body={},
-        )
-
-        self._throw_on_error(res)
-        return unmarshal_Secret(res.json())

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

@@ -866,28 +866,6 @@ class ProtectSecretRequest:
     """
 
 
-@dataclass
-class RestoreSecretRequest:
-    secret_id: str
-
-    region: Optional[ScwRegion]
-    """
-    Region to target. If none is passed will use default region from the config.
-    """
-
-
-@dataclass
-class RestoreSecretVersionRequest:
-    secret_id: str
-
-    revision: str
-
-    region: Optional[ScwRegion]
-    """
-    Region to target. If none is passed will use default region from the config.
-    """
-
-
 @dataclass
 class SSHKey:
     ssh_private_key: str

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

@@ -2088,7 +2088,9 @@ async def migrate_to_v2(
         zone: Optional[ScwZone] = None,
     ) -> None:
         """
-        :param gateway_id:
+        Put a Public Gateway in IPAM mode.
+        Put a Public Gateway in IPAM mode, so that it can be used with the Public Gateways API v2. This call is idempotent.
+        :param gateway_id: ID of the gateway to put into IPAM mode.
         :param zone: Zone to target. If none is passed will use default zone from the config.
 
         Usage:

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

@@ -1443,6 +1443,9 @@ class ListPATRulesResponse:
 @dataclass
 class MigrateToV2Request:
     gateway_id: str
+    """
+    ID of the gateway to put into IPAM mode.
+    """
 
     zone: Optional[ScwZone]
     """

scaleway/scaleway/billing/v2beta1/api.py

@@ -438,7 +438,10 @@ def list_discounts(
     ) -> ListDiscountsResponse:
         """
         List discounts.
-        List all discounts for your organization and usable categories, products, offers, references, regions and zones where the discount can be applied.
+        List all discounts for your Organization and usable categories, products, offers, references, regions and zones where the discount can be applied. As a reseller:
+        - If you do not specify an `organization_id` you will list the discounts applied to your own Organization and your customers
+        - If you indicate your `organization_id` you will list only the discounts applied to your Organization
+        - If you indicate `the organization_id` of one of your customers, you will list the discounts applied to their Organization.
         :param order_by: Order discounts in the response by their description.
         :param page: Positive integer to choose the page to return.
         :param page_size: Positive integer lower or equal to 100 to select the number of items to return.
@@ -476,7 +479,10 @@ def list_discounts_all(
     ) -> List[Discount]:
         """
         List discounts.
-        List all discounts for your organization and usable categories, products, offers, references, regions and zones where the discount can be applied.
+        List all discounts for your Organization and usable categories, products, offers, references, regions and zones where the discount can be applied. As a reseller:
+        - If you do not specify an `organization_id` you will list the discounts applied to your own Organization and your customers
+        - If you indicate your `organization_id` you will list only the discounts applied to your Organization
+        - If you indicate `the organization_id` of one of your customers, you will list the discounts applied to their Organization.
         :param order_by: Order discounts in the response by their description.
         :param page: Positive integer to choose the page to return.
         :param page_size: Positive integer lower or equal to 100 to select the number of items to return.

scaleway/scaleway/billing/v2beta1/types.py

@@ -211,7 +211,7 @@ class Discount:
 
     organization_id: str
     """
-    The organization ID of the discount.
+    The Organization ID of the discount.
     """
 
     description: str