From e5ad8abf8614fcc4940ae19921a7ea4be8e357c8 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Tue, 29 Jul 2025 12:55:51 +0000 Subject: [PATCH] feat: update generated APIs --- .../scaleway_async/account/v3/marshalling.py | 52 ++- .../autoscaling/v1alpha1/marshalling.py | 50 ++- .../baremetal/v1/marshalling.py | 12 +- .../scaleway_async/block/v1/marshalling.py | 16 +- .../block/v1alpha1/marshalling.py | 16 +- .../scaleway_async/cockpit/v1/marshalling.py | 18 +- .../container/v1beta1/marshalling.py | 59 +++- .../domain/v2beta1/marshalling.py | 262 ++++++++++++--- .../edge_services/v1beta1/marshalling.py | 208 +++++++++--- .../function/v1beta1/marshalling.py | 32 +- .../iam/v1alpha1/marshalling.py | 85 +++-- .../inference/v1/marshalling.py | 16 +- .../inference/v1beta1/marshalling.py | 12 +- .../scaleway_async/instance/v1/marshalling.py | 132 +++++--- .../interlink/v1beta1/marshalling.py | 10 +- .../scaleway_async/iot/v1/marshalling.py | 44 ++- .../jobs/v1alpha1/marshalling.py | 12 +- .../key_manager/v1alpha1/marshalling.py | 16 +- .../scaleway_async/lb/v1/marshalling.py | 316 ++++++++++++++---- .../scaleway_async/mongodb/v1/__init__.py | 8 + .../scaleway_async/mongodb/v1/api.py | 89 +++++ .../scaleway_async/mongodb/v1/marshalling.py | 66 +++- .../scaleway_async/mongodb/v1/types.py | 48 +++ .../mongodb/v1alpha1/marshalling.py | 24 +- .../qaas/v1alpha1/marshalling.py | 12 +- .../scaleway_async/rdb/v1/marshalling.py | 86 +++-- .../scaleway_async/redis/v1/marshalling.py | 36 +- .../scaleway_async/registry/v1/marshalling.py | 12 +- .../scaleway_async/test/v1/marshalling.py | 12 +- .../scaleway_async/vpcgw/v1/marshalling.py | 34 +- .../webhosting/v1/marshalling.py | 12 +- scaleway/scaleway/account/v3/marshalling.py | 52 ++- .../autoscaling/v1alpha1/marshalling.py | 50 ++- scaleway/scaleway/baremetal/v1/marshalling.py | 12 +- scaleway/scaleway/block/v1/marshalling.py | 16 +- .../scaleway/block/v1alpha1/marshalling.py | 16 +- scaleway/scaleway/cockpit/v1/marshalling.py | 18 +- .../scaleway/container/v1beta1/marshalling.py | 59 +++- .../scaleway/domain/v2beta1/marshalling.py | 262 ++++++++++++--- .../edge_services/v1beta1/marshalling.py | 208 +++++++++--- .../scaleway/function/v1beta1/marshalling.py | 32 +- scaleway/scaleway/iam/v1alpha1/marshalling.py | 85 +++-- scaleway/scaleway/inference/v1/marshalling.py | 16 +- .../scaleway/inference/v1beta1/marshalling.py | 12 +- scaleway/scaleway/instance/v1/marshalling.py | 132 +++++--- .../scaleway/interlink/v1beta1/marshalling.py | 10 +- scaleway/scaleway/iot/v1/marshalling.py | 44 ++- .../scaleway/jobs/v1alpha1/marshalling.py | 12 +- .../key_manager/v1alpha1/marshalling.py | 16 +- scaleway/scaleway/lb/v1/marshalling.py | 316 ++++++++++++++---- scaleway/scaleway/mongodb/v1/__init__.py | 8 + scaleway/scaleway/mongodb/v1/api.py | 89 +++++ scaleway/scaleway/mongodb/v1/marshalling.py | 66 +++- scaleway/scaleway/mongodb/v1/types.py | 48 +++ .../scaleway/mongodb/v1alpha1/marshalling.py | 24 +- .../scaleway/qaas/v1alpha1/marshalling.py | 12 +- scaleway/scaleway/rdb/v1/marshalling.py | 86 +++-- scaleway/scaleway/redis/v1/marshalling.py | 36 +- scaleway/scaleway/registry/v1/marshalling.py | 12 +- scaleway/scaleway/test/v1/marshalling.py | 12 +- scaleway/scaleway/vpcgw/v1/marshalling.py | 34 +- .../scaleway/webhosting/v1/marshalling.py | 12 +- 62 files changed, 2936 insertions(+), 678 deletions(-) diff --git a/scaleway-async/scaleway_async/account/v3/marshalling.py b/scaleway-async/scaleway_async/account/v3/marshalling.py index 2875dfa32..f9262972b 100644 --- a/scaleway-async/scaleway_async/account/v3/marshalling.py +++ b/scaleway-async/scaleway_async/account/v3/marshalling.py @@ -637,17 +637,51 @@ def marshal_Qualification( output.update( resolve_one_of( [ - OneOfPossibility("host_website", request.host_website), - OneOfPossibility("host_application", request.host_application), - OneOfPossibility("deploy_software", request.deploy_software), OneOfPossibility( - "set_scaleway_environment", request.set_scaleway_environment + param="host_website", + value=request.host_website, + marshal_func=marshal_QualificationHostWebsite, + ), + OneOfPossibility( + param="host_application", + value=request.host_application, + marshal_func=marshal_QualificationHostApplication, + ), + OneOfPossibility( + param="deploy_software", + value=request.deploy_software, + marshal_func=marshal_QualificationDeploySoftware, + ), + OneOfPossibility( + param="set_scaleway_environment", + value=request.set_scaleway_environment, + marshal_func=marshal_QualificationSetScalewayEnvironment, + ), + OneOfPossibility( + param="ai_machine", + value=request.ai_machine, + marshal_func=marshal_QualificationAiMachine, + ), + OneOfPossibility( + param="container", + value=request.container, + marshal_func=marshal_QualificationContainer, + ), + OneOfPossibility( + param="archive_data", + value=request.archive_data, + marshal_func=marshal_QualificationArchiveData, + ), + OneOfPossibility( + param="share_data", + value=request.share_data, + marshal_func=marshal_QualificationShareData, + ), + OneOfPossibility( + param="other_use_case", + value=request.other_use_case, + marshal_func=marshal_QualificationOtherUseCase, ), - OneOfPossibility("ai_machine", request.ai_machine), - OneOfPossibility("container", request.container), - OneOfPossibility("archive_data", request.archive_data), - OneOfPossibility("share_data", request.share_data), - OneOfPossibility("other_use_case", request.other_use_case), ] ), ) diff --git a/scaleway-async/scaleway_async/autoscaling/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/autoscaling/v1alpha1/marshalling.py index 0558608f9..7db33fe14 100644 --- a/scaleway-async/scaleway_async/autoscaling/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/autoscaling/v1alpha1/marshalling.py @@ -610,8 +610,16 @@ def marshal_Metric( output.update( resolve_one_of( [ - OneOfPossibility("managed_metric", request.managed_metric), - OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name), + OneOfPossibility( + param="managed_metric", + value=request.managed_metric, + marshal_func=None, + ), + OneOfPossibility( + param="cockpit_metric_name", + value=request.cockpit_metric_name, + marshal_func=None, + ), ] ), ) @@ -642,7 +650,9 @@ def marshal_CreateInstancePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("metric", request.metric), + OneOfPossibility( + param="metric", value=request.metric, marshal_func=marshal_Metric + ), ] ), ) @@ -703,15 +713,25 @@ def marshal_VolumeInstanceTemplate( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_VolumeInstanceTemplateFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_VolumeInstanceTemplateFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) @@ -842,8 +862,16 @@ def marshal_UpdateInstancePolicyRequestMetric( output.update( resolve_one_of( [ - OneOfPossibility("managed_metric", request.managed_metric), - OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name), + OneOfPossibility( + param="managed_metric", + value=request.managed_metric, + marshal_func=None, + ), + OneOfPossibility( + param="cockpit_metric_name", + value=request.cockpit_metric_name, + marshal_func=None, + ), ] ), ) @@ -874,7 +902,11 @@ def marshal_UpdateInstancePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("metric", request.metric), + OneOfPossibility( + param="metric", + value=request.metric, + marshal_func=marshal_UpdateInstancePolicyRequestMetric, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py index e22b70f7f..6420591fc 100644 --- a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py +++ b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py @@ -1575,12 +1575,16 @@ def marshal_CreateServerRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway-async/scaleway_async/block/v1/marshalling.py b/scaleway-async/scaleway_async/block/v1/marshalling.py index d1aef6680..31e50d261 100644 --- a/scaleway-async/scaleway_async/block/v1/marshalling.py +++ b/scaleway-async/scaleway_async/block/v1/marshalling.py @@ -418,15 +418,25 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_CreateVolumeRequestFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_CreateVolumeRequestFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/block/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/block/v1alpha1/marshalling.py index e7289e492..a2ae2b31e 100644 --- a/scaleway-async/scaleway_async/block/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/block/v1alpha1/marshalling.py @@ -419,15 +419,25 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_CreateVolumeRequestFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_CreateVolumeRequestFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/cockpit/v1/marshalling.py b/scaleway-async/scaleway_async/cockpit/v1/marshalling.py index 3bea9a117..c40e5ff04 100644 --- a/scaleway-async/scaleway_async/cockpit/v1/marshalling.py +++ b/scaleway-async/scaleway_async/cockpit/v1/marshalling.py @@ -910,7 +910,11 @@ def marshal_RegionalApiCreateContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) @@ -971,7 +975,11 @@ def marshal_RegionalApiDeleteContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) @@ -1080,7 +1088,11 @@ def marshal_RegionalApiUpdateContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/container/v1beta1/marshalling.py b/scaleway-async/scaleway_async/container/v1beta1/marshalling.py index 90e7258c8..3e059aede 100644 --- a/scaleway-async/scaleway_async/container/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/container/v1beta1/marshalling.py @@ -839,8 +839,16 @@ def marshal_ContainerHealthCheckSpec( output.update( resolve_one_of( [ - OneOfPossibility("http", request.http), - OneOfPossibility("tcp", request.tcp), + OneOfPossibility( + param="http", + value=request.http, + marshal_func=marshal_ContainerHealthCheckSpecHTTPProbe, + ), + OneOfPossibility( + param="tcp", + value=request.tcp, + marshal_func=marshal_ContainerHealthCheckSpecTCPProbe, + ), ] ), ) @@ -863,12 +871,19 @@ def marshal_ContainerScalingOption( resolve_one_of( [ OneOfPossibility( - "concurrent_requests_threshold", - request.concurrent_requests_threshold, + param="concurrent_requests_threshold", + value=request.concurrent_requests_threshold, + marshal_func=None, ), - OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold), OneOfPossibility( - "memory_usage_threshold", request.memory_usage_threshold + param="cpu_usage_threshold", + value=request.cpu_usage_threshold, + marshal_func=None, + ), + OneOfPossibility( + param="memory_usage_threshold", + value=request.memory_usage_threshold, + marshal_func=None, ), ] ), @@ -1057,8 +1072,12 @@ def marshal_CreateTokenRequest( output.update( resolve_one_of( [ - OneOfPossibility("container_id", request.container_id), - OneOfPossibility("namespace_id", request.namespace_id), + OneOfPossibility( + param="container_id", value=request.container_id, marshal_func=None + ), + OneOfPossibility( + param="namespace_id", value=request.namespace_id, marshal_func=None + ), ] ), ) @@ -1140,9 +1159,21 @@ def marshal_CreateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("scw_sqs_config", request.scw_sqs_config), - OneOfPossibility("scw_nats_config", request.scw_nats_config), - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="scw_sqs_config", + value=request.scw_sqs_config, + marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig, + ), + OneOfPossibility( + param="scw_nats_config", + value=request.scw_nats_config, + marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig, + ), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_CreateTriggerRequestSqsClientConfig, + ), ] ), ) @@ -1312,7 +1343,11 @@ def marshal_UpdateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_UpdateTriggerRequestSqsClientConfig, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/domain/v2beta1/marshalling.py b/scaleway-async/scaleway_async/domain/v2beta1/marshalling.py index 00214b0ec..079c77d2e 100644 --- a/scaleway-async/scaleway_async/domain/v2beta1/marshalling.py +++ b/scaleway-async/scaleway_async/domain/v2beta1/marshalling.py @@ -2251,7 +2251,11 @@ def marshal_ImportProviderDNSZoneRequest( output.update( resolve_one_of( [ - OneOfPossibility("online_v1", request.online_v1), + OneOfPossibility( + param="online_v1", + value=request.online_v1, + marshal_func=marshal_ImportProviderDNSZoneRequestOnlineV1, + ), ] ), ) @@ -2314,8 +2318,16 @@ def marshal_ImportRawDNSZoneRequest( output.update( resolve_one_of( [ - OneOfPossibility("bind_source", request.bind_source), - OneOfPossibility("axfr_source", request.axfr_source), + OneOfPossibility( + param="bind_source", + value=request.bind_source, + marshal_func=marshal_ImportRawDNSZoneRequestBindSource, + ), + OneOfPossibility( + param="axfr_source", + value=request.axfr_source, + marshal_func=marshal_ImportRawDNSZoneRequestAXFRSource, + ), ] ), ) @@ -2433,11 +2445,31 @@ def marshal_ContactExtensionFR( output.update( resolve_one_of( [ - OneOfPossibility("individual_info", request.individual_info), - OneOfPossibility("duns_info", request.duns_info), - OneOfPossibility("association_info", request.association_info), - OneOfPossibility("trademark_info", request.trademark_info), - OneOfPossibility("code_auth_afnic_info", request.code_auth_afnic_info), + OneOfPossibility( + param="individual_info", + value=request.individual_info, + marshal_func=marshal_ContactExtensionFRIndividualInfo, + ), + OneOfPossibility( + param="duns_info", + value=request.duns_info, + marshal_func=marshal_ContactExtensionFRDunsInfo, + ), + OneOfPossibility( + param="association_info", + value=request.association_info, + marshal_func=marshal_ContactExtensionFRAssociationInfo, + ), + OneOfPossibility( + param="trademark_info", + value=request.trademark_info, + marshal_func=marshal_ContactExtensionFRTrademarkInfo, + ), + OneOfPossibility( + param="code_auth_afnic_info", + value=request.code_auth_afnic_info, + marshal_func=marshal_ContactExtensionFRCodeAuthAfnicInfo, + ), ] ), ) @@ -2574,8 +2606,16 @@ def marshal_RegistrarApiBuyDomainsRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2583,10 +2623,14 @@ def marshal_RegistrarApiBuyDomainsRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2594,8 +2638,16 @@ def marshal_RegistrarApiBuyDomainsRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2620,8 +2672,16 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2629,10 +2689,14 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2640,8 +2704,16 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2708,8 +2780,16 @@ def marshal_DSRecord( output.update( resolve_one_of( [ - OneOfPossibility("digest", request.digest), - OneOfPossibility("public_key", request.public_key), + OneOfPossibility( + param="digest", + value=request.digest, + marshal_func=marshal_DSRecordDigest, + ), + OneOfPossibility( + param="public_key", + value=request.public_key, + marshal_func=marshal_DSRecordPublicKey, + ), ] ), ) @@ -2776,8 +2856,16 @@ def marshal_RegistrarApiTradeDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("new_owner_contact_id", request.new_owner_contact_id), - OneOfPossibility("new_owner_contact", request.new_owner_contact), + OneOfPossibility( + param="new_owner_contact_id", + value=request.new_owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="new_owner_contact", + value=request.new_owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2811,8 +2899,16 @@ def marshal_RegistrarApiTransferInDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2820,10 +2916,14 @@ def marshal_RegistrarApiTransferInDomainRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2831,8 +2931,16 @@ def marshal_RegistrarApiTransferInDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2959,16 +3067,32 @@ def marshal_RegistrarApiUpdateDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2976,10 +3100,14 @@ def marshal_RegistrarApiUpdateDomainRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -3141,10 +3269,26 @@ def marshal_Record( output.update( resolve_one_of( [ - OneOfPossibility("geo_ip_config", request.geo_ip_config), - OneOfPossibility("http_service_config", request.http_service_config), - OneOfPossibility("weighted_config", request.weighted_config), - OneOfPossibility("view_config", request.view_config), + OneOfPossibility( + param="geo_ip_config", + value=request.geo_ip_config, + marshal_func=marshal_RecordGeoIPConfig, + ), + OneOfPossibility( + param="http_service_config", + value=request.http_service_config, + marshal_func=marshal_RecordHTTPServiceConfig, + ), + OneOfPossibility( + param="weighted_config", + value=request.weighted_config, + marshal_func=marshal_RecordWeightedConfig, + ), + OneOfPossibility( + param="view_config", + value=request.view_config, + marshal_func=marshal_RecordViewConfig, + ), ] ), ) @@ -3223,8 +3367,12 @@ def marshal_RecordChangeDelete( output.update( resolve_one_of( [ - OneOfPossibility("id", request.id), - OneOfPossibility("id_fields", request.id_fields), + OneOfPossibility(param="id", value=request.id, marshal_func=None), + OneOfPossibility( + param="id_fields", + value=request.id_fields, + marshal_func=marshal_RecordIdentifier, + ), ] ), ) @@ -3240,8 +3388,12 @@ def marshal_RecordChangeSet( output.update( resolve_one_of( [ - OneOfPossibility("id", request.id), - OneOfPossibility("id_fields", request.id_fields), + OneOfPossibility(param="id", value=request.id, marshal_func=None), + OneOfPossibility( + param="id_fields", + value=request.id_fields, + marshal_func=marshal_RecordIdentifier, + ), ] ), ) @@ -3260,10 +3412,24 @@ def marshal_RecordChange( output.update( resolve_one_of( [ - OneOfPossibility("add", request.add), - OneOfPossibility("set", request.set_), - OneOfPossibility("delete", request.delete), - OneOfPossibility("clear", request.clear), + OneOfPossibility( + param="add", value=request.add, marshal_func=marshal_RecordChangeAdd + ), + OneOfPossibility( + param="set", + value=request.set_, + marshal_func=marshal_RecordChangeSet, + ), + OneOfPossibility( + param="delete", + value=request.delete, + marshal_func=marshal_RecordChangeDelete, + ), + OneOfPossibility( + param="clear", + value=request.clear, + marshal_func=marshal_RecordChangeClear, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/edge_services/v1beta1/marshalling.py b/scaleway-async/scaleway_async/edge_services/v1beta1/marshalling.py index 016b8326d..d70c3e757 100644 --- a/scaleway-async/scaleway_async/edge_services/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/edge_services/v1beta1/marshalling.py @@ -1329,14 +1329,22 @@ def marshal_SetRouteRulesRequestRouteRule( output.update( resolve_one_of( [ - OneOfPossibility("rule_http_match", request.rule_http_match), + OneOfPossibility( + param="rule_http_match", + value=request.rule_http_match, + marshal_func=marshal_RuleHttpMatch, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1352,8 +1360,16 @@ def marshal_AddRouteRulesRequest( output.update( resolve_one_of( [ - OneOfPossibility("after_position", request.after_position), - OneOfPossibility("before_position", request.before_position), + OneOfPossibility( + param="after_position", + value=request.after_position, + marshal_func=None, + ), + OneOfPossibility( + param="before_position", + value=request.before_position, + marshal_func=None, + ), ] ), ) @@ -1444,8 +1460,12 @@ def marshal_CheckPEMChainRequest( output.update( resolve_one_of( [ - OneOfPossibility("secret", request.secret), - OneOfPossibility("raw", request.raw), + OneOfPossibility( + param="secret", + value=request.secret, + marshal_func=marshal_CheckPEMChainRequestSecretChain, + ), + OneOfPossibility(param="raw", value=request.raw, marshal_func=None), ] ), ) @@ -1497,8 +1517,16 @@ def marshal_CreateBackendStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("scaleway_s3", request.scaleway_s3), - OneOfPossibility("scaleway_lb", request.scaleway_lb), + OneOfPossibility( + param="scaleway_s3", + value=request.scaleway_s3, + marshal_func=marshal_ScalewayS3BackendConfig, + ), + OneOfPossibility( + param="scaleway_lb", + value=request.scaleway_lb, + marshal_func=marshal_ScalewayLbBackendConfig, + ), ] ), ) @@ -1514,9 +1542,19 @@ def marshal_CreateCacheStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), ] ), ) @@ -1538,9 +1576,19 @@ def marshal_CreateDNSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("tls_stage_id", request.tls_stage_id), - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="tls_stage_id", value=request.tls_stage_id, marshal_func=None + ), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1577,8 +1625,10 @@ def marshal_CreatePurgeRequestRequest( output.update( resolve_one_of( [ - OneOfPossibility("assets", request.assets), - OneOfPossibility("all", request.all), + OneOfPossibility( + param="assets", value=request.assets, marshal_func=None + ), + OneOfPossibility(param="all", value=request.all, marshal_func=None), ] ), ) @@ -1597,7 +1647,9 @@ def marshal_CreateRouteStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1628,10 +1680,24 @@ def marshal_CreateTLSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1655,7 +1721,11 @@ def marshal_CreateWafStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1731,9 +1801,21 @@ def marshal_SetHeadStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("add_new_head_stage", request.add_new_head_stage), - OneOfPossibility("remove_head_stage", request.remove_head_stage), - OneOfPossibility("swap_head_stage", request.swap_head_stage), + OneOfPossibility( + param="add_new_head_stage", + value=request.add_new_head_stage, + marshal_func=marshal_SetHeadStageRequestAddNewHeadStage, + ), + OneOfPossibility( + param="remove_head_stage", + value=request.remove_head_stage, + marshal_func=marshal_SetHeadStageRequestRemoveHeadStage, + ), + OneOfPossibility( + param="swap_head_stage", + value=request.swap_head_stage, + marshal_func=marshal_SetHeadStageRequestSwapHeadStage, + ), ] ), ) @@ -1764,8 +1846,16 @@ def marshal_UpdateBackendStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("scaleway_s3", request.scaleway_s3), - OneOfPossibility("scaleway_lb", request.scaleway_lb), + OneOfPossibility( + param="scaleway_s3", + value=request.scaleway_s3, + marshal_func=marshal_ScalewayS3BackendConfig, + ), + OneOfPossibility( + param="scaleway_lb", + value=request.scaleway_lb, + marshal_func=marshal_ScalewayLbBackendConfig, + ), ] ), ) @@ -1784,9 +1874,19 @@ def marshal_UpdateCacheStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), ] ), ) @@ -1808,9 +1908,19 @@ def marshal_UpdateDNSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("tls_stage_id", request.tls_stage_id), - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="tls_stage_id", value=request.tls_stage_id, marshal_func=None + ), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1844,7 +1954,9 @@ def marshal_UpdateRouteStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1874,10 +1986,24 @@ def marshal_UpdateTLSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1901,7 +2027,11 @@ def marshal_UpdateWafStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/function/v1beta1/marshalling.py b/scaleway-async/scaleway_async/function/v1beta1/marshalling.py index 2f34c0b02..2d4accbd8 100644 --- a/scaleway-async/scaleway_async/function/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/function/v1beta1/marshalling.py @@ -958,8 +958,12 @@ def marshal_CreateTokenRequest( output.update( resolve_one_of( [ - OneOfPossibility("function_id", request.function_id), - OneOfPossibility("namespace_id", request.namespace_id), + OneOfPossibility( + param="function_id", value=request.function_id, marshal_func=None + ), + OneOfPossibility( + param="namespace_id", value=request.namespace_id, marshal_func=None + ), ] ), ) @@ -1041,9 +1045,21 @@ def marshal_CreateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("scw_sqs_config", request.scw_sqs_config), - OneOfPossibility("scw_nats_config", request.scw_nats_config), - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="scw_sqs_config", + value=request.scw_sqs_config, + marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig, + ), + OneOfPossibility( + param="scw_nats_config", + value=request.scw_nats_config, + marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig, + ), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_CreateTriggerRequestSqsClientConfig, + ), ] ), ) @@ -1185,7 +1201,11 @@ def marshal_UpdateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_UpdateTriggerRequestSqsClientConfig, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py index 1faf7d244..1ae7efd46 100644 --- a/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py @@ -1365,8 +1365,14 @@ def marshal_AddGroupMemberRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), ] ), ) @@ -1412,8 +1418,14 @@ def marshal_CreateAPIKeyRequest( output.update( resolve_one_of( [ - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("user_id", request.user_id), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), ] ), ) @@ -1514,11 +1526,14 @@ def marshal_RuleSpecs( output.update( resolve_one_of( [ - OneOfPossibility("project_ids", request.project_ids), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="project_ids", value=request.project_ids, marshal_func=None + ), + OneOfPossibility( + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -1541,10 +1556,20 @@ def marshal_CreatePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("group_id", request.group_id), - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("no_principal", request.no_principal), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="group_id", value=request.group_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="no_principal", value=request.no_principal, marshal_func=None + ), ] ), ) @@ -1631,8 +1656,12 @@ def marshal_CreateUserRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), - OneOfPossibility("member", request.member), + OneOfPossibility(param="email", value=request.email, marshal_func=None), + OneOfPossibility( + param="member", + value=request.member, + marshal_func=marshal_CreateUserRequestMember, + ), ] ), ) @@ -1668,8 +1697,14 @@ def marshal_RemoveGroupMemberRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), ] ), ) @@ -1823,10 +1858,20 @@ def marshal_UpdatePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("group_id", request.group_id), - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("no_principal", request.no_principal), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="group_id", value=request.group_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="no_principal", value=request.no_principal, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/inference/v1/marshalling.py b/scaleway-async/scaleway_async/inference/v1/marshalling.py index 59057723e..8fc4b104f 100644 --- a/scaleway-async/scaleway_async/inference/v1/marshalling.py +++ b/scaleway-async/scaleway_async/inference/v1/marshalling.py @@ -507,8 +507,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public_network", request.public_network), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointPublicNetworkDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointPrivateNetworkDetails, + ), ] ), ) @@ -585,7 +593,9 @@ def marshal_ModelSource( output.update( resolve_one_of( [ - OneOfPossibility("secret", request.secret), + OneOfPossibility( + param="secret", value=request.secret, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/inference/v1beta1/marshalling.py b/scaleway-async/scaleway_async/inference/v1beta1/marshalling.py index 413ff7793..8930c95d9 100644 --- a/scaleway-async/scaleway_async/inference/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/inference/v1beta1/marshalling.py @@ -565,8 +565,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public", request.public), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public", + value=request.public, + marshal_func=marshal_EndpointSpecPublic, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetwork, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/instance/v1/marshalling.py b/scaleway-async/scaleway_async/instance/v1/marshalling.py index 9f0d7bf75..efcebf457 100644 --- a/scaleway-async/scaleway_async/instance/v1/marshalling.py +++ b/scaleway-async/scaleway_async/instance/v1/marshalling.py @@ -2824,8 +2824,12 @@ def marshal_ApplyBlockMigrationRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_id", request.volume_id), - OneOfPossibility("snapshot_id", request.snapshot_id), + OneOfPossibility( + param="volume_id", value=request.volume_id, marshal_func=None + ), + OneOfPossibility( + param="snapshot_id", value=request.snapshot_id, marshal_func=None + ), ] ), ) @@ -2889,12 +2893,16 @@ def marshal_VolumeTemplate( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2924,12 +2932,16 @@ def marshal_CreateImageRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2968,12 +2980,16 @@ def marshal_CreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3000,12 +3016,16 @@ def marshal_CreatePlacementGroupRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3056,12 +3076,16 @@ def marshal_CreateSecurityGroupRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3069,8 +3093,16 @@ def marshal_CreateSecurityGroupRequest( output.update( resolve_one_of( [ - OneOfPossibility("organization_default", request.organization_default), - OneOfPossibility("project_default", request.project_default), + OneOfPossibility( + param="organization_default", + value=request.organization_default, + marshal_func=None, + ), + OneOfPossibility( + param="project_default", + value=request.project_default, + marshal_func=None, + ), ] ), ) @@ -3174,12 +3206,16 @@ def marshal_CreateServerRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3247,12 +3283,16 @@ def marshal_CreateSnapshotRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3291,12 +3331,16 @@ def marshal_CreateVolumeRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3304,8 +3348,12 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("size", request.size), - OneOfPossibility("base_snapshot", request.base_snapshot), + OneOfPossibility(param="size", value=request.size, marshal_func=None), + OneOfPossibility( + param="base_snapshot", + value=request.base_snapshot, + marshal_func=None, + ), ] ), ) @@ -3369,8 +3417,12 @@ def marshal_PlanBlockMigrationRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_id", request.volume_id), - OneOfPossibility("snapshot_id", request.snapshot_id), + OneOfPossibility( + param="volume_id", value=request.volume_id, marshal_func=None + ), + OneOfPossibility( + param="snapshot_id", value=request.snapshot_id, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/interlink/v1beta1/marshalling.py b/scaleway-async/scaleway_async/interlink/v1beta1/marshalling.py index 7e01aa313..477ccc33b 100644 --- a/scaleway-async/scaleway_async/interlink/v1beta1/marshalling.py +++ b/scaleway-async/scaleway_async/interlink/v1beta1/marshalling.py @@ -572,8 +572,14 @@ def marshal_CreateLinkRequest( output.update( resolve_one_of( [ - OneOfPossibility("connection_id", request.connection_id), - OneOfPossibility("partner_id", request.partner_id), + OneOfPossibility( + param="connection_id", + value=request.connection_id, + marshal_func=None, + ), + OneOfPossibility( + param="partner_id", value=request.partner_id, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/iot/v1/marshalling.py b/scaleway-async/scaleway_async/iot/v1/marshalling.py index 518fb91e3..fce648a7b 100644 --- a/scaleway-async/scaleway_async/iot/v1/marshalling.py +++ b/scaleway-async/scaleway_async/iot/v1/marshalling.py @@ -923,7 +923,9 @@ def marshal_CreateHubRequest( resolve_one_of( [ OneOfPossibility( - "twins_graphite_config", request.twins_graphite_config + param="twins_graphite_config", + value=request.twins_graphite_config, + marshal_func=marshal_HubTwinsGraphiteConfig, ), ] ), @@ -1045,9 +1047,21 @@ def marshal_CreateRouteRequest( output.update( resolve_one_of( [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), + OneOfPossibility( + param="s3_config", + value=request.s3_config, + marshal_func=marshal_CreateRouteRequestS3Config, + ), + OneOfPossibility( + param="db_config", + value=request.db_config, + marshal_func=marshal_CreateRouteRequestDatabaseConfig, + ), + OneOfPossibility( + param="rest_config", + value=request.rest_config, + marshal_func=marshal_CreateRouteRequestRestConfig, + ), ] ), ) @@ -1156,7 +1170,9 @@ def marshal_UpdateHubRequest( resolve_one_of( [ OneOfPossibility( - "twins_graphite_config", request.twins_graphite_config + param="twins_graphite_config", + value=request.twins_graphite_config, + marshal_func=marshal_HubTwinsGraphiteConfig, ), ] ), @@ -1259,9 +1275,21 @@ def marshal_UpdateRouteRequest( output.update( resolve_one_of( [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), + OneOfPossibility( + param="s3_config", + value=request.s3_config, + marshal_func=marshal_UpdateRouteRequestS3Config, + ), + OneOfPossibility( + param="db_config", + value=request.db_config, + marshal_func=marshal_UpdateRouteRequestDatabaseConfig, + ), + OneOfPossibility( + param="rest_config", + value=request.rest_config, + marshal_func=marshal_UpdateRouteRequestRestConfig, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py index 17cb1e1d7..44470d626 100644 --- a/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py @@ -508,8 +508,10 @@ def marshal_CreateJobDefinitionSecretsRequestSecretConfig( output.update( resolve_one_of( [ - OneOfPossibility("path", request.path), - OneOfPossibility("env_var_name", request.env_var_name), + OneOfPossibility(param="path", value=request.path, marshal_func=None), + OneOfPossibility( + param="env_var_name", value=request.env_var_name, marshal_func=None + ), ] ), ) @@ -620,8 +622,10 @@ def marshal_UpdateJobDefinitionSecretRequest( output.update( resolve_one_of( [ - OneOfPossibility("path", request.path), - OneOfPossibility("env_var_name", request.env_var_name), + OneOfPossibility(param="path", value=request.path, marshal_func=None), + OneOfPossibility( + param="env_var_name", value=request.env_var_name, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/key_manager/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/key_manager/v1alpha1/marshalling.py index 4fd97a7c2..2893172b1 100644 --- a/scaleway-async/scaleway_async/key_manager/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/key_manager/v1alpha1/marshalling.py @@ -354,11 +354,21 @@ def marshal_KeyUsage( output.update( resolve_one_of( [ - OneOfPossibility("symmetric_encryption", request.symmetric_encryption), OneOfPossibility( - "asymmetric_encryption", request.asymmetric_encryption + param="symmetric_encryption", + value=request.symmetric_encryption, + marshal_func=None, + ), + OneOfPossibility( + param="asymmetric_encryption", + value=request.asymmetric_encryption, + marshal_func=None, + ), + OneOfPossibility( + param="asymmetric_signing", + value=request.asymmetric_signing, + marshal_func=None, ), - OneOfPossibility("asymmetric_signing", request.asymmetric_signing), ] ), ) diff --git a/scaleway-async/scaleway_async/lb/v1/marshalling.py b/scaleway-async/scaleway_async/lb/v1/marshalling.py index e424b2307..b64fe7a73 100644 --- a/scaleway-async/scaleway_async/lb/v1/marshalling.py +++ b/scaleway-async/scaleway_async/lb/v1/marshalling.py @@ -1577,9 +1577,21 @@ def marshal_AttachPrivateNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="static_config", + value=request.static_config, + marshal_func=marshal_PrivateNetworkStaticConfig, + ), + OneOfPossibility( + param="dhcp_config", + value=request.dhcp_config, + marshal_func=marshal_PrivateNetworkDHCPConfig, + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_PrivateNetworkIpamConfig, + ), ] ), ) @@ -1778,13 +1790,41 @@ def marshal_HealthCheck( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -1917,8 +1957,16 @@ def marshal_CreateCertificateRequest( output.update( resolve_one_of( [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), + OneOfPossibility( + param="letsencrypt", + value=request.letsencrypt, + marshal_func=marshal_CreateCertificateRequestLetsencryptConfig, + ), + OneOfPossibility( + param="custom_certificate", + value=request.custom_certificate, + marshal_func=marshal_CreateCertificateRequestCustomCertificate, + ), ] ), ) @@ -1974,12 +2022,16 @@ def marshal_CreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2006,12 +2058,16 @@ def marshal_CreateLbRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2055,9 +2111,13 @@ def marshal_RouteMatch( output.update( resolve_one_of( [ - OneOfPossibility("sni", request.sni), - OneOfPossibility("host_header", request.host_header), - OneOfPossibility("path_begin", request.path_begin), + OneOfPossibility(param="sni", value=request.sni, marshal_func=None), + OneOfPossibility( + param="host_header", value=request.host_header, marshal_func=None + ), + OneOfPossibility( + param="path_begin", value=request.path_begin, marshal_func=None + ), ] ), ) @@ -2119,12 +2179,16 @@ def marshal_CreateSubscriberRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2132,8 +2196,16 @@ def marshal_CreateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -2338,13 +2410,41 @@ def marshal_UpdateHealthCheckRequest( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -2432,8 +2532,16 @@ def marshal_UpdateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -2464,9 +2572,21 @@ def marshal_ZonedApiAttachPrivateNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="static_config", + value=request.static_config, + marshal_func=marshal_PrivateNetworkStaticConfig, + ), + OneOfPossibility( + param="dhcp_config", + value=request.dhcp_config, + marshal_func=marshal_PrivateNetworkDHCPConfig, + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_PrivateNetworkIpamConfig, + ), ] ), ) @@ -2584,8 +2704,16 @@ def marshal_ZonedApiCreateCertificateRequest( output.update( resolve_one_of( [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), + OneOfPossibility( + param="letsencrypt", + value=request.letsencrypt, + marshal_func=marshal_CreateCertificateRequestLetsencryptConfig, + ), + OneOfPossibility( + param="custom_certificate", + value=request.custom_certificate, + marshal_func=marshal_CreateCertificateRequestCustomCertificate, + ), ] ), ) @@ -2641,12 +2769,16 @@ def marshal_ZonedApiCreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2673,12 +2805,16 @@ def marshal_ZonedApiCreateLbRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2741,12 +2877,16 @@ def marshal_ZonedApiCreateSubscriberRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2754,8 +2894,16 @@ def marshal_ZonedApiCreateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -3008,13 +3156,41 @@ def marshal_ZonedApiUpdateHealthCheckRequest( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -3102,8 +3278,16 @@ def marshal_ZonedApiUpdateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/mongodb/v1/__init__.py b/scaleway-async/scaleway_async/mongodb/v1/__init__.py index 8dc097d17..d68b88190 100644 --- a/scaleway-async/scaleway_async/mongodb/v1/__init__.py +++ b/scaleway-async/scaleway_async/mongodb/v1/__init__.py @@ -2,6 +2,7 @@ # If you have any remark or suggestion do not hesitate to open an issue. from .types import InstanceStatus from .content import INSTANCE_TRANSIENT_STATUSES +from .types import ListDatabasesRequestOrderBy from .types import ListInstancesRequestOrderBy from .types import ListSnapshotsRequestOrderBy from .types import ListUsersRequestOrderBy @@ -20,6 +21,7 @@ from .types import NodeTypeVolumeType from .types import UserRole from .types import EndpointSpec +from .types import Database from .types import Instance from .types import NodeType from .types import Snapshot @@ -36,6 +38,8 @@ from .types import GetInstanceCertificateRequest from .types import GetInstanceRequest from .types import GetSnapshotRequest +from .types import ListDatabasesRequest +from .types import ListDatabasesResponse from .types import ListInstancesRequest from .types import ListInstancesResponse from .types import ListNodeTypesRequest @@ -57,6 +61,7 @@ __all__ = [ "InstanceStatus", "INSTANCE_TRANSIENT_STATUSES", + "ListDatabasesRequestOrderBy", "ListInstancesRequestOrderBy", "ListSnapshotsRequestOrderBy", "ListUsersRequestOrderBy", @@ -75,6 +80,7 @@ "NodeTypeVolumeType", "UserRole", "EndpointSpec", + "Database", "Instance", "NodeType", "Snapshot", @@ -91,6 +97,8 @@ "GetInstanceCertificateRequest", "GetInstanceRequest", "GetSnapshotRequest", + "ListDatabasesRequest", + "ListDatabasesResponse", "ListInstancesRequest", "ListInstancesResponse", "ListNodeTypesRequest", diff --git a/scaleway-async/scaleway_async/mongodb/v1/api.py b/scaleway-async/scaleway_async/mongodb/v1/api.py index 381d12b4e..438aded2e 100644 --- a/scaleway-async/scaleway_async/mongodb/v1/api.py +++ b/scaleway-async/scaleway_async/mongodb/v1/api.py @@ -18,6 +18,7 @@ wait_for_resource_async, ) from .types import ( + ListDatabasesRequestOrderBy, ListInstancesRequestOrderBy, ListSnapshotsRequestOrderBy, ListUsersRequestOrderBy, @@ -26,9 +27,11 @@ CreateInstanceRequest, CreateSnapshotRequest, CreateUserRequest, + Database, Endpoint, EndpointSpec, Instance, + ListDatabasesResponse, ListInstancesResponse, ListNodeTypesResponse, ListSnapshotsResponse, @@ -56,6 +59,7 @@ unmarshal_Instance, unmarshal_Snapshot, unmarshal_User, + unmarshal_ListDatabasesResponse, unmarshal_ListInstancesResponse, unmarshal_ListNodeTypesResponse, unmarshal_ListSnapshotsResponse, @@ -1269,6 +1273,91 @@ async def set_user_role( self._throw_on_error(res) return unmarshal_User(res.json()) + async def list_databases( + self, + *, + instance_id: str, + region: Optional[ScwRegion] = None, + order_by: Optional[ListDatabasesRequestOrderBy] = None, + page: Optional[int] = None, + page_size: Optional[int] = None, + ) -> ListDatabasesResponse: + """ + List databases in a Database Instance. + List all databases of a given Database Instance. + :param instance_id: UUID of the Database Instance. + :param region: Region to target. If none is passed will use default region from the config. + :param order_by: Criteria to use when requesting user listing. + :param page: + :param page_size: + :return: :class:`ListDatabasesResponse ` + + Usage: + :: + + result = await api.list_databases( + instance_id="example", + ) + """ + + param_region = validate_path_param( + "region", region or self.client.default_region + ) + param_instance_id = validate_path_param("instance_id", instance_id) + + res = self._request( + "GET", + f"/mongodb/v1/regions/{param_region}/instances/{param_instance_id}/databases", + params={ + "order_by": order_by, + "page": page, + "page_size": page_size or self.client.default_page_size, + }, + ) + + self._throw_on_error(res) + return unmarshal_ListDatabasesResponse(res.json()) + + async def list_databases_all( + self, + *, + instance_id: str, + region: Optional[ScwRegion] = None, + order_by: Optional[ListDatabasesRequestOrderBy] = None, + page: Optional[int] = None, + page_size: Optional[int] = None, + ) -> List[Database]: + """ + List databases in a Database Instance. + List all databases of a given Database Instance. + :param instance_id: UUID of the Database Instance. + :param region: Region to target. If none is passed will use default region from the config. + :param order_by: Criteria to use when requesting user listing. + :param page: + :param page_size: + :return: :class:`List[Database] ` + + Usage: + :: + + result = await api.list_databases_all( + instance_id="example", + ) + """ + + return await fetch_all_pages_async( + type=ListDatabasesResponse, + key="databases", + fetcher=self.list_databases, + args={ + "instance_id": instance_id, + "region": region, + "order_by": order_by, + "page": page, + "page_size": page_size, + }, + ) + async def delete_endpoint( self, *, diff --git a/scaleway-async/scaleway_async/mongodb/v1/marshalling.py b/scaleway-async/scaleway_async/mongodb/v1/marshalling.py index ecef2c1e8..9d4184b4f 100644 --- a/scaleway-async/scaleway_async/mongodb/v1/marshalling.py +++ b/scaleway-async/scaleway_async/mongodb/v1/marshalling.py @@ -19,6 +19,8 @@ Snapshot, UserRole, User, + Database, + ListDatabasesResponse, ListInstancesResponse, NodeTypeVolumeType, NodeType, @@ -350,6 +352,42 @@ def unmarshal_User(data: Any) -> User: return User(**args) +def unmarshal_Database(data: Any) -> Database: + if not isinstance(data, dict): + raise TypeError( + "Unmarshalling the type 'Database' failed as data isn't a dictionary." + ) + + args: Dict[str, Any] = {} + + field = data.get("name", None) + if field is not None: + args["name"] = field + + return Database(**args) + + +def unmarshal_ListDatabasesResponse(data: Any) -> ListDatabasesResponse: + if not isinstance(data, dict): + raise TypeError( + "Unmarshalling the type 'ListDatabasesResponse' failed as data isn't a dictionary." + ) + + args: Dict[str, Any] = {} + + field = data.get("databases", None) + if field is not None: + args["databases"] = ( + [unmarshal_Database(v) for v in field] if field is not None else None + ) + + field = data.get("total_count", None) + if field is not None: + args["total_count"] = field + + return ListDatabasesResponse(**args) + + def unmarshal_ListInstancesResponse(data: Any) -> ListInstancesResponse: if not isinstance(data, dict): raise TypeError( @@ -589,8 +627,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public_network", request.public_network), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkDetails, + ), ] ), ) @@ -731,8 +777,14 @@ def marshal_UserRole( output.update( resolve_one_of( [ - OneOfPossibility("database_name", request.database_name), - OneOfPossibility("any_database", request.any_database), + OneOfPossibility( + param="database_name", + value=request.database_name, + marshal_func=None, + ), + OneOfPossibility( + param="any_database", value=request.any_database, marshal_func=None + ), ] ), ) @@ -821,7 +873,11 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_size_bytes", request.volume_size_bytes), + OneOfPossibility( + param="volume_size_bytes", + value=request.volume_size_bytes, + marshal_func=None, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/mongodb/v1/types.py b/scaleway-async/scaleway_async/mongodb/v1/types.py index f8aa2c08e..fa3193f51 100644 --- a/scaleway-async/scaleway_async/mongodb/v1/types.py +++ b/scaleway-async/scaleway_async/mongodb/v1/types.py @@ -30,6 +30,14 @@ def __str__(self) -> str: return str(self.value) +class ListDatabasesRequestOrderBy(str, Enum, metaclass=StrEnumMeta): + NAME_ASC = "name_asc" + NAME_DESC = "name_desc" + + def __str__(self) -> str: + return str(self.value) + + class ListInstancesRequestOrderBy(str, Enum, metaclass=StrEnumMeta): CREATED_AT_ASC = "created_at_asc" CREATED_AT_DESC = "created_at_desc" @@ -234,6 +242,11 @@ class EndpointSpec: private_network: Optional[EndpointSpecPrivateNetworkDetails] +@dataclass +class Database: + name: str + + @dataclass class Instance: id: str @@ -662,6 +675,41 @@ class GetSnapshotRequest: """ +@dataclass +class ListDatabasesRequest: + instance_id: str + """ + UUID of the Database Instance. + """ + + region: Optional[ScwRegion] + """ + Region to target. If none is passed will use default region from the config. + """ + + order_by: Optional[ListDatabasesRequestOrderBy] + """ + Criteria to use when requesting user listing. + """ + + page: Optional[int] + + page_size: Optional[int] + + +@dataclass +class ListDatabasesResponse: + databases: List[Database] + """ + List of the databases. + """ + + total_count: int + """ + Total count of databases present on a Database Instance. + """ + + @dataclass class ListInstancesRequest: region: Optional[ScwRegion] diff --git a/scaleway-async/scaleway_async/mongodb/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/mongodb/v1alpha1/marshalling.py index 4f2bef5ed..e058309e7 100644 --- a/scaleway-async/scaleway_async/mongodb/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/mongodb/v1alpha1/marshalling.py @@ -707,8 +707,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public", request.public), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public", + value=request.public, + marshal_func=marshal_EndpointSpecPublicDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkDetails, + ), ] ), ) @@ -862,8 +870,12 @@ def marshal_UserRole( output.update( resolve_one_of( [ - OneOfPossibility("database", request.database), - OneOfPossibility("any_database", request.any_database), + OneOfPossibility( + param="database", value=request.database, marshal_func=None + ), + OneOfPossibility( + param="any_database", value=request.any_database, marshal_func=None + ), ] ), ) @@ -939,7 +951,9 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_size", request.volume_size), + OneOfPossibility( + param="volume_size", value=request.volume_size, marshal_func=None + ), ] ), ) diff --git a/scaleway-async/scaleway_async/qaas/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/qaas/v1alpha1/marshalling.py index e9c93d251..35fd793a4 100644 --- a/scaleway-async/scaleway_async/qaas/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/qaas/v1alpha1/marshalling.py @@ -843,8 +843,16 @@ def marshal_JobCircuit( output.update( resolve_one_of( [ - OneOfPossibility("perceval_circuit", request.perceval_circuit), - OneOfPossibility("qiskit_circuit", request.qiskit_circuit), + OneOfPossibility( + param="perceval_circuit", + value=request.perceval_circuit, + marshal_func=None, + ), + OneOfPossibility( + param="qiskit_circuit", + value=request.qiskit_circuit, + marshal_func=None, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/rdb/v1/marshalling.py b/scaleway-async/scaleway_async/rdb/v1/marshalling.py index 5b46fbca4..7c47f87d0 100644 --- a/scaleway-async/scaleway_async/rdb/v1/marshalling.py +++ b/scaleway-async/scaleway_async/rdb/v1/marshalling.py @@ -1669,8 +1669,14 @@ def marshal_EndpointSpecPrivateNetwork( output.update( resolve_one_of( [ - OneOfPossibility("service_ip", request.service_ip), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="service_ip", value=request.service_ip, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_EndpointSpecPrivateNetworkIpamConfig, + ), ] ), ) @@ -1689,8 +1695,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("load_balancer", request.load_balancer), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="load_balancer", + value=request.load_balancer, + marshal_func=marshal_EndpointSpecLoadBalancer, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetwork, + ), ] ), ) @@ -1749,12 +1763,16 @@ def marshal_CreateInstanceRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -1835,8 +1853,14 @@ def marshal_ReadReplicaEndpointSpecPrivateNetwork( output.update( resolve_one_of( [ - OneOfPossibility("service_ip", request.service_ip), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="service_ip", value=request.service_ip, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_ReadReplicaEndpointSpecPrivateNetworkIpamConfig, + ), ] ), ) @@ -1855,8 +1879,16 @@ def marshal_ReadReplicaEndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("direct_access", request.direct_access), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="direct_access", + value=request.direct_access, + marshal_func=marshal_ReadReplicaEndpointSpecDirectAccess, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_ReadReplicaEndpointSpecPrivateNetwork, + ), ] ), ) @@ -2173,17 +2205,33 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("node_type", request.node_type), - OneOfPossibility("enable_ha", request.enable_ha), - OneOfPossibility("volume_size", request.volume_size), - OneOfPossibility("volume_type", request.volume_type), OneOfPossibility( - "upgradable_version_id", request.upgradable_version_id + param="node_type", value=request.node_type, marshal_func=None + ), + OneOfPossibility( + param="enable_ha", value=request.enable_ha, marshal_func=None + ), + OneOfPossibility( + param="volume_size", value=request.volume_size, marshal_func=None + ), + OneOfPossibility( + param="volume_type", value=request.volume_type, marshal_func=None + ), + OneOfPossibility( + param="upgradable_version_id", + value=request.upgradable_version_id, + marshal_func=None, + ), + OneOfPossibility( + param="major_upgrade_workflow", + value=request.major_upgrade_workflow, + marshal_func=marshal_UpgradeInstanceRequestMajorUpgradeWorkflow, ), OneOfPossibility( - "major_upgrade_workflow", request.major_upgrade_workflow + param="enable_encryption", + value=request.enable_encryption, + marshal_func=None, ), - OneOfPossibility("enable_encryption", request.enable_encryption), ] ), ) diff --git a/scaleway-async/scaleway_async/redis/v1/marshalling.py b/scaleway-async/scaleway_async/redis/v1/marshalling.py index 91b1befdd..7f9727b06 100644 --- a/scaleway-async/scaleway_async/redis/v1/marshalling.py +++ b/scaleway-async/scaleway_async/redis/v1/marshalling.py @@ -667,8 +667,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("private_network", request.private_network), - OneOfPossibility("public_network", request.public_network), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkSpec, + ), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkSpec, + ), ] ), ) @@ -749,9 +757,15 @@ def marshal_MigrateClusterRequest( output.update( resolve_one_of( [ - OneOfPossibility("version", request.version), - OneOfPossibility("node_type", request.node_type), - OneOfPossibility("cluster_size", request.cluster_size), + OneOfPossibility( + param="version", value=request.version, marshal_func=None + ), + OneOfPossibility( + param="node_type", value=request.node_type, marshal_func=None + ), + OneOfPossibility( + param="cluster_size", value=request.cluster_size, marshal_func=None + ), ] ), ) @@ -830,8 +844,16 @@ def marshal_UpdateEndpointRequest( output.update( resolve_one_of( [ - OneOfPossibility("private_network", request.private_network), - OneOfPossibility("public_network", request.public_network), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkSpec, + ), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkSpec, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/registry/v1/marshalling.py b/scaleway-async/scaleway_async/registry/v1/marshalling.py index 1ffa9c7f1..1ac359a95 100644 --- a/scaleway-async/scaleway_async/registry/v1/marshalling.py +++ b/scaleway-async/scaleway_async/registry/v1/marshalling.py @@ -263,12 +263,16 @@ def marshal_CreateNamespaceRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway-async/scaleway_async/test/v1/marshalling.py b/scaleway-async/scaleway_async/test/v1/marshalling.py index 6c3c3e84c..c8a19fb63 100644 --- a/scaleway-async/scaleway_async/test/v1/marshalling.py +++ b/scaleway-async/scaleway_async/test/v1/marshalling.py @@ -143,12 +143,16 @@ def marshal_CreateHumanRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py b/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py index ef34334dc..56aeb3ac7 100644 --- a/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py +++ b/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py @@ -796,10 +796,22 @@ def marshal_CreateGatewayNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("dhcp", request.dhcp), - OneOfPossibility("address", request.address), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="dhcp_id", value=request.dhcp_id, marshal_func=None + ), + OneOfPossibility( + param="dhcp", + value=request.dhcp, + marshal_func=marshal_CreateDHCPRequest, + ), + OneOfPossibility( + param="address", value=request.address, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_CreateGatewayNetworkRequestIpamConfig, + ), ] ), ) @@ -1048,9 +1060,17 @@ def marshal_UpdateGatewayNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="dhcp_id", value=request.dhcp_id, marshal_func=None + ), + OneOfPossibility( + param="address", value=request.address, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_UpdateGatewayNetworkRequestIpamConfig, + ), ] ), ) diff --git a/scaleway-async/scaleway_async/webhosting/v1/marshalling.py b/scaleway-async/scaleway_async/webhosting/v1/marshalling.py index 901528da9..e4a4db9f9 100644 --- a/scaleway-async/scaleway_async/webhosting/v1/marshalling.py +++ b/scaleway-async/scaleway_async/webhosting/v1/marshalling.py @@ -1083,8 +1083,16 @@ def marshal_DatabaseApiCreateDatabaseRequest( output.update( resolve_one_of( [ - OneOfPossibility("new_user", request.new_user), - OneOfPossibility("existing_username", request.existing_username), + OneOfPossibility( + param="new_user", + value=request.new_user, + marshal_func=marshal_CreateDatabaseRequestUser, + ), + OneOfPossibility( + param="existing_username", + value=request.existing_username, + marshal_func=None, + ), ] ), ) diff --git a/scaleway/scaleway/account/v3/marshalling.py b/scaleway/scaleway/account/v3/marshalling.py index 2875dfa32..f9262972b 100644 --- a/scaleway/scaleway/account/v3/marshalling.py +++ b/scaleway/scaleway/account/v3/marshalling.py @@ -637,17 +637,51 @@ def marshal_Qualification( output.update( resolve_one_of( [ - OneOfPossibility("host_website", request.host_website), - OneOfPossibility("host_application", request.host_application), - OneOfPossibility("deploy_software", request.deploy_software), OneOfPossibility( - "set_scaleway_environment", request.set_scaleway_environment + param="host_website", + value=request.host_website, + marshal_func=marshal_QualificationHostWebsite, + ), + OneOfPossibility( + param="host_application", + value=request.host_application, + marshal_func=marshal_QualificationHostApplication, + ), + OneOfPossibility( + param="deploy_software", + value=request.deploy_software, + marshal_func=marshal_QualificationDeploySoftware, + ), + OneOfPossibility( + param="set_scaleway_environment", + value=request.set_scaleway_environment, + marshal_func=marshal_QualificationSetScalewayEnvironment, + ), + OneOfPossibility( + param="ai_machine", + value=request.ai_machine, + marshal_func=marshal_QualificationAiMachine, + ), + OneOfPossibility( + param="container", + value=request.container, + marshal_func=marshal_QualificationContainer, + ), + OneOfPossibility( + param="archive_data", + value=request.archive_data, + marshal_func=marshal_QualificationArchiveData, + ), + OneOfPossibility( + param="share_data", + value=request.share_data, + marshal_func=marshal_QualificationShareData, + ), + OneOfPossibility( + param="other_use_case", + value=request.other_use_case, + marshal_func=marshal_QualificationOtherUseCase, ), - OneOfPossibility("ai_machine", request.ai_machine), - OneOfPossibility("container", request.container), - OneOfPossibility("archive_data", request.archive_data), - OneOfPossibility("share_data", request.share_data), - OneOfPossibility("other_use_case", request.other_use_case), ] ), ) diff --git a/scaleway/scaleway/autoscaling/v1alpha1/marshalling.py b/scaleway/scaleway/autoscaling/v1alpha1/marshalling.py index 0558608f9..7db33fe14 100644 --- a/scaleway/scaleway/autoscaling/v1alpha1/marshalling.py +++ b/scaleway/scaleway/autoscaling/v1alpha1/marshalling.py @@ -610,8 +610,16 @@ def marshal_Metric( output.update( resolve_one_of( [ - OneOfPossibility("managed_metric", request.managed_metric), - OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name), + OneOfPossibility( + param="managed_metric", + value=request.managed_metric, + marshal_func=None, + ), + OneOfPossibility( + param="cockpit_metric_name", + value=request.cockpit_metric_name, + marshal_func=None, + ), ] ), ) @@ -642,7 +650,9 @@ def marshal_CreateInstancePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("metric", request.metric), + OneOfPossibility( + param="metric", value=request.metric, marshal_func=marshal_Metric + ), ] ), ) @@ -703,15 +713,25 @@ def marshal_VolumeInstanceTemplate( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_VolumeInstanceTemplateFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_VolumeInstanceTemplateFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) @@ -842,8 +862,16 @@ def marshal_UpdateInstancePolicyRequestMetric( output.update( resolve_one_of( [ - OneOfPossibility("managed_metric", request.managed_metric), - OneOfPossibility("cockpit_metric_name", request.cockpit_metric_name), + OneOfPossibility( + param="managed_metric", + value=request.managed_metric, + marshal_func=None, + ), + OneOfPossibility( + param="cockpit_metric_name", + value=request.cockpit_metric_name, + marshal_func=None, + ), ] ), ) @@ -874,7 +902,11 @@ def marshal_UpdateInstancePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("metric", request.metric), + OneOfPossibility( + param="metric", + value=request.metric, + marshal_func=marshal_UpdateInstancePolicyRequestMetric, + ), ] ), ) diff --git a/scaleway/scaleway/baremetal/v1/marshalling.py b/scaleway/scaleway/baremetal/v1/marshalling.py index e22b70f7f..6420591fc 100644 --- a/scaleway/scaleway/baremetal/v1/marshalling.py +++ b/scaleway/scaleway/baremetal/v1/marshalling.py @@ -1575,12 +1575,16 @@ def marshal_CreateServerRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway/scaleway/block/v1/marshalling.py b/scaleway/scaleway/block/v1/marshalling.py index d1aef6680..31e50d261 100644 --- a/scaleway/scaleway/block/v1/marshalling.py +++ b/scaleway/scaleway/block/v1/marshalling.py @@ -418,15 +418,25 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_CreateVolumeRequestFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_CreateVolumeRequestFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/block/v1alpha1/marshalling.py b/scaleway/scaleway/block/v1alpha1/marshalling.py index e7289e492..a2ae2b31e 100644 --- a/scaleway/scaleway/block/v1alpha1/marshalling.py +++ b/scaleway/scaleway/block/v1alpha1/marshalling.py @@ -419,15 +419,25 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("from_empty", request.from_empty), - OneOfPossibility("from_snapshot", request.from_snapshot), + OneOfPossibility( + param="from_empty", + value=request.from_empty, + marshal_func=marshal_CreateVolumeRequestFromEmpty, + ), + OneOfPossibility( + param="from_snapshot", + value=request.from_snapshot, + marshal_func=marshal_CreateVolumeRequestFromSnapshot, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("perf_iops", request.perf_iops), + OneOfPossibility( + param="perf_iops", value=request.perf_iops, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/cockpit/v1/marshalling.py b/scaleway/scaleway/cockpit/v1/marshalling.py index 3bea9a117..c40e5ff04 100644 --- a/scaleway/scaleway/cockpit/v1/marshalling.py +++ b/scaleway/scaleway/cockpit/v1/marshalling.py @@ -910,7 +910,11 @@ def marshal_RegionalApiCreateContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) @@ -971,7 +975,11 @@ def marshal_RegionalApiDeleteContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) @@ -1080,7 +1088,11 @@ def marshal_RegionalApiUpdateContactPointRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), + OneOfPossibility( + param="email", + value=request.email, + marshal_func=marshal_ContactPointEmail, + ), ] ), ) diff --git a/scaleway/scaleway/container/v1beta1/marshalling.py b/scaleway/scaleway/container/v1beta1/marshalling.py index 90e7258c8..3e059aede 100644 --- a/scaleway/scaleway/container/v1beta1/marshalling.py +++ b/scaleway/scaleway/container/v1beta1/marshalling.py @@ -839,8 +839,16 @@ def marshal_ContainerHealthCheckSpec( output.update( resolve_one_of( [ - OneOfPossibility("http", request.http), - OneOfPossibility("tcp", request.tcp), + OneOfPossibility( + param="http", + value=request.http, + marshal_func=marshal_ContainerHealthCheckSpecHTTPProbe, + ), + OneOfPossibility( + param="tcp", + value=request.tcp, + marshal_func=marshal_ContainerHealthCheckSpecTCPProbe, + ), ] ), ) @@ -863,12 +871,19 @@ def marshal_ContainerScalingOption( resolve_one_of( [ OneOfPossibility( - "concurrent_requests_threshold", - request.concurrent_requests_threshold, + param="concurrent_requests_threshold", + value=request.concurrent_requests_threshold, + marshal_func=None, ), - OneOfPossibility("cpu_usage_threshold", request.cpu_usage_threshold), OneOfPossibility( - "memory_usage_threshold", request.memory_usage_threshold + param="cpu_usage_threshold", + value=request.cpu_usage_threshold, + marshal_func=None, + ), + OneOfPossibility( + param="memory_usage_threshold", + value=request.memory_usage_threshold, + marshal_func=None, ), ] ), @@ -1057,8 +1072,12 @@ def marshal_CreateTokenRequest( output.update( resolve_one_of( [ - OneOfPossibility("container_id", request.container_id), - OneOfPossibility("namespace_id", request.namespace_id), + OneOfPossibility( + param="container_id", value=request.container_id, marshal_func=None + ), + OneOfPossibility( + param="namespace_id", value=request.namespace_id, marshal_func=None + ), ] ), ) @@ -1140,9 +1159,21 @@ def marshal_CreateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("scw_sqs_config", request.scw_sqs_config), - OneOfPossibility("scw_nats_config", request.scw_nats_config), - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="scw_sqs_config", + value=request.scw_sqs_config, + marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig, + ), + OneOfPossibility( + param="scw_nats_config", + value=request.scw_nats_config, + marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig, + ), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_CreateTriggerRequestSqsClientConfig, + ), ] ), ) @@ -1312,7 +1343,11 @@ def marshal_UpdateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_UpdateTriggerRequestSqsClientConfig, + ), ] ), ) diff --git a/scaleway/scaleway/domain/v2beta1/marshalling.py b/scaleway/scaleway/domain/v2beta1/marshalling.py index 00214b0ec..079c77d2e 100644 --- a/scaleway/scaleway/domain/v2beta1/marshalling.py +++ b/scaleway/scaleway/domain/v2beta1/marshalling.py @@ -2251,7 +2251,11 @@ def marshal_ImportProviderDNSZoneRequest( output.update( resolve_one_of( [ - OneOfPossibility("online_v1", request.online_v1), + OneOfPossibility( + param="online_v1", + value=request.online_v1, + marshal_func=marshal_ImportProviderDNSZoneRequestOnlineV1, + ), ] ), ) @@ -2314,8 +2318,16 @@ def marshal_ImportRawDNSZoneRequest( output.update( resolve_one_of( [ - OneOfPossibility("bind_source", request.bind_source), - OneOfPossibility("axfr_source", request.axfr_source), + OneOfPossibility( + param="bind_source", + value=request.bind_source, + marshal_func=marshal_ImportRawDNSZoneRequestBindSource, + ), + OneOfPossibility( + param="axfr_source", + value=request.axfr_source, + marshal_func=marshal_ImportRawDNSZoneRequestAXFRSource, + ), ] ), ) @@ -2433,11 +2445,31 @@ def marshal_ContactExtensionFR( output.update( resolve_one_of( [ - OneOfPossibility("individual_info", request.individual_info), - OneOfPossibility("duns_info", request.duns_info), - OneOfPossibility("association_info", request.association_info), - OneOfPossibility("trademark_info", request.trademark_info), - OneOfPossibility("code_auth_afnic_info", request.code_auth_afnic_info), + OneOfPossibility( + param="individual_info", + value=request.individual_info, + marshal_func=marshal_ContactExtensionFRIndividualInfo, + ), + OneOfPossibility( + param="duns_info", + value=request.duns_info, + marshal_func=marshal_ContactExtensionFRDunsInfo, + ), + OneOfPossibility( + param="association_info", + value=request.association_info, + marshal_func=marshal_ContactExtensionFRAssociationInfo, + ), + OneOfPossibility( + param="trademark_info", + value=request.trademark_info, + marshal_func=marshal_ContactExtensionFRTrademarkInfo, + ), + OneOfPossibility( + param="code_auth_afnic_info", + value=request.code_auth_afnic_info, + marshal_func=marshal_ContactExtensionFRCodeAuthAfnicInfo, + ), ] ), ) @@ -2574,8 +2606,16 @@ def marshal_RegistrarApiBuyDomainsRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2583,10 +2623,14 @@ def marshal_RegistrarApiBuyDomainsRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2594,8 +2638,16 @@ def marshal_RegistrarApiBuyDomainsRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2620,8 +2672,16 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2629,10 +2689,14 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2640,8 +2704,16 @@ def marshal_RegistrarApiCheckContactsCompatibilityRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2708,8 +2780,16 @@ def marshal_DSRecord( output.update( resolve_one_of( [ - OneOfPossibility("digest", request.digest), - OneOfPossibility("public_key", request.public_key), + OneOfPossibility( + param="digest", + value=request.digest, + marshal_func=marshal_DSRecordDigest, + ), + OneOfPossibility( + param="public_key", + value=request.public_key, + marshal_func=marshal_DSRecordPublicKey, + ), ] ), ) @@ -2776,8 +2856,16 @@ def marshal_RegistrarApiTradeDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("new_owner_contact_id", request.new_owner_contact_id), - OneOfPossibility("new_owner_contact", request.new_owner_contact), + OneOfPossibility( + param="new_owner_contact_id", + value=request.new_owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="new_owner_contact", + value=request.new_owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2811,8 +2899,16 @@ def marshal_RegistrarApiTransferInDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2820,10 +2916,14 @@ def marshal_RegistrarApiTransferInDomainRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -2831,8 +2931,16 @@ def marshal_RegistrarApiTransferInDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2959,16 +3067,32 @@ def marshal_RegistrarApiUpdateDomainRequest( output.update( resolve_one_of( [ - OneOfPossibility("technical_contact_id", request.technical_contact_id), - OneOfPossibility("technical_contact", request.technical_contact), + OneOfPossibility( + param="technical_contact_id", + value=request.technical_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="technical_contact", + value=request.technical_contact, + marshal_func=marshal_NewContact, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("owner_contact_id", request.owner_contact_id), - OneOfPossibility("owner_contact", request.owner_contact), + OneOfPossibility( + param="owner_contact_id", + value=request.owner_contact_id, + marshal_func=None, + ), + OneOfPossibility( + param="owner_contact", + value=request.owner_contact, + marshal_func=marshal_NewContact, + ), ] ), ) @@ -2976,10 +3100,14 @@ def marshal_RegistrarApiUpdateDomainRequest( resolve_one_of( [ OneOfPossibility( - "administrative_contact_id", request.administrative_contact_id + param="administrative_contact_id", + value=request.administrative_contact_id, + marshal_func=None, ), OneOfPossibility( - "administrative_contact", request.administrative_contact + param="administrative_contact", + value=request.administrative_contact, + marshal_func=marshal_NewContact, ), ] ), @@ -3141,10 +3269,26 @@ def marshal_Record( output.update( resolve_one_of( [ - OneOfPossibility("geo_ip_config", request.geo_ip_config), - OneOfPossibility("http_service_config", request.http_service_config), - OneOfPossibility("weighted_config", request.weighted_config), - OneOfPossibility("view_config", request.view_config), + OneOfPossibility( + param="geo_ip_config", + value=request.geo_ip_config, + marshal_func=marshal_RecordGeoIPConfig, + ), + OneOfPossibility( + param="http_service_config", + value=request.http_service_config, + marshal_func=marshal_RecordHTTPServiceConfig, + ), + OneOfPossibility( + param="weighted_config", + value=request.weighted_config, + marshal_func=marshal_RecordWeightedConfig, + ), + OneOfPossibility( + param="view_config", + value=request.view_config, + marshal_func=marshal_RecordViewConfig, + ), ] ), ) @@ -3223,8 +3367,12 @@ def marshal_RecordChangeDelete( output.update( resolve_one_of( [ - OneOfPossibility("id", request.id), - OneOfPossibility("id_fields", request.id_fields), + OneOfPossibility(param="id", value=request.id, marshal_func=None), + OneOfPossibility( + param="id_fields", + value=request.id_fields, + marshal_func=marshal_RecordIdentifier, + ), ] ), ) @@ -3240,8 +3388,12 @@ def marshal_RecordChangeSet( output.update( resolve_one_of( [ - OneOfPossibility("id", request.id), - OneOfPossibility("id_fields", request.id_fields), + OneOfPossibility(param="id", value=request.id, marshal_func=None), + OneOfPossibility( + param="id_fields", + value=request.id_fields, + marshal_func=marshal_RecordIdentifier, + ), ] ), ) @@ -3260,10 +3412,24 @@ def marshal_RecordChange( output.update( resolve_one_of( [ - OneOfPossibility("add", request.add), - OneOfPossibility("set", request.set_), - OneOfPossibility("delete", request.delete), - OneOfPossibility("clear", request.clear), + OneOfPossibility( + param="add", value=request.add, marshal_func=marshal_RecordChangeAdd + ), + OneOfPossibility( + param="set", + value=request.set_, + marshal_func=marshal_RecordChangeSet, + ), + OneOfPossibility( + param="delete", + value=request.delete, + marshal_func=marshal_RecordChangeDelete, + ), + OneOfPossibility( + param="clear", + value=request.clear, + marshal_func=marshal_RecordChangeClear, + ), ] ), ) diff --git a/scaleway/scaleway/edge_services/v1beta1/marshalling.py b/scaleway/scaleway/edge_services/v1beta1/marshalling.py index 016b8326d..d70c3e757 100644 --- a/scaleway/scaleway/edge_services/v1beta1/marshalling.py +++ b/scaleway/scaleway/edge_services/v1beta1/marshalling.py @@ -1329,14 +1329,22 @@ def marshal_SetRouteRulesRequestRouteRule( output.update( resolve_one_of( [ - OneOfPossibility("rule_http_match", request.rule_http_match), + OneOfPossibility( + param="rule_http_match", + value=request.rule_http_match, + marshal_func=marshal_RuleHttpMatch, + ), ] ), ) output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1352,8 +1360,16 @@ def marshal_AddRouteRulesRequest( output.update( resolve_one_of( [ - OneOfPossibility("after_position", request.after_position), - OneOfPossibility("before_position", request.before_position), + OneOfPossibility( + param="after_position", + value=request.after_position, + marshal_func=None, + ), + OneOfPossibility( + param="before_position", + value=request.before_position, + marshal_func=None, + ), ] ), ) @@ -1444,8 +1460,12 @@ def marshal_CheckPEMChainRequest( output.update( resolve_one_of( [ - OneOfPossibility("secret", request.secret), - OneOfPossibility("raw", request.raw), + OneOfPossibility( + param="secret", + value=request.secret, + marshal_func=marshal_CheckPEMChainRequestSecretChain, + ), + OneOfPossibility(param="raw", value=request.raw, marshal_func=None), ] ), ) @@ -1497,8 +1517,16 @@ def marshal_CreateBackendStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("scaleway_s3", request.scaleway_s3), - OneOfPossibility("scaleway_lb", request.scaleway_lb), + OneOfPossibility( + param="scaleway_s3", + value=request.scaleway_s3, + marshal_func=marshal_ScalewayS3BackendConfig, + ), + OneOfPossibility( + param="scaleway_lb", + value=request.scaleway_lb, + marshal_func=marshal_ScalewayLbBackendConfig, + ), ] ), ) @@ -1514,9 +1542,19 @@ def marshal_CreateCacheStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), ] ), ) @@ -1538,9 +1576,19 @@ def marshal_CreateDNSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("tls_stage_id", request.tls_stage_id), - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="tls_stage_id", value=request.tls_stage_id, marshal_func=None + ), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1577,8 +1625,10 @@ def marshal_CreatePurgeRequestRequest( output.update( resolve_one_of( [ - OneOfPossibility("assets", request.assets), - OneOfPossibility("all", request.all), + OneOfPossibility( + param="assets", value=request.assets, marshal_func=None + ), + OneOfPossibility(param="all", value=request.all, marshal_func=None), ] ), ) @@ -1597,7 +1647,9 @@ def marshal_CreateRouteStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1628,10 +1680,24 @@ def marshal_CreateTLSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1655,7 +1721,11 @@ def marshal_CreateWafStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1731,9 +1801,21 @@ def marshal_SetHeadStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("add_new_head_stage", request.add_new_head_stage), - OneOfPossibility("remove_head_stage", request.remove_head_stage), - OneOfPossibility("swap_head_stage", request.swap_head_stage), + OneOfPossibility( + param="add_new_head_stage", + value=request.add_new_head_stage, + marshal_func=marshal_SetHeadStageRequestAddNewHeadStage, + ), + OneOfPossibility( + param="remove_head_stage", + value=request.remove_head_stage, + marshal_func=marshal_SetHeadStageRequestRemoveHeadStage, + ), + OneOfPossibility( + param="swap_head_stage", + value=request.swap_head_stage, + marshal_func=marshal_SetHeadStageRequestSwapHeadStage, + ), ] ), ) @@ -1764,8 +1846,16 @@ def marshal_UpdateBackendStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("scaleway_s3", request.scaleway_s3), - OneOfPossibility("scaleway_lb", request.scaleway_lb), + OneOfPossibility( + param="scaleway_s3", + value=request.scaleway_s3, + marshal_func=marshal_ScalewayS3BackendConfig, + ), + OneOfPossibility( + param="scaleway_lb", + value=request.scaleway_lb, + marshal_func=marshal_ScalewayLbBackendConfig, + ), ] ), ) @@ -1784,9 +1874,19 @@ def marshal_UpdateCacheStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), ] ), ) @@ -1808,9 +1908,19 @@ def marshal_UpdateDNSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("tls_stage_id", request.tls_stage_id), - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="tls_stage_id", value=request.tls_stage_id, marshal_func=None + ), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) @@ -1844,7 +1954,9 @@ def marshal_UpdateRouteStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1874,10 +1986,24 @@ def marshal_UpdateTLSStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("cache_stage_id", request.cache_stage_id), - OneOfPossibility("backend_stage_id", request.backend_stage_id), - OneOfPossibility("route_stage_id", request.route_stage_id), - OneOfPossibility("waf_stage_id", request.waf_stage_id), + OneOfPossibility( + param="cache_stage_id", + value=request.cache_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="route_stage_id", + value=request.route_stage_id, + marshal_func=None, + ), + OneOfPossibility( + param="waf_stage_id", value=request.waf_stage_id, marshal_func=None + ), ] ), ) @@ -1901,7 +2027,11 @@ def marshal_UpdateWafStageRequest( output.update( resolve_one_of( [ - OneOfPossibility("backend_stage_id", request.backend_stage_id), + OneOfPossibility( + param="backend_stage_id", + value=request.backend_stage_id, + marshal_func=None, + ), ] ), ) diff --git a/scaleway/scaleway/function/v1beta1/marshalling.py b/scaleway/scaleway/function/v1beta1/marshalling.py index 2f34c0b02..2d4accbd8 100644 --- a/scaleway/scaleway/function/v1beta1/marshalling.py +++ b/scaleway/scaleway/function/v1beta1/marshalling.py @@ -958,8 +958,12 @@ def marshal_CreateTokenRequest( output.update( resolve_one_of( [ - OneOfPossibility("function_id", request.function_id), - OneOfPossibility("namespace_id", request.namespace_id), + OneOfPossibility( + param="function_id", value=request.function_id, marshal_func=None + ), + OneOfPossibility( + param="namespace_id", value=request.namespace_id, marshal_func=None + ), ] ), ) @@ -1041,9 +1045,21 @@ def marshal_CreateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("scw_sqs_config", request.scw_sqs_config), - OneOfPossibility("scw_nats_config", request.scw_nats_config), - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="scw_sqs_config", + value=request.scw_sqs_config, + marshal_func=marshal_CreateTriggerRequestMnqSqsClientConfig, + ), + OneOfPossibility( + param="scw_nats_config", + value=request.scw_nats_config, + marshal_func=marshal_CreateTriggerRequestMnqNatsClientConfig, + ), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_CreateTriggerRequestSqsClientConfig, + ), ] ), ) @@ -1185,7 +1201,11 @@ def marshal_UpdateTriggerRequest( output.update( resolve_one_of( [ - OneOfPossibility("sqs_config", request.sqs_config), + OneOfPossibility( + param="sqs_config", + value=request.sqs_config, + marshal_func=marshal_UpdateTriggerRequestSqsClientConfig, + ), ] ), ) diff --git a/scaleway/scaleway/iam/v1alpha1/marshalling.py b/scaleway/scaleway/iam/v1alpha1/marshalling.py index 1faf7d244..1ae7efd46 100644 --- a/scaleway/scaleway/iam/v1alpha1/marshalling.py +++ b/scaleway/scaleway/iam/v1alpha1/marshalling.py @@ -1365,8 +1365,14 @@ def marshal_AddGroupMemberRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), ] ), ) @@ -1412,8 +1418,14 @@ def marshal_CreateAPIKeyRequest( output.update( resolve_one_of( [ - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("user_id", request.user_id), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), ] ), ) @@ -1514,11 +1526,14 @@ def marshal_RuleSpecs( output.update( resolve_one_of( [ - OneOfPossibility("project_ids", request.project_ids), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="project_ids", value=request.project_ids, marshal_func=None + ), + OneOfPossibility( + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -1541,10 +1556,20 @@ def marshal_CreatePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("group_id", request.group_id), - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("no_principal", request.no_principal), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="group_id", value=request.group_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="no_principal", value=request.no_principal, marshal_func=None + ), ] ), ) @@ -1631,8 +1656,12 @@ def marshal_CreateUserRequest( output.update( resolve_one_of( [ - OneOfPossibility("email", request.email), - OneOfPossibility("member", request.member), + OneOfPossibility(param="email", value=request.email, marshal_func=None), + OneOfPossibility( + param="member", + value=request.member, + marshal_func=marshal_CreateUserRequestMember, + ), ] ), ) @@ -1668,8 +1697,14 @@ def marshal_RemoveGroupMemberRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), ] ), ) @@ -1823,10 +1858,20 @@ def marshal_UpdatePolicyRequest( output.update( resolve_one_of( [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("group_id", request.group_id), - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("no_principal", request.no_principal), + OneOfPossibility( + param="user_id", value=request.user_id, marshal_func=None + ), + OneOfPossibility( + param="group_id", value=request.group_id, marshal_func=None + ), + OneOfPossibility( + param="application_id", + value=request.application_id, + marshal_func=None, + ), + OneOfPossibility( + param="no_principal", value=request.no_principal, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/inference/v1/marshalling.py b/scaleway/scaleway/inference/v1/marshalling.py index 59057723e..8fc4b104f 100644 --- a/scaleway/scaleway/inference/v1/marshalling.py +++ b/scaleway/scaleway/inference/v1/marshalling.py @@ -507,8 +507,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public_network", request.public_network), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointPublicNetworkDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointPrivateNetworkDetails, + ), ] ), ) @@ -585,7 +593,9 @@ def marshal_ModelSource( output.update( resolve_one_of( [ - OneOfPossibility("secret", request.secret), + OneOfPossibility( + param="secret", value=request.secret, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/inference/v1beta1/marshalling.py b/scaleway/scaleway/inference/v1beta1/marshalling.py index 413ff7793..8930c95d9 100644 --- a/scaleway/scaleway/inference/v1beta1/marshalling.py +++ b/scaleway/scaleway/inference/v1beta1/marshalling.py @@ -565,8 +565,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public", request.public), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public", + value=request.public, + marshal_func=marshal_EndpointSpecPublic, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetwork, + ), ] ), ) diff --git a/scaleway/scaleway/instance/v1/marshalling.py b/scaleway/scaleway/instance/v1/marshalling.py index 9f0d7bf75..efcebf457 100644 --- a/scaleway/scaleway/instance/v1/marshalling.py +++ b/scaleway/scaleway/instance/v1/marshalling.py @@ -2824,8 +2824,12 @@ def marshal_ApplyBlockMigrationRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_id", request.volume_id), - OneOfPossibility("snapshot_id", request.snapshot_id), + OneOfPossibility( + param="volume_id", value=request.volume_id, marshal_func=None + ), + OneOfPossibility( + param="snapshot_id", value=request.snapshot_id, marshal_func=None + ), ] ), ) @@ -2889,12 +2893,16 @@ def marshal_VolumeTemplate( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2924,12 +2932,16 @@ def marshal_CreateImageRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2968,12 +2980,16 @@ def marshal_CreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3000,12 +3016,16 @@ def marshal_CreatePlacementGroupRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3056,12 +3076,16 @@ def marshal_CreateSecurityGroupRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3069,8 +3093,16 @@ def marshal_CreateSecurityGroupRequest( output.update( resolve_one_of( [ - OneOfPossibility("organization_default", request.organization_default), - OneOfPossibility("project_default", request.project_default), + OneOfPossibility( + param="organization_default", + value=request.organization_default, + marshal_func=None, + ), + OneOfPossibility( + param="project_default", + value=request.project_default, + marshal_func=None, + ), ] ), ) @@ -3174,12 +3206,16 @@ def marshal_CreateServerRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3247,12 +3283,16 @@ def marshal_CreateSnapshotRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3291,12 +3331,16 @@ def marshal_CreateVolumeRequest( resolve_one_of( [ OneOfPossibility( - "project", request.project, defaults.default_project_id + param="project", + value=request.project, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization", - request.organization, - defaults.default_organization_id, + param="organization", + value=request.organization, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -3304,8 +3348,12 @@ def marshal_CreateVolumeRequest( output.update( resolve_one_of( [ - OneOfPossibility("size", request.size), - OneOfPossibility("base_snapshot", request.base_snapshot), + OneOfPossibility(param="size", value=request.size, marshal_func=None), + OneOfPossibility( + param="base_snapshot", + value=request.base_snapshot, + marshal_func=None, + ), ] ), ) @@ -3369,8 +3417,12 @@ def marshal_PlanBlockMigrationRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_id", request.volume_id), - OneOfPossibility("snapshot_id", request.snapshot_id), + OneOfPossibility( + param="volume_id", value=request.volume_id, marshal_func=None + ), + OneOfPossibility( + param="snapshot_id", value=request.snapshot_id, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/interlink/v1beta1/marshalling.py b/scaleway/scaleway/interlink/v1beta1/marshalling.py index 7e01aa313..477ccc33b 100644 --- a/scaleway/scaleway/interlink/v1beta1/marshalling.py +++ b/scaleway/scaleway/interlink/v1beta1/marshalling.py @@ -572,8 +572,14 @@ def marshal_CreateLinkRequest( output.update( resolve_one_of( [ - OneOfPossibility("connection_id", request.connection_id), - OneOfPossibility("partner_id", request.partner_id), + OneOfPossibility( + param="connection_id", + value=request.connection_id, + marshal_func=None, + ), + OneOfPossibility( + param="partner_id", value=request.partner_id, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/iot/v1/marshalling.py b/scaleway/scaleway/iot/v1/marshalling.py index 518fb91e3..fce648a7b 100644 --- a/scaleway/scaleway/iot/v1/marshalling.py +++ b/scaleway/scaleway/iot/v1/marshalling.py @@ -923,7 +923,9 @@ def marshal_CreateHubRequest( resolve_one_of( [ OneOfPossibility( - "twins_graphite_config", request.twins_graphite_config + param="twins_graphite_config", + value=request.twins_graphite_config, + marshal_func=marshal_HubTwinsGraphiteConfig, ), ] ), @@ -1045,9 +1047,21 @@ def marshal_CreateRouteRequest( output.update( resolve_one_of( [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), + OneOfPossibility( + param="s3_config", + value=request.s3_config, + marshal_func=marshal_CreateRouteRequestS3Config, + ), + OneOfPossibility( + param="db_config", + value=request.db_config, + marshal_func=marshal_CreateRouteRequestDatabaseConfig, + ), + OneOfPossibility( + param="rest_config", + value=request.rest_config, + marshal_func=marshal_CreateRouteRequestRestConfig, + ), ] ), ) @@ -1156,7 +1170,9 @@ def marshal_UpdateHubRequest( resolve_one_of( [ OneOfPossibility( - "twins_graphite_config", request.twins_graphite_config + param="twins_graphite_config", + value=request.twins_graphite_config, + marshal_func=marshal_HubTwinsGraphiteConfig, ), ] ), @@ -1259,9 +1275,21 @@ def marshal_UpdateRouteRequest( output.update( resolve_one_of( [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), + OneOfPossibility( + param="s3_config", + value=request.s3_config, + marshal_func=marshal_UpdateRouteRequestS3Config, + ), + OneOfPossibility( + param="db_config", + value=request.db_config, + marshal_func=marshal_UpdateRouteRequestDatabaseConfig, + ), + OneOfPossibility( + param="rest_config", + value=request.rest_config, + marshal_func=marshal_UpdateRouteRequestRestConfig, + ), ] ), ) diff --git a/scaleway/scaleway/jobs/v1alpha1/marshalling.py b/scaleway/scaleway/jobs/v1alpha1/marshalling.py index 17cb1e1d7..44470d626 100644 --- a/scaleway/scaleway/jobs/v1alpha1/marshalling.py +++ b/scaleway/scaleway/jobs/v1alpha1/marshalling.py @@ -508,8 +508,10 @@ def marshal_CreateJobDefinitionSecretsRequestSecretConfig( output.update( resolve_one_of( [ - OneOfPossibility("path", request.path), - OneOfPossibility("env_var_name", request.env_var_name), + OneOfPossibility(param="path", value=request.path, marshal_func=None), + OneOfPossibility( + param="env_var_name", value=request.env_var_name, marshal_func=None + ), ] ), ) @@ -620,8 +622,10 @@ def marshal_UpdateJobDefinitionSecretRequest( output.update( resolve_one_of( [ - OneOfPossibility("path", request.path), - OneOfPossibility("env_var_name", request.env_var_name), + OneOfPossibility(param="path", value=request.path, marshal_func=None), + OneOfPossibility( + param="env_var_name", value=request.env_var_name, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/key_manager/v1alpha1/marshalling.py b/scaleway/scaleway/key_manager/v1alpha1/marshalling.py index 4fd97a7c2..2893172b1 100644 --- a/scaleway/scaleway/key_manager/v1alpha1/marshalling.py +++ b/scaleway/scaleway/key_manager/v1alpha1/marshalling.py @@ -354,11 +354,21 @@ def marshal_KeyUsage( output.update( resolve_one_of( [ - OneOfPossibility("symmetric_encryption", request.symmetric_encryption), OneOfPossibility( - "asymmetric_encryption", request.asymmetric_encryption + param="symmetric_encryption", + value=request.symmetric_encryption, + marshal_func=None, + ), + OneOfPossibility( + param="asymmetric_encryption", + value=request.asymmetric_encryption, + marshal_func=None, + ), + OneOfPossibility( + param="asymmetric_signing", + value=request.asymmetric_signing, + marshal_func=None, ), - OneOfPossibility("asymmetric_signing", request.asymmetric_signing), ] ), ) diff --git a/scaleway/scaleway/lb/v1/marshalling.py b/scaleway/scaleway/lb/v1/marshalling.py index e424b2307..b64fe7a73 100644 --- a/scaleway/scaleway/lb/v1/marshalling.py +++ b/scaleway/scaleway/lb/v1/marshalling.py @@ -1577,9 +1577,21 @@ def marshal_AttachPrivateNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="static_config", + value=request.static_config, + marshal_func=marshal_PrivateNetworkStaticConfig, + ), + OneOfPossibility( + param="dhcp_config", + value=request.dhcp_config, + marshal_func=marshal_PrivateNetworkDHCPConfig, + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_PrivateNetworkIpamConfig, + ), ] ), ) @@ -1778,13 +1790,41 @@ def marshal_HealthCheck( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -1917,8 +1957,16 @@ def marshal_CreateCertificateRequest( output.update( resolve_one_of( [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), + OneOfPossibility( + param="letsencrypt", + value=request.letsencrypt, + marshal_func=marshal_CreateCertificateRequestLetsencryptConfig, + ), + OneOfPossibility( + param="custom_certificate", + value=request.custom_certificate, + marshal_func=marshal_CreateCertificateRequestCustomCertificate, + ), ] ), ) @@ -1974,12 +2022,16 @@ def marshal_CreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2006,12 +2058,16 @@ def marshal_CreateLbRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2055,9 +2111,13 @@ def marshal_RouteMatch( output.update( resolve_one_of( [ - OneOfPossibility("sni", request.sni), - OneOfPossibility("host_header", request.host_header), - OneOfPossibility("path_begin", request.path_begin), + OneOfPossibility(param="sni", value=request.sni, marshal_func=None), + OneOfPossibility( + param="host_header", value=request.host_header, marshal_func=None + ), + OneOfPossibility( + param="path_begin", value=request.path_begin, marshal_func=None + ), ] ), ) @@ -2119,12 +2179,16 @@ def marshal_CreateSubscriberRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2132,8 +2196,16 @@ def marshal_CreateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -2338,13 +2410,41 @@ def marshal_UpdateHealthCheckRequest( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -2432,8 +2532,16 @@ def marshal_UpdateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -2464,9 +2572,21 @@ def marshal_ZonedApiAttachPrivateNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="static_config", + value=request.static_config, + marshal_func=marshal_PrivateNetworkStaticConfig, + ), + OneOfPossibility( + param="dhcp_config", + value=request.dhcp_config, + marshal_func=marshal_PrivateNetworkDHCPConfig, + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_PrivateNetworkIpamConfig, + ), ] ), ) @@ -2584,8 +2704,16 @@ def marshal_ZonedApiCreateCertificateRequest( output.update( resolve_one_of( [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), + OneOfPossibility( + param="letsencrypt", + value=request.letsencrypt, + marshal_func=marshal_CreateCertificateRequestLetsencryptConfig, + ), + OneOfPossibility( + param="custom_certificate", + value=request.custom_certificate, + marshal_func=marshal_CreateCertificateRequestCustomCertificate, + ), ] ), ) @@ -2641,12 +2769,16 @@ def marshal_ZonedApiCreateIpRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2673,12 +2805,16 @@ def marshal_ZonedApiCreateLbRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2741,12 +2877,16 @@ def marshal_ZonedApiCreateSubscriberRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -2754,8 +2894,16 @@ def marshal_ZonedApiCreateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) @@ -3008,13 +3156,41 @@ def marshal_ZonedApiUpdateHealthCheckRequest( output.update( resolve_one_of( [ - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), + OneOfPossibility( + param="tcp_config", + value=request.tcp_config, + marshal_func=marshal_HealthCheckTcpConfig, + ), + OneOfPossibility( + param="mysql_config", + value=request.mysql_config, + marshal_func=marshal_HealthCheckMysqlConfig, + ), + OneOfPossibility( + param="pgsql_config", + value=request.pgsql_config, + marshal_func=marshal_HealthCheckPgsqlConfig, + ), + OneOfPossibility( + param="ldap_config", + value=request.ldap_config, + marshal_func=marshal_HealthCheckLdapConfig, + ), + OneOfPossibility( + param="redis_config", + value=request.redis_config, + marshal_func=marshal_HealthCheckRedisConfig, + ), + OneOfPossibility( + param="http_config", + value=request.http_config, + marshal_func=marshal_HealthCheckHttpConfig, + ), + OneOfPossibility( + param="https_config", + value=request.https_config, + marshal_func=marshal_HealthCheckHttpsConfig, + ), ] ), ) @@ -3102,8 +3278,16 @@ def marshal_ZonedApiUpdateSubscriberRequest( output.update( resolve_one_of( [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), + OneOfPossibility( + param="email_config", + value=request.email_config, + marshal_func=marshal_SubscriberEmailConfig, + ), + OneOfPossibility( + param="webhook_config", + value=request.webhook_config, + marshal_func=marshal_SubscriberWebhookConfig, + ), ] ), ) diff --git a/scaleway/scaleway/mongodb/v1/__init__.py b/scaleway/scaleway/mongodb/v1/__init__.py index 8dc097d17..d68b88190 100644 --- a/scaleway/scaleway/mongodb/v1/__init__.py +++ b/scaleway/scaleway/mongodb/v1/__init__.py @@ -2,6 +2,7 @@ # If you have any remark or suggestion do not hesitate to open an issue. from .types import InstanceStatus from .content import INSTANCE_TRANSIENT_STATUSES +from .types import ListDatabasesRequestOrderBy from .types import ListInstancesRequestOrderBy from .types import ListSnapshotsRequestOrderBy from .types import ListUsersRequestOrderBy @@ -20,6 +21,7 @@ from .types import NodeTypeVolumeType from .types import UserRole from .types import EndpointSpec +from .types import Database from .types import Instance from .types import NodeType from .types import Snapshot @@ -36,6 +38,8 @@ from .types import GetInstanceCertificateRequest from .types import GetInstanceRequest from .types import GetSnapshotRequest +from .types import ListDatabasesRequest +from .types import ListDatabasesResponse from .types import ListInstancesRequest from .types import ListInstancesResponse from .types import ListNodeTypesRequest @@ -57,6 +61,7 @@ __all__ = [ "InstanceStatus", "INSTANCE_TRANSIENT_STATUSES", + "ListDatabasesRequestOrderBy", "ListInstancesRequestOrderBy", "ListSnapshotsRequestOrderBy", "ListUsersRequestOrderBy", @@ -75,6 +80,7 @@ "NodeTypeVolumeType", "UserRole", "EndpointSpec", + "Database", "Instance", "NodeType", "Snapshot", @@ -91,6 +97,8 @@ "GetInstanceCertificateRequest", "GetInstanceRequest", "GetSnapshotRequest", + "ListDatabasesRequest", + "ListDatabasesResponse", "ListInstancesRequest", "ListInstancesResponse", "ListNodeTypesRequest", diff --git a/scaleway/scaleway/mongodb/v1/api.py b/scaleway/scaleway/mongodb/v1/api.py index 8c6798a41..6ef8eff1e 100644 --- a/scaleway/scaleway/mongodb/v1/api.py +++ b/scaleway/scaleway/mongodb/v1/api.py @@ -18,6 +18,7 @@ wait_for_resource, ) from .types import ( + ListDatabasesRequestOrderBy, ListInstancesRequestOrderBy, ListSnapshotsRequestOrderBy, ListUsersRequestOrderBy, @@ -26,9 +27,11 @@ CreateInstanceRequest, CreateSnapshotRequest, CreateUserRequest, + Database, Endpoint, EndpointSpec, Instance, + ListDatabasesResponse, ListInstancesResponse, ListNodeTypesResponse, ListSnapshotsResponse, @@ -56,6 +59,7 @@ unmarshal_Instance, unmarshal_Snapshot, unmarshal_User, + unmarshal_ListDatabasesResponse, unmarshal_ListInstancesResponse, unmarshal_ListNodeTypesResponse, unmarshal_ListSnapshotsResponse, @@ -1265,6 +1269,91 @@ def set_user_role( self._throw_on_error(res) return unmarshal_User(res.json()) + def list_databases( + self, + *, + instance_id: str, + region: Optional[ScwRegion] = None, + order_by: Optional[ListDatabasesRequestOrderBy] = None, + page: Optional[int] = None, + page_size: Optional[int] = None, + ) -> ListDatabasesResponse: + """ + List databases in a Database Instance. + List all databases of a given Database Instance. + :param instance_id: UUID of the Database Instance. + :param region: Region to target. If none is passed will use default region from the config. + :param order_by: Criteria to use when requesting user listing. + :param page: + :param page_size: + :return: :class:`ListDatabasesResponse ` + + Usage: + :: + + result = api.list_databases( + instance_id="example", + ) + """ + + param_region = validate_path_param( + "region", region or self.client.default_region + ) + param_instance_id = validate_path_param("instance_id", instance_id) + + res = self._request( + "GET", + f"/mongodb/v1/regions/{param_region}/instances/{param_instance_id}/databases", + params={ + "order_by": order_by, + "page": page, + "page_size": page_size or self.client.default_page_size, + }, + ) + + self._throw_on_error(res) + return unmarshal_ListDatabasesResponse(res.json()) + + def list_databases_all( + self, + *, + instance_id: str, + region: Optional[ScwRegion] = None, + order_by: Optional[ListDatabasesRequestOrderBy] = None, + page: Optional[int] = None, + page_size: Optional[int] = None, + ) -> List[Database]: + """ + List databases in a Database Instance. + List all databases of a given Database Instance. + :param instance_id: UUID of the Database Instance. + :param region: Region to target. If none is passed will use default region from the config. + :param order_by: Criteria to use when requesting user listing. + :param page: + :param page_size: + :return: :class:`List[Database] ` + + Usage: + :: + + result = api.list_databases_all( + instance_id="example", + ) + """ + + return fetch_all_pages( + type=ListDatabasesResponse, + key="databases", + fetcher=self.list_databases, + args={ + "instance_id": instance_id, + "region": region, + "order_by": order_by, + "page": page, + "page_size": page_size, + }, + ) + def delete_endpoint( self, *, diff --git a/scaleway/scaleway/mongodb/v1/marshalling.py b/scaleway/scaleway/mongodb/v1/marshalling.py index ecef2c1e8..9d4184b4f 100644 --- a/scaleway/scaleway/mongodb/v1/marshalling.py +++ b/scaleway/scaleway/mongodb/v1/marshalling.py @@ -19,6 +19,8 @@ Snapshot, UserRole, User, + Database, + ListDatabasesResponse, ListInstancesResponse, NodeTypeVolumeType, NodeType, @@ -350,6 +352,42 @@ def unmarshal_User(data: Any) -> User: return User(**args) +def unmarshal_Database(data: Any) -> Database: + if not isinstance(data, dict): + raise TypeError( + "Unmarshalling the type 'Database' failed as data isn't a dictionary." + ) + + args: Dict[str, Any] = {} + + field = data.get("name", None) + if field is not None: + args["name"] = field + + return Database(**args) + + +def unmarshal_ListDatabasesResponse(data: Any) -> ListDatabasesResponse: + if not isinstance(data, dict): + raise TypeError( + "Unmarshalling the type 'ListDatabasesResponse' failed as data isn't a dictionary." + ) + + args: Dict[str, Any] = {} + + field = data.get("databases", None) + if field is not None: + args["databases"] = ( + [unmarshal_Database(v) for v in field] if field is not None else None + ) + + field = data.get("total_count", None) + if field is not None: + args["total_count"] = field + + return ListDatabasesResponse(**args) + + def unmarshal_ListInstancesResponse(data: Any) -> ListInstancesResponse: if not isinstance(data, dict): raise TypeError( @@ -589,8 +627,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public_network", request.public_network), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkDetails, + ), ] ), ) @@ -731,8 +777,14 @@ def marshal_UserRole( output.update( resolve_one_of( [ - OneOfPossibility("database_name", request.database_name), - OneOfPossibility("any_database", request.any_database), + OneOfPossibility( + param="database_name", + value=request.database_name, + marshal_func=None, + ), + OneOfPossibility( + param="any_database", value=request.any_database, marshal_func=None + ), ] ), ) @@ -821,7 +873,11 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_size_bytes", request.volume_size_bytes), + OneOfPossibility( + param="volume_size_bytes", + value=request.volume_size_bytes, + marshal_func=None, + ), ] ), ) diff --git a/scaleway/scaleway/mongodb/v1/types.py b/scaleway/scaleway/mongodb/v1/types.py index f8aa2c08e..fa3193f51 100644 --- a/scaleway/scaleway/mongodb/v1/types.py +++ b/scaleway/scaleway/mongodb/v1/types.py @@ -30,6 +30,14 @@ def __str__(self) -> str: return str(self.value) +class ListDatabasesRequestOrderBy(str, Enum, metaclass=StrEnumMeta): + NAME_ASC = "name_asc" + NAME_DESC = "name_desc" + + def __str__(self) -> str: + return str(self.value) + + class ListInstancesRequestOrderBy(str, Enum, metaclass=StrEnumMeta): CREATED_AT_ASC = "created_at_asc" CREATED_AT_DESC = "created_at_desc" @@ -234,6 +242,11 @@ class EndpointSpec: private_network: Optional[EndpointSpecPrivateNetworkDetails] +@dataclass +class Database: + name: str + + @dataclass class Instance: id: str @@ -662,6 +675,41 @@ class GetSnapshotRequest: """ +@dataclass +class ListDatabasesRequest: + instance_id: str + """ + UUID of the Database Instance. + """ + + region: Optional[ScwRegion] + """ + Region to target. If none is passed will use default region from the config. + """ + + order_by: Optional[ListDatabasesRequestOrderBy] + """ + Criteria to use when requesting user listing. + """ + + page: Optional[int] + + page_size: Optional[int] + + +@dataclass +class ListDatabasesResponse: + databases: List[Database] + """ + List of the databases. + """ + + total_count: int + """ + Total count of databases present on a Database Instance. + """ + + @dataclass class ListInstancesRequest: region: Optional[ScwRegion] diff --git a/scaleway/scaleway/mongodb/v1alpha1/marshalling.py b/scaleway/scaleway/mongodb/v1alpha1/marshalling.py index 4f2bef5ed..e058309e7 100644 --- a/scaleway/scaleway/mongodb/v1alpha1/marshalling.py +++ b/scaleway/scaleway/mongodb/v1alpha1/marshalling.py @@ -707,8 +707,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("public", request.public), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="public", + value=request.public, + marshal_func=marshal_EndpointSpecPublicDetails, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkDetails, + ), ] ), ) @@ -862,8 +870,12 @@ def marshal_UserRole( output.update( resolve_one_of( [ - OneOfPossibility("database", request.database), - OneOfPossibility("any_database", request.any_database), + OneOfPossibility( + param="database", value=request.database, marshal_func=None + ), + OneOfPossibility( + param="any_database", value=request.any_database, marshal_func=None + ), ] ), ) @@ -939,7 +951,9 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("volume_size", request.volume_size), + OneOfPossibility( + param="volume_size", value=request.volume_size, marshal_func=None + ), ] ), ) diff --git a/scaleway/scaleway/qaas/v1alpha1/marshalling.py b/scaleway/scaleway/qaas/v1alpha1/marshalling.py index e9c93d251..35fd793a4 100644 --- a/scaleway/scaleway/qaas/v1alpha1/marshalling.py +++ b/scaleway/scaleway/qaas/v1alpha1/marshalling.py @@ -843,8 +843,16 @@ def marshal_JobCircuit( output.update( resolve_one_of( [ - OneOfPossibility("perceval_circuit", request.perceval_circuit), - OneOfPossibility("qiskit_circuit", request.qiskit_circuit), + OneOfPossibility( + param="perceval_circuit", + value=request.perceval_circuit, + marshal_func=None, + ), + OneOfPossibility( + param="qiskit_circuit", + value=request.qiskit_circuit, + marshal_func=None, + ), ] ), ) diff --git a/scaleway/scaleway/rdb/v1/marshalling.py b/scaleway/scaleway/rdb/v1/marshalling.py index 5b46fbca4..7c47f87d0 100644 --- a/scaleway/scaleway/rdb/v1/marshalling.py +++ b/scaleway/scaleway/rdb/v1/marshalling.py @@ -1669,8 +1669,14 @@ def marshal_EndpointSpecPrivateNetwork( output.update( resolve_one_of( [ - OneOfPossibility("service_ip", request.service_ip), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="service_ip", value=request.service_ip, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_EndpointSpecPrivateNetworkIpamConfig, + ), ] ), ) @@ -1689,8 +1695,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("load_balancer", request.load_balancer), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="load_balancer", + value=request.load_balancer, + marshal_func=marshal_EndpointSpecLoadBalancer, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetwork, + ), ] ), ) @@ -1749,12 +1763,16 @@ def marshal_CreateInstanceRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), @@ -1835,8 +1853,14 @@ def marshal_ReadReplicaEndpointSpecPrivateNetwork( output.update( resolve_one_of( [ - OneOfPossibility("service_ip", request.service_ip), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="service_ip", value=request.service_ip, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_ReadReplicaEndpointSpecPrivateNetworkIpamConfig, + ), ] ), ) @@ -1855,8 +1879,16 @@ def marshal_ReadReplicaEndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("direct_access", request.direct_access), - OneOfPossibility("private_network", request.private_network), + OneOfPossibility( + param="direct_access", + value=request.direct_access, + marshal_func=marshal_ReadReplicaEndpointSpecDirectAccess, + ), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_ReadReplicaEndpointSpecPrivateNetwork, + ), ] ), ) @@ -2173,17 +2205,33 @@ def marshal_UpgradeInstanceRequest( output.update( resolve_one_of( [ - OneOfPossibility("node_type", request.node_type), - OneOfPossibility("enable_ha", request.enable_ha), - OneOfPossibility("volume_size", request.volume_size), - OneOfPossibility("volume_type", request.volume_type), OneOfPossibility( - "upgradable_version_id", request.upgradable_version_id + param="node_type", value=request.node_type, marshal_func=None + ), + OneOfPossibility( + param="enable_ha", value=request.enable_ha, marshal_func=None + ), + OneOfPossibility( + param="volume_size", value=request.volume_size, marshal_func=None + ), + OneOfPossibility( + param="volume_type", value=request.volume_type, marshal_func=None + ), + OneOfPossibility( + param="upgradable_version_id", + value=request.upgradable_version_id, + marshal_func=None, + ), + OneOfPossibility( + param="major_upgrade_workflow", + value=request.major_upgrade_workflow, + marshal_func=marshal_UpgradeInstanceRequestMajorUpgradeWorkflow, ), OneOfPossibility( - "major_upgrade_workflow", request.major_upgrade_workflow + param="enable_encryption", + value=request.enable_encryption, + marshal_func=None, ), - OneOfPossibility("enable_encryption", request.enable_encryption), ] ), ) diff --git a/scaleway/scaleway/redis/v1/marshalling.py b/scaleway/scaleway/redis/v1/marshalling.py index 91b1befdd..7f9727b06 100644 --- a/scaleway/scaleway/redis/v1/marshalling.py +++ b/scaleway/scaleway/redis/v1/marshalling.py @@ -667,8 +667,16 @@ def marshal_EndpointSpec( output.update( resolve_one_of( [ - OneOfPossibility("private_network", request.private_network), - OneOfPossibility("public_network", request.public_network), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkSpec, + ), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkSpec, + ), ] ), ) @@ -749,9 +757,15 @@ def marshal_MigrateClusterRequest( output.update( resolve_one_of( [ - OneOfPossibility("version", request.version), - OneOfPossibility("node_type", request.node_type), - OneOfPossibility("cluster_size", request.cluster_size), + OneOfPossibility( + param="version", value=request.version, marshal_func=None + ), + OneOfPossibility( + param="node_type", value=request.node_type, marshal_func=None + ), + OneOfPossibility( + param="cluster_size", value=request.cluster_size, marshal_func=None + ), ] ), ) @@ -830,8 +844,16 @@ def marshal_UpdateEndpointRequest( output.update( resolve_one_of( [ - OneOfPossibility("private_network", request.private_network), - OneOfPossibility("public_network", request.public_network), + OneOfPossibility( + param="private_network", + value=request.private_network, + marshal_func=marshal_EndpointSpecPrivateNetworkSpec, + ), + OneOfPossibility( + param="public_network", + value=request.public_network, + marshal_func=marshal_EndpointSpecPublicNetworkSpec, + ), ] ), ) diff --git a/scaleway/scaleway/registry/v1/marshalling.py b/scaleway/scaleway/registry/v1/marshalling.py index 1ffa9c7f1..1ac359a95 100644 --- a/scaleway/scaleway/registry/v1/marshalling.py +++ b/scaleway/scaleway/registry/v1/marshalling.py @@ -263,12 +263,16 @@ def marshal_CreateNamespaceRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway/scaleway/test/v1/marshalling.py b/scaleway/scaleway/test/v1/marshalling.py index 6c3c3e84c..c8a19fb63 100644 --- a/scaleway/scaleway/test/v1/marshalling.py +++ b/scaleway/scaleway/test/v1/marshalling.py @@ -143,12 +143,16 @@ def marshal_CreateHumanRequest( resolve_one_of( [ OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id + param="project_id", + value=request.project_id, + default=defaults.default_project_id, + marshal_func=None, ), OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, + param="organization_id", + value=request.organization_id, + default=defaults.default_organization_id, + marshal_func=None, ), ] ), diff --git a/scaleway/scaleway/vpcgw/v1/marshalling.py b/scaleway/scaleway/vpcgw/v1/marshalling.py index ef34334dc..56aeb3ac7 100644 --- a/scaleway/scaleway/vpcgw/v1/marshalling.py +++ b/scaleway/scaleway/vpcgw/v1/marshalling.py @@ -796,10 +796,22 @@ def marshal_CreateGatewayNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("dhcp", request.dhcp), - OneOfPossibility("address", request.address), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="dhcp_id", value=request.dhcp_id, marshal_func=None + ), + OneOfPossibility( + param="dhcp", + value=request.dhcp, + marshal_func=marshal_CreateDHCPRequest, + ), + OneOfPossibility( + param="address", value=request.address, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_CreateGatewayNetworkRequestIpamConfig, + ), ] ), ) @@ -1048,9 +1060,17 @@ def marshal_UpdateGatewayNetworkRequest( output.update( resolve_one_of( [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - OneOfPossibility("ipam_config", request.ipam_config), + OneOfPossibility( + param="dhcp_id", value=request.dhcp_id, marshal_func=None + ), + OneOfPossibility( + param="address", value=request.address, marshal_func=None + ), + OneOfPossibility( + param="ipam_config", + value=request.ipam_config, + marshal_func=marshal_UpdateGatewayNetworkRequestIpamConfig, + ), ] ), ) diff --git a/scaleway/scaleway/webhosting/v1/marshalling.py b/scaleway/scaleway/webhosting/v1/marshalling.py index 901528da9..e4a4db9f9 100644 --- a/scaleway/scaleway/webhosting/v1/marshalling.py +++ b/scaleway/scaleway/webhosting/v1/marshalling.py @@ -1083,8 +1083,16 @@ def marshal_DatabaseApiCreateDatabaseRequest( output.update( resolve_one_of( [ - OneOfPossibility("new_user", request.new_user), - OneOfPossibility("existing_username", request.existing_username), + OneOfPossibility( + param="new_user", + value=request.new_user, + marshal_func=marshal_CreateDatabaseRequestUser, + ), + OneOfPossibility( + param="existing_username", + value=request.existing_username, + marshal_func=None, + ), ] ), )