Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 20 additions & 17 deletions scaleway-async/scaleway_async/domain/v2beta1/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ async def list_dns_zones(
self,
*,
domain: str,
dns_zone: str,
organization_id: Optional[str] = None,
project_id: Optional[str] = None,
order_by: Optional[ListDNSZonesRequestOrderBy] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
dns_zone: Optional[str] = None,
dns_zones: Optional[list[str]] = None,
created_after: Optional[datetime] = None,
created_before: Optional[datetime] = None,
Expand All @@ -205,12 +205,12 @@ async def list_dns_zones(
List DNS zones.
Retrieve the list of DNS zones you can manage and filter DNS zones associated with specific domain names.
:param domain: Domain on which to filter the returned DNS zones.
:param dns_zone: DNS zone on which to filter the returned DNS zones.
:param organization_id: Organization ID on which to filter the returned DNS zones.
:param project_id: Project ID on which to filter the returned DNS zones.
:param order_by: Sort order of the returned DNS zones.
:param page: Page number to return, from the paginated results.
:param page_size: Maximum number of DNS zones to return per page.
:param dns_zone: DNS zone on which to filter the returned DNS zones.
:param dns_zones: DNS zones on which to filter the returned DNS zones.
:param created_after: Only list DNS zones created after this date.
:param created_before: Only list DNS zones created before this date.
Expand All @@ -223,6 +223,7 @@ async def list_dns_zones(

result = await api.list_dns_zones(
domain="example",
dns_zone="example",
)
"""

Expand Down Expand Up @@ -253,12 +254,12 @@ async def list_dns_zones_all(
self,
*,
domain: str,
dns_zone: str,
organization_id: Optional[str] = None,
project_id: Optional[str] = None,
order_by: Optional[ListDNSZonesRequestOrderBy] = None,
page: Optional[int] = None,
page_size: Optional[int] = None,
dns_zone: Optional[str] = None,
dns_zones: Optional[list[str]] = None,
created_after: Optional[datetime] = None,
created_before: Optional[datetime] = None,
Expand All @@ -269,12 +270,12 @@ async def list_dns_zones_all(
List DNS zones.
Retrieve the list of DNS zones you can manage and filter DNS zones associated with specific domain names.
:param domain: Domain on which to filter the returned DNS zones.
:param dns_zone: DNS zone on which to filter the returned DNS zones.
:param organization_id: Organization ID on which to filter the returned DNS zones.
:param project_id: Project ID on which to filter the returned DNS zones.
:param order_by: Sort order of the returned DNS zones.
:param page: Page number to return, from the paginated results.
:param page_size: Maximum number of DNS zones to return per page.
:param dns_zone: DNS zone on which to filter the returned DNS zones.
:param dns_zones: DNS zones on which to filter the returned DNS zones.
:param created_after: Only list DNS zones created after this date.
:param created_before: Only list DNS zones created before this date.
Expand All @@ -287,6 +288,7 @@ async def list_dns_zones_all(

result = await api.list_dns_zones_all(
domain="example",
dns_zone="example",
)
"""

Expand All @@ -296,12 +298,12 @@ async def list_dns_zones_all(
fetcher=self.list_dns_zones,
args={
"domain": domain,
"dns_zone": dns_zone,
"organization_id": organization_id,
"project_id": project_id,
"order_by": order_by,
"page": page,
"page_size": page_size,
"dns_zone": dns_zone,
"dns_zones": dns_zones,
"created_after": created_after,
"created_before": created_before,
Expand Down Expand Up @@ -774,7 +776,7 @@ async def import_raw_dns_zone(
self,
*,
dns_zone: str,
content: Optional[str] = None,
content: str,
project_id: Optional[str] = None,
format: Optional[RawFormat] = None,
bind_source: Optional[ImportRawDNSZoneRequestBindSource] = None,
Expand All @@ -798,6 +800,7 @@ async def import_raw_dns_zone(

result = await api.import_raw_dns_zone(
dns_zone="example",
content="example",
)
"""

Expand Down Expand Up @@ -1169,8 +1172,8 @@ async def wait_for_ssl_certificate(
options = WaitForOptions()

if not options.stop:
options.stop = (
lambda res: res.status not in SSL_CERTIFICATE_TRANSIENT_STATUSES
options.stop = lambda res: (
res.status not in SSL_CERTIFICATE_TRANSIENT_STATUSES
)

return await wait_for_resource_async(
Expand Down Expand Up @@ -2086,13 +2089,13 @@ async def update_contact(
company_identification_code: Optional[str] = None,
lang: Optional[StdLanguageCode] = None,
resale: Optional[bool] = None,
questions: Optional[list[UpdateContactRequestQuestion]] = None,
extension_fr: Optional[ContactExtensionFR] = None,
extension_eu: Optional[ContactExtensionEU] = None,
whois_opt_in: Optional[bool] = None,
state: Optional[str] = None,
extension_nl: Optional[ContactExtensionNL] = None,
extension_it: Optional[ContactExtensionIT] = None,
whois_opt_in: Optional[bool] = None,
state: Optional[str] = None,
questions: Optional[list[UpdateContactRequestQuestion]] = None,
) -> Contact:
"""
Update contact.
Expand All @@ -2111,13 +2114,13 @@ async def update_contact(
:param company_identification_code:
:param lang:
:param resale:
:param questions:
:param extension_fr:
:param extension_eu:
:param whois_opt_in:
:param state:
:param extension_nl:
:param extension_it:
:param whois_opt_in:
:param state:
:param questions:
:return: :class:`Contact <Contact>`

Usage:
Expand Down Expand Up @@ -2149,13 +2152,13 @@ async def update_contact(
company_identification_code=company_identification_code,
lang=lang,
resale=resale,
questions=questions,
extension_fr=extension_fr,
extension_eu=extension_eu,
whois_opt_in=whois_opt_in,
state=state,
extension_nl=extension_nl,
extension_it=extension_it,
whois_opt_in=whois_opt_in,
state=state,
questions=questions,
),
self.client,
),
Expand Down
99 changes: 57 additions & 42 deletions scaleway-async/scaleway_async/domain/v2beta1/marshalling.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
resolve_one_of,
)
from .types import (
ContactEmailStatus,
ContactLegalForm,
ContactStatus,
DomainFeatureStatus,
DomainStatus,
InboundTransferStatus,
Expand Down Expand Up @@ -127,6 +130,9 @@
UpdateDNSZoneRecordsRequest,
UpdateDNSZoneRequest,
)
from ...std.types import (
LanguageCode as StdLanguageCode,
)


def unmarshal_ContactExtensionFRAssociationInfo(
Expand Down Expand Up @@ -310,12 +316,6 @@ def unmarshal_ContactExtensionIT(data: Any) -> ContactExtensionIT:

args: dict[str, Any] = {}

field = data.get("pin", None)
if field is not None:
args["pin"] = field
else:
args["pin"] = None

field = data.get("european_citizenship", None)
if field is not None:
args["european_citizenship"] = field
Expand All @@ -328,6 +328,12 @@ def unmarshal_ContactExtensionIT(data: Any) -> ContactExtensionIT:
else:
args["tax_code"] = None

field = data.get("pin", None)
if field is not None:
args["pin"] = field
else:
args["pin"] = None

return ContactExtensionIT(**args)


Expand Down Expand Up @@ -395,7 +401,7 @@ def unmarshal_Contact(data: Any) -> Contact:
if field is not None:
args["legal_form"] = field
else:
args["legal_form"] = None
args["legal_form"] = ContactLegalForm.LEGAL_FORM_UNKNOWN

field = data.get("firstname", None)
if field is not None:
Expand Down Expand Up @@ -485,27 +491,25 @@ def unmarshal_Contact(data: Any) -> Contact:
if field is not None:
args["lang"] = field
else:
args["lang"] = None
args["lang"] = StdLanguageCode.UNKNOWN_LANGUAGE_CODE

field = data.get("resale", None)
if field is not None:
args["resale"] = field
else:
args["resale"] = None
args["resale"] = False

field = data.get("whois_opt_in", None)
if field is not None:
args["whois_opt_in"] = field
else:
args["whois_opt_in"] = None
args["whois_opt_in"] = False

field = data.get("questions", None)
field = data.get("email_status", None)
if field is not None:
args["questions"] = (
[unmarshal_ContactQuestion(v) for v in field] if field is not None else None
)
args["email_status"] = field
else:
args["questions"] = None
args["email_status"] = ContactEmailStatus.EMAIL_STATUS_UNKNOWN

field = data.get("extension_fr", None)
if field is not None:
Expand All @@ -519,12 +523,6 @@ def unmarshal_Contact(data: Any) -> Contact:
else:
args["extension_eu"] = None

field = data.get("email_status", None)
if field is not None:
args["email_status"] = field
else:
args["email_status"] = None

field = data.get("state", None)
if field is not None:
args["state"] = field
Expand All @@ -535,7 +533,15 @@ def unmarshal_Contact(data: Any) -> Contact:
if field is not None:
args["status"] = field
else:
args["status"] = None
args["status"] = ContactStatus.STATUS_UNKNOWN

field = data.get("questions", None)
if field is not None:
args["questions"] = (
[unmarshal_ContactQuestion(v) for v in field] if field is not None else None
)
else:
args["questions"] = []

field = data.get("extension_nl", None)
if field is not None:
Expand Down Expand Up @@ -1496,6 +1502,12 @@ def unmarshal_Record(data: Any) -> Record:
else:
args["view_config"] = None

field = data.get("updated_at", None)
if field is not None:
args["updated_at"] = parser.isoparse(field) if isinstance(field, str) else field
else:
args["updated_at"] = None

return Record(**args)


Expand Down Expand Up @@ -3016,15 +3028,15 @@ def marshal_ContactExtensionIT(
) -> dict[str, Any]:
output: dict[str, Any] = {}

if request.pin is not None:
output["pin"] = request.pin

if request.european_citizenship is not None:
output["european_citizenship"] = request.european_citizenship

if request.tax_code is not None:
output["tax_code"] = request.tax_code

if request.pin is not None:
output["pin"] = request.pin

return output


Expand Down Expand Up @@ -3114,17 +3126,17 @@ def marshal_NewContact(
if request.whois_opt_in is not None:
output["whois_opt_in"] = request.whois_opt_in

if request.questions is not None:
output["questions"] = [
marshal_ContactQuestion(item, defaults) for item in request.questions
]

if request.vat_identification_code is not None:
output["vat_identification_code"] = request.vat_identification_code

if request.company_identification_code is not None:
output["company_identification_code"] = request.company_identification_code

if request.questions is not None:
output["questions"] = [
marshal_ContactQuestion(item, defaults) for item in request.questions
]

if request.extension_fr is not None:
output["extension_fr"] = marshal_ContactExtensionFR(
request.extension_fr, defaults
Expand Down Expand Up @@ -3596,12 +3608,6 @@ def marshal_RegistrarApiUpdateContactRequest(
if request.resale is not None:
output["resale"] = request.resale

if request.questions is not None:
output["questions"] = [
marshal_UpdateContactRequestQuestion(item, defaults)
for item in request.questions
]

if request.extension_fr is not None:
output["extension_fr"] = marshal_ContactExtensionFR(
request.extension_fr, defaults
Expand All @@ -3612,12 +3618,6 @@ def marshal_RegistrarApiUpdateContactRequest(
request.extension_eu, defaults
)

if request.whois_opt_in is not None:
output["whois_opt_in"] = request.whois_opt_in

if request.state is not None:
output["state"] = request.state

if request.extension_nl is not None:
output["extension_nl"] = marshal_ContactExtensionNL(
request.extension_nl, defaults
Expand All @@ -3628,6 +3628,18 @@ def marshal_RegistrarApiUpdateContactRequest(
request.extension_it, defaults
)

if request.whois_opt_in is not None:
output["whois_opt_in"] = request.whois_opt_in

if request.state is not None:
output["state"] = request.state

if request.questions is not None:
output["questions"] = [
marshal_UpdateContactRequestQuestion(item, defaults)
for item in request.questions
]

return output


Expand Down Expand Up @@ -3898,6 +3910,9 @@ def marshal_Record(
if request.comment is not None:
output["comment"] = request.comment

if request.updated_at is not None:
output["updated_at"] = request.updated_at.isoformat()

return output


Expand Down
Loading
Loading