From 235b65fc20db40a5b2f99fb18ea2a9652d6883ac Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Wed, 25 Jan 2023 10:10:30 +0000 Subject: [PATCH] feat: update generated APIs --- .../baremetal/v1/marshalling.py | 26 ++---- .../iam/v1alpha1/marshalling.py | 76 --------------- .../scaleway_async/iot/v1/marshalling.py | 52 +++-------- .../mnq/v1alpha1/marshalling.py | 6 +- .../scaleway_async/rdb/v1/marshalling.py | 92 +++---------------- .../scaleway_async/registry/v1/marshalling.py | 18 +--- .../scaleway_async/test/v1/marshalling.py | 28 ++---- .../scaleway_async/vpcgw/v1/marshalling.py | 12 --- scaleway/scaleway/baremetal/v1/marshalling.py | 26 ++---- scaleway/scaleway/iam/v1alpha1/marshalling.py | 76 --------------- scaleway/scaleway/iot/v1/marshalling.py | 52 +++-------- scaleway/scaleway/mnq/v1alpha1/marshalling.py | 6 +- scaleway/scaleway/rdb/v1/marshalling.py | 92 +++---------------- scaleway/scaleway/registry/v1/marshalling.py | 18 +--- scaleway/scaleway/test/v1/marshalling.py | 28 ++---- scaleway/scaleway/vpcgw/v1/marshalling.py | 12 --- 16 files changed, 90 insertions(+), 530 deletions(-) diff --git a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py index 07dfd5535..1b767559b 100644 --- a/scaleway-async/scaleway_async/baremetal/v1/marshalling.py +++ b/scaleway-async/scaleway_async/baremetal/v1/marshalling.py @@ -811,25 +811,6 @@ def marshal_CreateServerRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "install": marshal_CreateServerRequestInstall(request.install, defaults) - if request.install is not None - else None, - "name": request.name, - "offer_id": request.offer_id, - "option_ids": request.option_ids, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -842,6 +823,13 @@ def marshal_CreateServerRequest( ), ] ), + "description": request.description, + "install": marshal_CreateServerRequestInstall(request.install, defaults) + if request.install is not None + else None, + "name": request.name, + "offer_id": request.offer_id, + "option_ids": request.option_ids, "tags": request.tags, } diff --git a/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py index 616d991cf..4fa9558d9 100644 --- a/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/iam/v1alpha1/marshalling.py @@ -514,16 +514,6 @@ def marshal_RuleSpecs( ] ), "permission_set_names": request.permission_set_names, - **resolve_one_of( - [ - OneOfPossibility("project_ids", request.project_ids), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), } @@ -538,12 +528,6 @@ def marshal_AddGroupMemberRequest( OneOfPossibility("application_id", request.application_id), ] ), - **resolve_one_of( - [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), - ] - ), } @@ -561,12 +545,6 @@ def marshal_CreateAPIKeyRequest( "default_project_id": request.default_project_id, "description": request.description, "expires_at": request.expires_at, - **resolve_one_of( - [ - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("user_id", request.user_id), - ] - ), } @@ -606,35 +584,11 @@ def marshal_CreatePolicyRequest( ] ), "description": request.description, - **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), - ] - ), "name": request.name, - **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), - ] - ), "organization_id": request.organization_id or defaults.default_organization_id, "rules": [marshal_RuleSpecs(v, defaults) for v in request.rules] if request.rules is not None else None, - **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), - ] - ), } @@ -660,12 +614,6 @@ def marshal_RemoveGroupMemberRequest( OneOfPossibility("application_id", request.application_id), ] ), - **resolve_one_of( - [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), - ] - ), } @@ -733,31 +681,7 @@ def marshal_UpdatePolicyRequest( ] ), "description": request.description, - **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), - ] - ), "name": request.name, - **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), - ] - ), - **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), - ] - ), } diff --git a/scaleway-async/scaleway_async/iot/v1/marshalling.py b/scaleway-async/scaleway_async/iot/v1/marshalling.py index 330085008..d7f2b331a 100644 --- a/scaleway-async/scaleway_async/iot/v1/marshalling.py +++ b/scaleway-async/scaleway_async/iot/v1/marshalling.py @@ -822,13 +822,6 @@ def marshal_CreateHubRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "disable_events": request.disable_events, - "events_topic_prefix": request.events_topic_prefix, - "name": request.name, - "product_plan": HubProductPlan(request.product_plan) - if request.product_plan is not None - else None, - "project_id": request.project_id or defaults.default_project_id, **resolve_one_of( [ OneOfPossibility( @@ -836,6 +829,13 @@ def marshal_CreateHubRequest( ), ] ), + "disable_events": request.disable_events, + "events_topic_prefix": request.events_topic_prefix, + "name": request.name, + "product_plan": HubProductPlan(request.product_plan) + if request.product_plan is not None + else None, + "project_id": request.project_id or defaults.default_project_id, } @@ -867,20 +867,6 @@ def marshal_CreateRouteRequest( ), "hub_id": request.hub_id, "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), "topic": request.topic, } @@ -946,11 +932,6 @@ def marshal_UpdateHubRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "disable_events": request.disable_events, - "enable_device_auto_provisioning": request.enable_device_auto_provisioning, - "events_topic_prefix": request.events_topic_prefix, - "name": request.name, - "product_plan": HubProductPlan(request.product_plan), **resolve_one_of( [ OneOfPossibility( @@ -958,6 +939,11 @@ def marshal_UpdateHubRequest( ), ] ), + "disable_events": request.disable_events, + "enable_device_auto_provisioning": request.enable_device_auto_provisioning, + "events_topic_prefix": request.events_topic_prefix, + "name": request.name, + "product_plan": HubProductPlan(request.product_plan), } @@ -974,19 +960,5 @@ def marshal_UpdateRouteRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), "topic": request.topic, } diff --git a/scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py b/scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py index bbf1808ea..7512c9db8 100644 --- a/scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py +++ b/scaleway-async/scaleway_async/mnq/v1alpha1/marshalling.py @@ -244,13 +244,13 @@ def marshal_CreateCredentialRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "name": request.name, - "namespace_id": request.namespace_id, **resolve_one_of( [ OneOfPossibility("permissions", request.permissions), ] ), + "name": request.name, + "namespace_id": request.namespace_id, } @@ -272,12 +272,12 @@ def marshal_UpdateCredentialRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "name": request.name, **resolve_one_of( [ OneOfPossibility("permissions", request.permissions), ] ), + "name": request.name, } diff --git a/scaleway-async/scaleway_async/rdb/v1/marshalling.py b/scaleway-async/scaleway_async/rdb/v1/marshalling.py index 13cc1f078..05ae20414 100644 --- a/scaleway-async/scaleway_async/rdb/v1/marshalling.py +++ b/scaleway-async/scaleway_async/rdb/v1/marshalling.py @@ -1199,12 +1199,6 @@ def marshal_EndpointSpec( OneOfPossibility("private_network", request.private_network), ] ), - **resolve_one_of( - [ - OneOfPossibility("load_balancer", request.load_balancer), - OneOfPossibility("private_network", request.private_network), - ] - ), } @@ -1239,12 +1233,6 @@ def marshal_ReadReplicaEndpointSpec( OneOfPossibility("private_network", request.private_network), ] ), - **resolve_one_of( - [ - OneOfPossibility("direct_access", request.direct_access), - OneOfPossibility("private_network", request.private_network), - ] - ), } @@ -1324,6 +1312,18 @@ def marshal_CreateInstanceRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { + **resolve_one_of( + [ + OneOfPossibility( + "project_id", request.project_id, defaults.default_project_id + ), + OneOfPossibility( + "organization_id", + request.organization_id, + defaults.default_organization_id, + ), + ] + ), "backup_same_region": request.backup_same_region, "disable_backup": request.disable_backup, "engine": request.engine, @@ -1340,31 +1340,7 @@ def marshal_CreateInstanceRequest( "is_ha_cluster": request.is_ha_cluster, "name": request.name, "node_type": request.node_type, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), "password": request.password, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), "tags": request.tags, "user_name": request.user_name, "volume_size": request.volume_size, @@ -1557,48 +1533,4 @@ def marshal_UpgradeInstanceRequest( ), ] ), - **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 - ), - ] - ), - **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 - ), - ] - ), - **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 - ), - ] - ), - **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 - ), - ] - ), } diff --git a/scaleway-async/scaleway_async/registry/v1/marshalling.py b/scaleway-async/scaleway_async/registry/v1/marshalling.py index 32c7afddd..1a9763354 100644 --- a/scaleway-async/scaleway_async/registry/v1/marshalling.py +++ b/scaleway-async/scaleway_async/registry/v1/marshalling.py @@ -205,21 +205,6 @@ def marshal_CreateNamespaceRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "is_public": request.is_public, - "name": request.name, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -232,6 +217,9 @@ def marshal_CreateNamespaceRequest( ), ] ), + "description": request.description, + "is_public": request.is_public, + "name": request.name, } diff --git a/scaleway-async/scaleway_async/test/v1/marshalling.py b/scaleway-async/scaleway_async/test/v1/marshalling.py index c878de946..8bfe2270a 100644 --- a/scaleway-async/scaleway_async/test/v1/marshalling.py +++ b/scaleway-async/scaleway_async/test/v1/marshalling.py @@ -115,26 +115,6 @@ def marshal_CreateHumanRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "altitude_in_meter": request.altitude_in_meter, - "altitude_in_millimeter": request.altitude_in_millimeter, - "eyes_color": EyeColors(request.eyes_color), - "fingers_count": request.fingers_count, - "hair_count": request.hair_count, - "height": request.height, - "is_happy": request.is_happy, - "name": request.name, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -147,6 +127,14 @@ def marshal_CreateHumanRequest( ), ] ), + "altitude_in_meter": request.altitude_in_meter, + "altitude_in_millimeter": request.altitude_in_millimeter, + "eyes_color": EyeColors(request.eyes_color), + "fingers_count": request.fingers_count, + "hair_count": request.hair_count, + "height": request.height, + "is_happy": request.is_happy, + "name": request.name, "shoe_size": request.shoe_size, } diff --git a/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py b/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py index f512045af..0e2c48dfb 100644 --- a/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py +++ b/scaleway-async/scaleway_async/vpcgw/v1/marshalling.py @@ -571,12 +571,6 @@ def marshal_CreateGatewayNetworkRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - ] - ), **resolve_one_of( [ OneOfPossibility("dhcp_id", request.dhcp_id), @@ -692,12 +686,6 @@ def marshal_UpdateGatewayNetworkRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - ] - ), **resolve_one_of( [ OneOfPossibility("dhcp_id", request.dhcp_id), diff --git a/scaleway/scaleway/baremetal/v1/marshalling.py b/scaleway/scaleway/baremetal/v1/marshalling.py index 07dfd5535..1b767559b 100644 --- a/scaleway/scaleway/baremetal/v1/marshalling.py +++ b/scaleway/scaleway/baremetal/v1/marshalling.py @@ -811,25 +811,6 @@ def marshal_CreateServerRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "install": marshal_CreateServerRequestInstall(request.install, defaults) - if request.install is not None - else None, - "name": request.name, - "offer_id": request.offer_id, - "option_ids": request.option_ids, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -842,6 +823,13 @@ def marshal_CreateServerRequest( ), ] ), + "description": request.description, + "install": marshal_CreateServerRequestInstall(request.install, defaults) + if request.install is not None + else None, + "name": request.name, + "offer_id": request.offer_id, + "option_ids": request.option_ids, "tags": request.tags, } diff --git a/scaleway/scaleway/iam/v1alpha1/marshalling.py b/scaleway/scaleway/iam/v1alpha1/marshalling.py index 616d991cf..4fa9558d9 100644 --- a/scaleway/scaleway/iam/v1alpha1/marshalling.py +++ b/scaleway/scaleway/iam/v1alpha1/marshalling.py @@ -514,16 +514,6 @@ def marshal_RuleSpecs( ] ), "permission_set_names": request.permission_set_names, - **resolve_one_of( - [ - OneOfPossibility("project_ids", request.project_ids), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), } @@ -538,12 +528,6 @@ def marshal_AddGroupMemberRequest( OneOfPossibility("application_id", request.application_id), ] ), - **resolve_one_of( - [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), - ] - ), } @@ -561,12 +545,6 @@ def marshal_CreateAPIKeyRequest( "default_project_id": request.default_project_id, "description": request.description, "expires_at": request.expires_at, - **resolve_one_of( - [ - OneOfPossibility("application_id", request.application_id), - OneOfPossibility("user_id", request.user_id), - ] - ), } @@ -606,35 +584,11 @@ def marshal_CreatePolicyRequest( ] ), "description": request.description, - **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), - ] - ), "name": request.name, - **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), - ] - ), "organization_id": request.organization_id or defaults.default_organization_id, "rules": [marshal_RuleSpecs(v, defaults) for v in request.rules] if request.rules is not None else None, - **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), - ] - ), } @@ -660,12 +614,6 @@ def marshal_RemoveGroupMemberRequest( OneOfPossibility("application_id", request.application_id), ] ), - **resolve_one_of( - [ - OneOfPossibility("user_id", request.user_id), - OneOfPossibility("application_id", request.application_id), - ] - ), } @@ -733,31 +681,7 @@ def marshal_UpdatePolicyRequest( ] ), "description": request.description, - **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), - ] - ), "name": request.name, - **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), - ] - ), - **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), - ] - ), } diff --git a/scaleway/scaleway/iot/v1/marshalling.py b/scaleway/scaleway/iot/v1/marshalling.py index 330085008..d7f2b331a 100644 --- a/scaleway/scaleway/iot/v1/marshalling.py +++ b/scaleway/scaleway/iot/v1/marshalling.py @@ -822,13 +822,6 @@ def marshal_CreateHubRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "disable_events": request.disable_events, - "events_topic_prefix": request.events_topic_prefix, - "name": request.name, - "product_plan": HubProductPlan(request.product_plan) - if request.product_plan is not None - else None, - "project_id": request.project_id or defaults.default_project_id, **resolve_one_of( [ OneOfPossibility( @@ -836,6 +829,13 @@ def marshal_CreateHubRequest( ), ] ), + "disable_events": request.disable_events, + "events_topic_prefix": request.events_topic_prefix, + "name": request.name, + "product_plan": HubProductPlan(request.product_plan) + if request.product_plan is not None + else None, + "project_id": request.project_id or defaults.default_project_id, } @@ -867,20 +867,6 @@ def marshal_CreateRouteRequest( ), "hub_id": request.hub_id, "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), "topic": request.topic, } @@ -946,11 +932,6 @@ def marshal_UpdateHubRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "disable_events": request.disable_events, - "enable_device_auto_provisioning": request.enable_device_auto_provisioning, - "events_topic_prefix": request.events_topic_prefix, - "name": request.name, - "product_plan": HubProductPlan(request.product_plan), **resolve_one_of( [ OneOfPossibility( @@ -958,6 +939,11 @@ def marshal_UpdateHubRequest( ), ] ), + "disable_events": request.disable_events, + "enable_device_auto_provisioning": request.enable_device_auto_provisioning, + "events_topic_prefix": request.events_topic_prefix, + "name": request.name, + "product_plan": HubProductPlan(request.product_plan), } @@ -974,19 +960,5 @@ def marshal_UpdateRouteRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("s3_config", request.s3_config), - OneOfPossibility("db_config", request.db_config), - OneOfPossibility("rest_config", request.rest_config), - ] - ), "topic": request.topic, } diff --git a/scaleway/scaleway/mnq/v1alpha1/marshalling.py b/scaleway/scaleway/mnq/v1alpha1/marshalling.py index bbf1808ea..7512c9db8 100644 --- a/scaleway/scaleway/mnq/v1alpha1/marshalling.py +++ b/scaleway/scaleway/mnq/v1alpha1/marshalling.py @@ -244,13 +244,13 @@ def marshal_CreateCredentialRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "name": request.name, - "namespace_id": request.namespace_id, **resolve_one_of( [ OneOfPossibility("permissions", request.permissions), ] ), + "name": request.name, + "namespace_id": request.namespace_id, } @@ -272,12 +272,12 @@ def marshal_UpdateCredentialRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "name": request.name, **resolve_one_of( [ OneOfPossibility("permissions", request.permissions), ] ), + "name": request.name, } diff --git a/scaleway/scaleway/rdb/v1/marshalling.py b/scaleway/scaleway/rdb/v1/marshalling.py index 13cc1f078..05ae20414 100644 --- a/scaleway/scaleway/rdb/v1/marshalling.py +++ b/scaleway/scaleway/rdb/v1/marshalling.py @@ -1199,12 +1199,6 @@ def marshal_EndpointSpec( OneOfPossibility("private_network", request.private_network), ] ), - **resolve_one_of( - [ - OneOfPossibility("load_balancer", request.load_balancer), - OneOfPossibility("private_network", request.private_network), - ] - ), } @@ -1239,12 +1233,6 @@ def marshal_ReadReplicaEndpointSpec( OneOfPossibility("private_network", request.private_network), ] ), - **resolve_one_of( - [ - OneOfPossibility("direct_access", request.direct_access), - OneOfPossibility("private_network", request.private_network), - ] - ), } @@ -1324,6 +1312,18 @@ def marshal_CreateInstanceRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { + **resolve_one_of( + [ + OneOfPossibility( + "project_id", request.project_id, defaults.default_project_id + ), + OneOfPossibility( + "organization_id", + request.organization_id, + defaults.default_organization_id, + ), + ] + ), "backup_same_region": request.backup_same_region, "disable_backup": request.disable_backup, "engine": request.engine, @@ -1340,31 +1340,7 @@ def marshal_CreateInstanceRequest( "is_ha_cluster": request.is_ha_cluster, "name": request.name, "node_type": request.node_type, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), "password": request.password, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), "tags": request.tags, "user_name": request.user_name, "volume_size": request.volume_size, @@ -1557,48 +1533,4 @@ def marshal_UpgradeInstanceRequest( ), ] ), - **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 - ), - ] - ), - **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 - ), - ] - ), - **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 - ), - ] - ), - **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 - ), - ] - ), } diff --git a/scaleway/scaleway/registry/v1/marshalling.py b/scaleway/scaleway/registry/v1/marshalling.py index 32c7afddd..1a9763354 100644 --- a/scaleway/scaleway/registry/v1/marshalling.py +++ b/scaleway/scaleway/registry/v1/marshalling.py @@ -205,21 +205,6 @@ def marshal_CreateNamespaceRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "is_public": request.is_public, - "name": request.name, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -232,6 +217,9 @@ def marshal_CreateNamespaceRequest( ), ] ), + "description": request.description, + "is_public": request.is_public, + "name": request.name, } diff --git a/scaleway/scaleway/test/v1/marshalling.py b/scaleway/scaleway/test/v1/marshalling.py index c878de946..8bfe2270a 100644 --- a/scaleway/scaleway/test/v1/marshalling.py +++ b/scaleway/scaleway/test/v1/marshalling.py @@ -115,26 +115,6 @@ def marshal_CreateHumanRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "altitude_in_meter": request.altitude_in_meter, - "altitude_in_millimeter": request.altitude_in_millimeter, - "eyes_color": EyeColors(request.eyes_color), - "fingers_count": request.fingers_count, - "hair_count": request.hair_count, - "height": request.height, - "is_happy": request.is_happy, - "name": request.name, - **resolve_one_of( - [ - OneOfPossibility( - "project_id", request.project_id, defaults.default_project_id - ), - OneOfPossibility( - "organization_id", - request.organization_id, - defaults.default_organization_id, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -147,6 +127,14 @@ def marshal_CreateHumanRequest( ), ] ), + "altitude_in_meter": request.altitude_in_meter, + "altitude_in_millimeter": request.altitude_in_millimeter, + "eyes_color": EyeColors(request.eyes_color), + "fingers_count": request.fingers_count, + "hair_count": request.hair_count, + "height": request.height, + "is_happy": request.is_happy, + "name": request.name, "shoe_size": request.shoe_size, } diff --git a/scaleway/scaleway/vpcgw/v1/marshalling.py b/scaleway/scaleway/vpcgw/v1/marshalling.py index f512045af..0e2c48dfb 100644 --- a/scaleway/scaleway/vpcgw/v1/marshalling.py +++ b/scaleway/scaleway/vpcgw/v1/marshalling.py @@ -571,12 +571,6 @@ def marshal_CreateGatewayNetworkRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - ] - ), **resolve_one_of( [ OneOfPossibility("dhcp_id", request.dhcp_id), @@ -692,12 +686,6 @@ def marshal_UpdateGatewayNetworkRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("dhcp_id", request.dhcp_id), - OneOfPossibility("address", request.address), - ] - ), **resolve_one_of( [ OneOfPossibility("dhcp_id", request.dhcp_id),