Merge branch 'main' into v1.6965.0

Author: Laure-di

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

@@ -529,13 +529,15 @@ async def reboot_server(
         server_id: str,
         zone: Optional[ScwZone] = None,
         boot_type: Optional[ServerBootType] = None,
+        ssh_key_ids: Optional[List[str]] = None,
     ) -> Server:
         """
         Reboot an Elastic Metal server.
         Reboot the Elastic Metal server associated with the ID, use the `boot_type` `rescue` to reboot the server in rescue mode.
         :param server_id: ID of the server to reboot.
         :param zone: Zone to target. If none is passed will use default zone from the config.
         :param boot_type: The type of boot.
+        :param ssh_key_ids: Additional SSH public key IDs to configure on rescue image.
         :return: :class:`Server <Server>`
 
         Usage:
@@ -557,6 +559,7 @@ async def reboot_server(
                     server_id=server_id,
                     zone=zone,
                     boot_type=boot_type,
+                    ssh_key_ids=ssh_key_ids,
                 ),
                 self.client,
             ),
@@ -571,13 +574,15 @@ async def start_server(
         server_id: str,
         zone: Optional[ScwZone] = None,
         boot_type: Optional[ServerBootType] = None,
+        ssh_key_ids: Optional[List[str]] = None,
     ) -> Server:
         """
         Start an Elastic Metal server.
         Start the server associated with the ID.
         :param server_id: ID of the server to start.
         :param zone: Zone to target. If none is passed will use default zone from the config.
         :param boot_type: The type of boot.
+        :param ssh_key_ids: Additional SSH public key IDs to configure on rescue image.
         :return: :class:`Server <Server>`
 
         Usage:
@@ -599,6 +604,7 @@ async def start_server(
                     server_id=server_id,
                     zone=zone,
                     boot_type=boot_type,
+                    ssh_key_ids=ssh_key_ids,
                 ),
                 self.client,
             ),

scaleway-async/scaleway_async/baremetal/v1/marshalling.py

@@ -2001,6 +2001,9 @@ def marshal_RebootServerRequest(
     if request.boot_type is not None:
         output["boot_type"] = request.boot_type
 
+    if request.ssh_key_ids is not None:
+        output["ssh_key_ids"] = request.ssh_key_ids
+
     return output
 
 
@@ -2025,6 +2028,9 @@ def marshal_StartServerRequest(
     if request.boot_type is not None:
         output["boot_type"] = request.boot_type
 
+    if request.ssh_key_ids is not None:
+        output["ssh_key_ids"] = request.ssh_key_ids
+
     return output
 
 

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

@@ -1725,6 +1725,11 @@ class RebootServerRequest:
     The type of boot.
     """
 
+    ssh_key_ids: Optional[List[str]] = field(default_factory=list)
+    """
+    Additional SSH public key IDs to configure on rescue image.
+    """
+
 
 @dataclass
 class SetServerPrivateNetworksResponse:
@@ -1766,6 +1771,11 @@ class StartServerRequest:
     The type of boot.
     """
 
+    ssh_key_ids: Optional[List[str]] = field(default_factory=list)
+    """
+    Additional SSH public key IDs to configure on rescue image.
+    """
+
 
 @dataclass
 class StopBMCAccessRequest:

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

@@ -746,7 +746,18 @@ async def update_container(
         :param max_concurrency: Number of maximum concurrent executions of the container.
         :param protocol: Protocol the container uses.
         :param port: Port the container listens on.
-        :param secret_environment_variables: Secret environment variables of the container.
+        :param secret_environment_variables: During an update, secret environment variables that are not specified in this field will be kept unchanged.
+
+        In order to delete a specific secret environment variable, you must reference its key, but not provide any value for it.
+        For example, the following payload will delete the `TO_DELETE` secret environment variable:
+
+        ```json
+        {
+          "secret_environment_variables":[
+            {"key":"TO_DELETE"}
+          ]
+        }
+        ```.
         :param http_option: Possible values:
          - redirected: Responds to HTTP request with a 301 redirect to ask the clients to use HTTPS.
          - enabled: Serve both HTTP and HTTPS traffic.

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

@@ -1556,7 +1556,18 @@ class UpdateContainerRequest:
 
     secret_environment_variables: Optional[List[Secret]] = field(default_factory=list)
     """
-    Secret environment variables of the container.
+    During an update, secret environment variables that are not specified in this field will be kept unchanged.
+
+In order to delete a specific secret environment variable, you must reference its key, but not provide any value for it.
+For example, the following payload will delete the `TO_DELETE` secret environment variable:
+
+```json
+{
+  "secret_environment_variables":[
+    {"key":"TO_DELETE"}
+  ]
+}
+```.
     """
 
     http_option: Optional[ContainerHttpOption] = ContainerHttpOption.UNKNOWN_HTTP_OPTION

scaleway-async/scaleway_async/domain/v2beta1/__init__.py

@@ -17,6 +17,7 @@
 from .content import DOMAIN_TRANSIENT_STATUSES
 from .types import HostStatus
 from .content import HOST_TRANSIENT_STATUSES
+from .types import InboundTransferStatus
 from .types import LinkedProduct
 from .types import ListContactsRequestRole
 from .types import ListDNSZoneRecordsRequestOrderBy
@@ -79,6 +80,7 @@
 from .types import DNSZoneVersion
 from .types import Host
 from .types import DomainSummary
+from .types import InboundTransfer
 from .types import RenewableDomain
 from .types import SSLCertificate
 from .types import Task
@@ -122,6 +124,7 @@
 from .types import ListDNSZonesResponse
 from .types import ListDomainHostsResponse
 from .types import ListDomainsResponse
+from .types import ListInboundTransfersResponse
 from .types import ListRenewableDomainsResponse
 from .types import ListSSLCertificatesRequest
 from .types import ListSSLCertificatesResponse
@@ -146,6 +149,7 @@
 from .types import RegistrarApiListContactsRequest
 from .types import RegistrarApiListDomainHostsRequest
 from .types import RegistrarApiListDomainsRequest
+from .types import RegistrarApiListInboundTransfersRequest
 from .types import RegistrarApiListRenewableDomainsRequest
 from .types import RegistrarApiListTasksRequest
 from .types import RegistrarApiListTldsRequest
@@ -188,6 +192,7 @@
     "DOMAIN_TRANSIENT_STATUSES",
     "HostStatus",
     "HOST_TRANSIENT_STATUSES",
+    "InboundTransferStatus",
     "LinkedProduct",
     "ListContactsRequestRole",
     "ListDNSZoneRecordsRequestOrderBy",
@@ -250,6 +255,7 @@
     "DNSZoneVersion",
     "Host",
     "DomainSummary",
+    "InboundTransfer",
     "RenewableDomain",
     "SSLCertificate",
     "Task",
@@ -293,6 +299,7 @@
     "ListDNSZonesResponse",
     "ListDomainHostsResponse",
     "ListDomainsResponse",
+    "ListInboundTransfersResponse",
     "ListRenewableDomainsResponse",
     "ListSSLCertificatesRequest",
     "ListSSLCertificatesResponse",
@@ -317,6 +324,7 @@
     "RegistrarApiListContactsRequest",
     "RegistrarApiListDomainHostsRequest",
     "RegistrarApiListDomainsRequest",
+    "RegistrarApiListInboundTransfersRequest",
     "RegistrarApiListRenewableDomainsRequest",
     "RegistrarApiListTasksRequest",
     "RegistrarApiListTldsRequest",

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

@@ -58,6 +58,7 @@
     ImportRawDNSZoneRequestAXFRSource,
     ImportRawDNSZoneRequestBindSource,
     ImportRawDNSZoneResponse,
+    InboundTransfer,
     ListContactsResponse,
     ListDNSZoneNameserversResponse,
     ListDNSZoneRecordsResponse,
@@ -66,6 +67,7 @@
     ListDNSZonesResponse,
     ListDomainHostsResponse,
     ListDomainsResponse,
+    ListInboundTransfersResponse,
     ListRenewableDomainsResponse,
     ListSSLCertificatesResponse,
     ListTasksResponse,
@@ -131,6 +133,7 @@
     unmarshal_ListDNSZonesResponse,
     unmarshal_ListDomainHostsResponse,
     unmarshal_ListDomainsResponse,
+    unmarshal_ListInboundTransfersResponse,
     unmarshal_ListRenewableDomainsResponse,
     unmarshal_ListSSLCertificatesResponse,
     unmarshal_ListTasksResponse,
@@ -1471,6 +1474,87 @@ async def list_tasks_all(
             },
         )
 
+    async def list_inbound_transfers(
+        self,
+        *,
+        page: int,
+        domain: str,
+        page_size: Optional[int] = None,
+        project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
+    ) -> ListInboundTransfersResponse:
+        """
+        :param page:
+        :param domain:
+        :param page_size:
+        :param project_id:
+        :param organization_id:
+        :return: :class:`ListInboundTransfersResponse <ListInboundTransfersResponse>`
+
+        Usage:
+        ::
+
+            result = await api.list_inbound_transfers(
+                page=1,
+                domain="example",
+            )
+        """
+
+        res = self._request(
+            "GET",
+            "/domain/v2beta1/inbound-transfers",
+            params={
+                "domain": domain,
+                "organization_id": organization_id
+                or self.client.default_organization_id,
+                "page": page,
+                "page_size": page_size or self.client.default_page_size,
+                "project_id": project_id or self.client.default_project_id,
+            },
+        )
+
+        self._throw_on_error(res)
+        return unmarshal_ListInboundTransfersResponse(res.json())
+
+    async def list_inbound_transfers_all(
+        self,
+        *,
+        page: int,
+        domain: str,
+        page_size: Optional[int] = None,
+        project_id: Optional[str] = None,
+        organization_id: Optional[str] = None,
+    ) -> List[InboundTransfer]:
+        """
+        :param page:
+        :param domain:
+        :param page_size:
+        :param project_id:
+        :param organization_id:
+        :return: :class:`List[InboundTransfer] <List[InboundTransfer]>`
+
+        Usage:
+        ::
+
+            result = await api.list_inbound_transfers_all(
+                page=1,
+                domain="example",
+            )
+        """
+
+        return await fetch_all_pages_async(
+            type=ListInboundTransfersResponse,
+            key="inbound_transfers",
+            fetcher=self.list_inbound_transfers,
+            args={
+                "page": page,
+                "domain": domain,
+                "page_size": page_size,
+                "project_id": project_id,
+                "organization_id": organization_id,
+            },
+        )
+
     async def buy_domains(
         self,
         *,