Merge branch 'main' into v1.6872.0

Author: Laure-di

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

@@ -17,6 +17,7 @@
 from .types import PublicCatalogProductPropertiesElasticMetal
 from .types import PublicCatalogProductPropertiesHardware
 from .types import PublicCatalogProductPropertiesInstance
+from .types import PublicCatalogProductPropertiesObjectStorage
 from .types import PublicCatalogProductEnvironmentalImpactEstimation
 from .types import PublicCatalogProductLocality
 from .types import PublicCatalogProductPrice
@@ -45,6 +46,7 @@
     "PublicCatalogProductPropertiesElasticMetal",
     "PublicCatalogProductPropertiesHardware",
     "PublicCatalogProductPropertiesInstance",
+    "PublicCatalogProductPropertiesObjectStorage",
     "PublicCatalogProductEnvironmentalImpactEstimation",
     "PublicCatalogProductLocality",
     "PublicCatalogProductPrice",

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

@@ -21,6 +21,7 @@
     PublicCatalogProductPropertiesElasticMetal,
     PublicCatalogProductPropertiesHardware,
     PublicCatalogProductPropertiesInstance,
+    PublicCatalogProductPropertiesObjectStorage,
     PublicCatalogProductEnvironmentalImpactEstimation,
     PublicCatalogProductLocality,
     PublicCatalogProductPrice,
@@ -256,10 +257,14 @@ def unmarshal_PublicCatalogProductPropertiesBlockStorage(
     field = data.get("min_volume_size", None)
     if field is not None:
         args["min_volume_size"] = field
+    else:
+        args["min_volume_size"] = None
 
     field = data.get("max_volume_size", None)
     if field is not None:
         args["max_volume_size"] = field
+    else:
+        args["max_volume_size"] = None
 
     return PublicCatalogProductPropertiesBlockStorage(**args)
 
@@ -366,6 +371,19 @@ def unmarshal_PublicCatalogProductPropertiesInstance(
     return PublicCatalogProductPropertiesInstance(**args)
 
 
+def unmarshal_PublicCatalogProductPropertiesObjectStorage(
+    data: Any,
+) -> PublicCatalogProductPropertiesObjectStorage:
+    if not isinstance(data, dict):
+        raise TypeError(
+            "Unmarshalling the type 'PublicCatalogProductPropertiesObjectStorage' failed as data isn't a dictionary."
+        )
+
+    args: Dict[str, Any] = {}
+
+    return PublicCatalogProductPropertiesObjectStorage(**args)
+
+
 def unmarshal_PublicCatalogProductEnvironmentalImpactEstimation(
     data: Any,
 ) -> PublicCatalogProductEnvironmentalImpactEstimation:
@@ -495,6 +513,14 @@ def unmarshal_PublicCatalogProductProperties(
     else:
         args["block_storage"] = None
 
+    field = data.get("object_storage", None)
+    if field is not None:
+        args["object_storage"] = unmarshal_PublicCatalogProductPropertiesObjectStorage(
+            field
+        )
+    else:
+        args["object_storage"] = None
+
     return PublicCatalogProductProperties(**args)
 
 

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

@@ -24,6 +24,7 @@ class ListPublicCatalogProductsRequestProductType(str, Enum, metaclass=StrEnumMe
     ELASTIC_METAL = "elastic_metal"
     DEDIBOX = "dedibox"
     BLOCK_STORAGE = "block_storage"
+    OBJECT_STORAGE = "object_storage"
 
     def __str__(self) -> str:
         return str(self.value)
@@ -230,14 +231,14 @@ class PublicCatalogProductPropertiesAppleSilicon:
 
 @dataclass
 class PublicCatalogProductPropertiesBlockStorage:
-    min_volume_size: int
+    min_volume_size: Optional[int]
     """
-    The minimum size of storage volume for this product in bytes.
+    The minimum size of storage volume for this product in bytes. Deprecated.
     """
 
-    max_volume_size: int
+    max_volume_size: Optional[int]
     """
-    The maximum size of storage volume for this product in bytes.
+    The maximum size of storage volume for this product in bytes. Deprecated.
     """
 
 
@@ -303,6 +304,11 @@ class PublicCatalogProductPropertiesInstance:
     """
 
 
+@dataclass
+class PublicCatalogProductPropertiesObjectStorage:
+    pass
+
+
 @dataclass
 class PublicCatalogProductEnvironmentalImpactEstimation:
     kg_co2_equivalent: Optional[float]
@@ -346,6 +352,8 @@ class PublicCatalogProductProperties:
 
     block_storage: Optional[PublicCatalogProductPropertiesBlockStorage]
 
+    object_storage: Optional[PublicCatalogProductPropertiesObjectStorage]
+
 
 @dataclass
 class PublicCatalogProductUnitOfMeasure:

scaleway-async/scaleway_async/webhosting/v1/__init__.py

@@ -1,5 +1,8 @@
 # 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 BackupItemType
+from .types import BackupStatus
+from .content import BACKUP_TRANSIENT_STATUSES
 from .types import DnsRecordStatus
 from .types import DnsRecordType
 from .types import DnsRecordsStatus
@@ -13,6 +16,7 @@
 from .types import DomainZoneOwner
 from .types import HostingStatus
 from .content import HOSTING_TRANSIENT_STATUSES
+from .types import ListBackupsRequestOrderBy
 from .types import ListDatabaseUsersRequestOrderBy
 from .types import ListDatabasesRequestOrderBy
 from .types import ListFtpAccountsRequestOrderBy
@@ -29,6 +33,7 @@
 from .types import HostingDomainCustomDomain
 from .types import OfferOption
 from .types import PlatformControlPanel
+from .types import BackupItem
 from .types import HostingDomain
 from .types import CreateDatabaseRequestUser
 from .types import CreateHostingRequestDomainConfiguration
@@ -39,6 +44,8 @@
 from .types import HostingUser
 from .types import Offer
 from .types import Platform
+from .types import BackupItemGroup
+from .types import Backup
 from .types import ControlPanel
 from .types import DatabaseUser
 from .types import Database
@@ -47,6 +54,11 @@
 from .types import MailAccount
 from .types import Website
 from .types import DomainAvailability
+from .types import BackupApiGetBackupRequest
+from .types import BackupApiListBackupItemsRequest
+from .types import BackupApiListBackupsRequest
+from .types import BackupApiRestoreBackupItemsRequest
+from .types import BackupApiRestoreBackupRequest
 from .types import CheckUserOwnsDomainResponse
 from .types import ControlPanelApiListControlPanelsRequest
 from .types import DatabaseApiAssignDatabaseUserRequest
@@ -72,14 +84,18 @@
 from .types import FtpAccountApiListFtpAccountsRequest
 from .types import FtpAccountApiRemoveFtpAccountRequest
 from .types import Hosting
+from .types import HostingApiAddCustomDomainRequest
 from .types import HostingApiCreateHostingRequest
 from .types import HostingApiCreateSessionRequest
 from .types import HostingApiDeleteHostingRequest
 from .types import HostingApiGetHostingRequest
 from .types import HostingApiGetResourceSummaryRequest
 from .types import HostingApiListHostingsRequest
+from .types import HostingApiRemoveCustomDomainRequest
 from .types import HostingApiResetHostingPasswordRequest
 from .types import HostingApiUpdateHostingRequest
+from .types import ListBackupItemsResponse
+from .types import ListBackupsResponse
 from .types import ListControlPanelsResponse
 from .types import ListDatabaseUsersResponse
 from .types import ListDatabasesResponse
@@ -95,9 +111,12 @@
 from .types import OfferApiListOffersRequest
 from .types import ResetHostingPasswordResponse
 from .types import ResourceSummary
+from .types import RestoreBackupItemsResponse
+from .types import RestoreBackupResponse
 from .types import SearchDomainsResponse
 from .types import Session
 from .types import WebsiteApiListWebsitesRequest
+from .api import WebhostingV1BackupAPI
 from .api import WebhostingV1ControlPanelAPI
 from .api import WebhostingV1DatabaseAPI
 from .api import WebhostingV1DnsAPI
@@ -108,6 +127,9 @@
 from .api import WebhostingV1WebsiteAPI
 
 __all__ = [
+    "BackupItemType",
+    "BackupStatus",
+    "BACKUP_TRANSIENT_STATUSES",
     "DnsRecordStatus",
     "DnsRecordType",
     "DnsRecordsStatus",
@@ -121,6 +143,7 @@
     "DomainZoneOwner",
     "HostingStatus",
     "HOSTING_TRANSIENT_STATUSES",
+    "ListBackupsRequestOrderBy",
     "ListDatabaseUsersRequestOrderBy",
     "ListDatabasesRequestOrderBy",
     "ListFtpAccountsRequestOrderBy",
@@ -137,6 +160,7 @@
     "HostingDomainCustomDomain",
     "OfferOption",
     "PlatformControlPanel",
+    "BackupItem",
     "HostingDomain",
     "CreateDatabaseRequestUser",
     "CreateHostingRequestDomainConfiguration",
@@ -147,6 +171,8 @@
     "HostingUser",
     "Offer",
     "Platform",
+    "BackupItemGroup",
+    "Backup",
     "ControlPanel",
     "DatabaseUser",
     "Database",
@@ -155,6 +181,11 @@
     "MailAccount",
     "Website",
     "DomainAvailability",
+    "BackupApiGetBackupRequest",
+    "BackupApiListBackupItemsRequest",
+    "BackupApiListBackupsRequest",
+    "BackupApiRestoreBackupItemsRequest",
+    "BackupApiRestoreBackupRequest",
     "CheckUserOwnsDomainResponse",
     "ControlPanelApiListControlPanelsRequest",
     "DatabaseApiAssignDatabaseUserRequest",
@@ -180,14 +211,18 @@
     "FtpAccountApiListFtpAccountsRequest",
     "FtpAccountApiRemoveFtpAccountRequest",
     "Hosting",
+    "HostingApiAddCustomDomainRequest",
     "HostingApiCreateHostingRequest",
     "HostingApiCreateSessionRequest",
     "HostingApiDeleteHostingRequest",
     "HostingApiGetHostingRequest",
     "HostingApiGetResourceSummaryRequest",
     "HostingApiListHostingsRequest",
+    "HostingApiRemoveCustomDomainRequest",
     "HostingApiResetHostingPasswordRequest",
     "HostingApiUpdateHostingRequest",
+    "ListBackupItemsResponse",
+    "ListBackupsResponse",
     "ListControlPanelsResponse",
     "ListDatabaseUsersResponse",
     "ListDatabasesResponse",
@@ -203,9 +238,12 @@
     "OfferApiListOffersRequest",
     "ResetHostingPasswordResponse",
     "ResourceSummary",
+    "RestoreBackupItemsResponse",
+    "RestoreBackupResponse",
     "SearchDomainsResponse",
     "Session",
     "WebsiteApiListWebsitesRequest",
+    "WebhostingV1BackupAPI",
     "WebhostingV1ControlPanelAPI",
     "WebhostingV1DatabaseAPI",
     "WebhostingV1DnsAPI",