Skip to content

fix(webhosting): add hosting status naming #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2025
Merged

fix(webhosting): add hosting status naming #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada44dc
feat: update generated APIs
scaleway-bot Feb 27, 2025
819060d
Merge branch 'main' into v1.6169.0
remyleone Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions scaleway-async/scaleway_async/webhosting/v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -120,8 +118,6 @@
"DomainZoneOwner",
"HostingStatus",
"HOSTING_TRANSIENT_STATUSES",
"HostingSummaryStatus",
"HOSTING_SUMMARY_TRANSIENT_STATUSES",
"ListDatabaseUsersRequestOrderBy",
"ListDatabasesRequestOrderBy",
"ListFtpAccountsRequestOrderBy",
Expand Down
9 changes: 0 additions & 9 deletions scaleway-async/scaleway_async/webhosting/v1/content.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
DomainAvailabilityStatus,
DomainStatus,
HostingStatus,
HostingSummaryStatus,
)

DOMAIN_AVAILABILITY_TRANSIENT_STATUSES: List[DomainAvailabilityStatus] = [
Expand All @@ -29,11 +28,3 @@
"""
Lists transient statutes of the enum :class:`HostingStatus <HostingStatus>`.
"""
HOSTING_SUMMARY_TRANSIENT_STATUSES: List[HostingSummaryStatus] = [
HostingSummaryStatus.DELIVERING,
HostingSummaryStatus.DELETING,
HostingSummaryStatus.MIGRATING,
]
"""
Lists transient statutes of the enum :class:`HostingSummaryStatus <HostingSummaryStatus>`.
"""
14 changes: 4 additions & 10 deletions scaleway-async/scaleway_async/webhosting/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
29 changes: 6 additions & 23 deletions scaleway-async/scaleway_async/webhosting/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions scaleway/scaleway/webhosting/v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -120,8 +118,6 @@
"DomainZoneOwner",
"HostingStatus",
"HOSTING_TRANSIENT_STATUSES",
"HostingSummaryStatus",
"HOSTING_SUMMARY_TRANSIENT_STATUSES",
"ListDatabaseUsersRequestOrderBy",
"ListDatabasesRequestOrderBy",
"ListFtpAccountsRequestOrderBy",
Expand Down
9 changes: 0 additions & 9 deletions scaleway/scaleway/webhosting/v1/content.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
DomainAvailabilityStatus,
DomainStatus,
HostingStatus,
HostingSummaryStatus,
)

DOMAIN_AVAILABILITY_TRANSIENT_STATUSES: List[DomainAvailabilityStatus] = [
Expand All @@ -29,11 +28,3 @@
"""
Lists transient statutes of the enum :class:`HostingStatus <HostingStatus>`.
"""
HOSTING_SUMMARY_TRANSIENT_STATUSES: List[HostingSummaryStatus] = [
HostingSummaryStatus.DELIVERING,
HostingSummaryStatus.DELETING,
HostingSummaryStatus.MIGRATING,
]
"""
Lists transient statutes of the enum :class:`HostingSummaryStatus <HostingSummaryStatus>`.
"""
14 changes: 4 additions & 10 deletions scaleway/scaleway/webhosting/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
29 changes: 6 additions & 23 deletions scaleway/scaleway/webhosting/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down