diff --git a/scaleway-async/scaleway_async/webhosting/v1/__init__.py b/scaleway-async/scaleway_async/webhosting/v1/__init__.py index 467720f2b..8c351383b 100644 --- a/scaleway-async/scaleway_async/webhosting/v1/__init__.py +++ b/scaleway-async/scaleway_async/webhosting/v1/__init__.py @@ -13,8 +13,6 @@ from .types import DomainZoneOwner from .types import HostingStatus from .content import HOSTING_TRANSIENT_STATUSES -from .types import HostingSummaryStatus -from .content import HOSTING_SUMMARY_TRANSIENT_STATUSES from .types import ListDatabaseUsersRequestOrderBy from .types import ListDatabasesRequestOrderBy from .types import ListFtpAccountsRequestOrderBy @@ -120,8 +118,6 @@ "DomainZoneOwner", "HostingStatus", "HOSTING_TRANSIENT_STATUSES", - "HostingSummaryStatus", - "HOSTING_SUMMARY_TRANSIENT_STATUSES", "ListDatabaseUsersRequestOrderBy", "ListDatabasesRequestOrderBy", "ListFtpAccountsRequestOrderBy", diff --git a/scaleway-async/scaleway_async/webhosting/v1/content.py b/scaleway-async/scaleway_async/webhosting/v1/content.py index 7c429cec5..9c1b79cff 100644 --- a/scaleway-async/scaleway_async/webhosting/v1/content.py +++ b/scaleway-async/scaleway_async/webhosting/v1/content.py @@ -6,7 +6,6 @@ DomainAvailabilityStatus, DomainStatus, HostingStatus, - HostingSummaryStatus, ) DOMAIN_AVAILABILITY_TRANSIENT_STATUSES: List[DomainAvailabilityStatus] = [ @@ -29,11 +28,3 @@ """ Lists transient statutes of the enum :class:`HostingStatus `. """ -HOSTING_SUMMARY_TRANSIENT_STATUSES: List[HostingSummaryStatus] = [ - HostingSummaryStatus.DELIVERING, - HostingSummaryStatus.DELETING, - HostingSummaryStatus.MIGRATING, -] -""" -Lists transient statutes of the enum :class:`HostingSummaryStatus `. -""" diff --git a/scaleway-async/scaleway_async/webhosting/v1/marshalling.py b/scaleway-async/scaleway_async/webhosting/v1/marshalling.py index 1b9f53550..f5882871e 100644 --- a/scaleway-async/scaleway_async/webhosting/v1/marshalling.py +++ b/scaleway-async/scaleway_async/webhosting/v1/marshalling.py @@ -705,6 +705,10 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: if field is not None: args["project_id"] = field + field = data.get("status", None) + if field is not None: + args["status"] = field + field = data.get("domain", None) if field is not None: args["domain"] = field @@ -717,10 +721,6 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: if field is not None: args["offer_name"] = field - field = data.get("hosting_status", None) - if field is not None: - args["hosting_status"] = field - field = data.get("domain_status", None) if field is not None: args["domain_status"] = field @@ -741,12 +741,6 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: else: args["updated_at"] = None - field = data.get("status", None) - if field is not None: - args["status"] = field - else: - args["status"] = None - field = data.get("dns_status", None) if field is not None: args["dns_status"] = field diff --git a/scaleway-async/scaleway_async/webhosting/v1/types.py b/scaleway-async/scaleway_async/webhosting/v1/types.py index 2bf188a66..cf37b2064 100644 --- a/scaleway-async/scaleway_async/webhosting/v1/types.py +++ b/scaleway-async/scaleway_async/webhosting/v1/types.py @@ -89,6 +89,7 @@ class DomainDnsAction(str, Enum, metaclass=StrEnumMeta): AUTO_CONFIG_WEB_RECORDS = "auto_config_web_records" AUTO_CONFIG_MAIL_RECORDS = "auto_config_mail_records" AUTO_CONFIG_NAMESERVERS = "auto_config_nameservers" + AUTO_CONFIG_NONE = "auto_config_none" def __str__(self) -> str: return str(self.value) @@ -129,19 +130,6 @@ def __str__(self) -> str: return str(self.value) -class HostingSummaryStatus(str, Enum, metaclass=StrEnumMeta): - UNKNOWN_STATUS = "unknown_status" - DELIVERING = "delivering" - READY = "ready" - DELETING = "deleting" - ERROR = "error" - LOCKED = "locked" - MIGRATING = "migrating" - - def __str__(self) -> str: - return str(self.value) - - class ListDatabaseUsersRequestOrderBy(str, Enum, metaclass=StrEnumMeta): USERNAME_ASC = "username_asc" USERNAME_DESC = "username_desc" @@ -579,6 +567,11 @@ class HostingSummary: ID of the Scaleway Project the Web Hosting plan belongs to. """ + status: HostingStatus + """ + Status of the Web Hosting plan. + """ + domain: str """ Main domain associated with the Web Hosting plan. @@ -594,11 +587,6 @@ class HostingSummary: Name of the active offer for the Web Hosting plan. """ - hosting_status: HostingStatus - """ - Status of the Web Hosting plan. - """ - domain_status: DomainStatus """ Main domain status of the Web Hosting plan. @@ -619,11 +607,6 @@ class HostingSummary: Date on which the Web Hosting plan was last updated. """ - status: Optional[HostingSummaryStatus] - """ - Status of the Web Hosting plan. - """ - dns_status: Optional[DnsRecordsStatus] """ DNS status of the Web Hosting plan. diff --git a/scaleway/scaleway/webhosting/v1/__init__.py b/scaleway/scaleway/webhosting/v1/__init__.py index 467720f2b..8c351383b 100644 --- a/scaleway/scaleway/webhosting/v1/__init__.py +++ b/scaleway/scaleway/webhosting/v1/__init__.py @@ -13,8 +13,6 @@ from .types import DomainZoneOwner from .types import HostingStatus from .content import HOSTING_TRANSIENT_STATUSES -from .types import HostingSummaryStatus -from .content import HOSTING_SUMMARY_TRANSIENT_STATUSES from .types import ListDatabaseUsersRequestOrderBy from .types import ListDatabasesRequestOrderBy from .types import ListFtpAccountsRequestOrderBy @@ -120,8 +118,6 @@ "DomainZoneOwner", "HostingStatus", "HOSTING_TRANSIENT_STATUSES", - "HostingSummaryStatus", - "HOSTING_SUMMARY_TRANSIENT_STATUSES", "ListDatabaseUsersRequestOrderBy", "ListDatabasesRequestOrderBy", "ListFtpAccountsRequestOrderBy", diff --git a/scaleway/scaleway/webhosting/v1/content.py b/scaleway/scaleway/webhosting/v1/content.py index 7c429cec5..9c1b79cff 100644 --- a/scaleway/scaleway/webhosting/v1/content.py +++ b/scaleway/scaleway/webhosting/v1/content.py @@ -6,7 +6,6 @@ DomainAvailabilityStatus, DomainStatus, HostingStatus, - HostingSummaryStatus, ) DOMAIN_AVAILABILITY_TRANSIENT_STATUSES: List[DomainAvailabilityStatus] = [ @@ -29,11 +28,3 @@ """ Lists transient statutes of the enum :class:`HostingStatus `. """ -HOSTING_SUMMARY_TRANSIENT_STATUSES: List[HostingSummaryStatus] = [ - HostingSummaryStatus.DELIVERING, - HostingSummaryStatus.DELETING, - HostingSummaryStatus.MIGRATING, -] -""" -Lists transient statutes of the enum :class:`HostingSummaryStatus `. -""" diff --git a/scaleway/scaleway/webhosting/v1/marshalling.py b/scaleway/scaleway/webhosting/v1/marshalling.py index 1b9f53550..f5882871e 100644 --- a/scaleway/scaleway/webhosting/v1/marshalling.py +++ b/scaleway/scaleway/webhosting/v1/marshalling.py @@ -705,6 +705,10 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: if field is not None: args["project_id"] = field + field = data.get("status", None) + if field is not None: + args["status"] = field + field = data.get("domain", None) if field is not None: args["domain"] = field @@ -717,10 +721,6 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: if field is not None: args["offer_name"] = field - field = data.get("hosting_status", None) - if field is not None: - args["hosting_status"] = field - field = data.get("domain_status", None) if field is not None: args["domain_status"] = field @@ -741,12 +741,6 @@ def unmarshal_HostingSummary(data: Any) -> HostingSummary: else: args["updated_at"] = None - field = data.get("status", None) - if field is not None: - args["status"] = field - else: - args["status"] = None - field = data.get("dns_status", None) if field is not None: args["dns_status"] = field diff --git a/scaleway/scaleway/webhosting/v1/types.py b/scaleway/scaleway/webhosting/v1/types.py index 2bf188a66..cf37b2064 100644 --- a/scaleway/scaleway/webhosting/v1/types.py +++ b/scaleway/scaleway/webhosting/v1/types.py @@ -89,6 +89,7 @@ class DomainDnsAction(str, Enum, metaclass=StrEnumMeta): AUTO_CONFIG_WEB_RECORDS = "auto_config_web_records" AUTO_CONFIG_MAIL_RECORDS = "auto_config_mail_records" AUTO_CONFIG_NAMESERVERS = "auto_config_nameservers" + AUTO_CONFIG_NONE = "auto_config_none" def __str__(self) -> str: return str(self.value) @@ -129,19 +130,6 @@ def __str__(self) -> str: return str(self.value) -class HostingSummaryStatus(str, Enum, metaclass=StrEnumMeta): - UNKNOWN_STATUS = "unknown_status" - DELIVERING = "delivering" - READY = "ready" - DELETING = "deleting" - ERROR = "error" - LOCKED = "locked" - MIGRATING = "migrating" - - def __str__(self) -> str: - return str(self.value) - - class ListDatabaseUsersRequestOrderBy(str, Enum, metaclass=StrEnumMeta): USERNAME_ASC = "username_asc" USERNAME_DESC = "username_desc" @@ -579,6 +567,11 @@ class HostingSummary: ID of the Scaleway Project the Web Hosting plan belongs to. """ + status: HostingStatus + """ + Status of the Web Hosting plan. + """ + domain: str """ Main domain associated with the Web Hosting plan. @@ -594,11 +587,6 @@ class HostingSummary: Name of the active offer for the Web Hosting plan. """ - hosting_status: HostingStatus - """ - Status of the Web Hosting plan. - """ - domain_status: DomainStatus """ Main domain status of the Web Hosting plan. @@ -619,11 +607,6 @@ class HostingSummary: Date on which the Web Hosting plan was last updated. """ - status: Optional[HostingSummaryStatus] - """ - Status of the Web Hosting plan. - """ - dns_status: Optional[DnsRecordsStatus] """ DNS status of the Web Hosting plan.