diff --git a/scaleway-async/scaleway_async/lb/v1/marshalling.py b/scaleway-async/scaleway_async/lb/v1/marshalling.py index 4ada15541..53916e0ac 100644 --- a/scaleway-async/scaleway_async/lb/v1/marshalling.py +++ b/scaleway-async/scaleway_async/lb/v1/marshalling.py @@ -1232,54 +1232,6 @@ def marshal_HealthCheck( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -1291,29 +1243,11 @@ def marshal_HealthCheck( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -1344,12 +1278,6 @@ def marshal_RouteMatch( OneOfPossibility("host_header", request.host_header), ] ), - **resolve_one_of( - [ - OneOfPossibility("sni", request.sni), - OneOfPossibility("host_header", request.host_header), - ] - ), } @@ -1391,12 +1319,6 @@ def marshal_AttachPrivateNetworkRequest( OneOfPossibility("dhcp_config", request.dhcp_config), ] ), - **resolve_one_of( - [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - ] - ), } @@ -1449,12 +1371,6 @@ def marshal_CreateCertificateRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), - ] - ), **resolve_one_of( [ OneOfPossibility("letsencrypt", request.letsencrypt), @@ -1485,18 +1401,6 @@ def marshal_CreateIpRequest( 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, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -1518,21 +1422,6 @@ def marshal_CreateLbRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "ip_id": request.ip_id, - "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( @@ -1545,6 +1434,9 @@ def marshal_CreateLbRequest( ), ] ), + "description": request.description, + "ip_id": request.ip_id, + "name": request.name, "ssl_compatibility_level": SSLCompatibilityLevel( request.ssl_compatibility_level ), @@ -1590,60 +1482,6 @@ def marshal_CreateSubscriberRequest( ] ), "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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -1754,54 +1592,6 @@ def marshal_UpdateHealthCheckRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -1813,29 +1603,11 @@ def marshal_UpdateHealthCheckRequest( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -1886,12 +1658,6 @@ def marshal_UpdateSubscriberRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -1915,12 +1681,6 @@ def marshal_ZonedApiAttachPrivateNetworkRequest( OneOfPossibility("dhcp_config", request.dhcp_config), ] ), - **resolve_one_of( - [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - ] - ), } @@ -1973,12 +1733,6 @@ def marshal_ZonedApiCreateCertificateRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), - ] - ), **resolve_one_of( [ OneOfPossibility("letsencrypt", request.letsencrypt), @@ -2009,18 +1763,6 @@ def marshal_ZonedApiCreateIpRequest( 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, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -2042,21 +1784,6 @@ def marshal_ZonedApiCreateLbRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "ip_id": request.ip_id, - "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( @@ -2069,6 +1796,9 @@ def marshal_ZonedApiCreateLbRequest( ), ] ), + "description": request.description, + "ip_id": request.ip_id, + "name": request.name, "ssl_compatibility_level": SSLCompatibilityLevel( request.ssl_compatibility_level ), @@ -2114,60 +1844,6 @@ def marshal_ZonedApiCreateSubscriberRequest( ] ), "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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -2287,54 +1963,6 @@ def marshal_ZonedApiUpdateHealthCheckRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -2346,29 +1974,11 @@ def marshal_ZonedApiUpdateHealthCheckRequest( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -2419,10 +2029,4 @@ def marshal_ZonedApiUpdateSubscriberRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } diff --git a/scaleway/scaleway/lb/v1/marshalling.py b/scaleway/scaleway/lb/v1/marshalling.py index 4ada15541..53916e0ac 100644 --- a/scaleway/scaleway/lb/v1/marshalling.py +++ b/scaleway/scaleway/lb/v1/marshalling.py @@ -1232,54 +1232,6 @@ def marshal_HealthCheck( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -1291,29 +1243,11 @@ def marshal_HealthCheck( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -1344,12 +1278,6 @@ def marshal_RouteMatch( OneOfPossibility("host_header", request.host_header), ] ), - **resolve_one_of( - [ - OneOfPossibility("sni", request.sni), - OneOfPossibility("host_header", request.host_header), - ] - ), } @@ -1391,12 +1319,6 @@ def marshal_AttachPrivateNetworkRequest( OneOfPossibility("dhcp_config", request.dhcp_config), ] ), - **resolve_one_of( - [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - ] - ), } @@ -1449,12 +1371,6 @@ def marshal_CreateCertificateRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), - ] - ), **resolve_one_of( [ OneOfPossibility("letsencrypt", request.letsencrypt), @@ -1485,18 +1401,6 @@ def marshal_CreateIpRequest( 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, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -1518,21 +1422,6 @@ def marshal_CreateLbRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "ip_id": request.ip_id, - "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( @@ -1545,6 +1434,9 @@ def marshal_CreateLbRequest( ), ] ), + "description": request.description, + "ip_id": request.ip_id, + "name": request.name, "ssl_compatibility_level": SSLCompatibilityLevel( request.ssl_compatibility_level ), @@ -1590,60 +1482,6 @@ def marshal_CreateSubscriberRequest( ] ), "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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -1754,54 +1592,6 @@ def marshal_UpdateHealthCheckRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -1813,29 +1603,11 @@ def marshal_UpdateHealthCheckRequest( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -1886,12 +1658,6 @@ def marshal_UpdateSubscriberRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -1915,12 +1681,6 @@ def marshal_ZonedApiAttachPrivateNetworkRequest( OneOfPossibility("dhcp_config", request.dhcp_config), ] ), - **resolve_one_of( - [ - OneOfPossibility("static_config", request.static_config), - OneOfPossibility("dhcp_config", request.dhcp_config), - ] - ), } @@ -1973,12 +1733,6 @@ def marshal_ZonedApiCreateCertificateRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - **resolve_one_of( - [ - OneOfPossibility("letsencrypt", request.letsencrypt), - OneOfPossibility("custom_certificate", request.custom_certificate), - ] - ), **resolve_one_of( [ OneOfPossibility("letsencrypt", request.letsencrypt), @@ -2009,18 +1763,6 @@ def marshal_ZonedApiCreateIpRequest( 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, - ), - ] - ), **resolve_one_of( [ OneOfPossibility( @@ -2042,21 +1784,6 @@ def marshal_ZonedApiCreateLbRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "description": request.description, - "ip_id": request.ip_id, - "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( @@ -2069,6 +1796,9 @@ def marshal_ZonedApiCreateLbRequest( ), ] ), + "description": request.description, + "ip_id": request.ip_id, + "name": request.name, "ssl_compatibility_level": SSLCompatibilityLevel( request.ssl_compatibility_level ), @@ -2114,60 +1844,6 @@ def marshal_ZonedApiCreateSubscriberRequest( ] ), "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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), - **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("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), } @@ -2287,54 +1963,6 @@ def marshal_ZonedApiUpdateHealthCheckRequest( defaults: ProfileDefaults, ) -> Dict[str, Any]: return { - "check_delay": request.check_delay, - "check_max_retries": request.check_max_retries, - "check_send_proxy": request.check_send_proxy, - "check_timeout": request.check_timeout, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), **resolve_one_of( [ OneOfPossibility("mysql_config", request.mysql_config), @@ -2346,29 +1974,11 @@ def marshal_ZonedApiUpdateHealthCheckRequest( OneOfPossibility("https_config", request.https_config), ] ), + "check_delay": request.check_delay, + "check_max_retries": request.check_max_retries, + "check_send_proxy": request.check_send_proxy, + "check_timeout": request.check_timeout, "port": request.port, - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), - **resolve_one_of( - [ - OneOfPossibility("mysql_config", request.mysql_config), - OneOfPossibility("ldap_config", request.ldap_config), - OneOfPossibility("redis_config", request.redis_config), - OneOfPossibility("pgsql_config", request.pgsql_config), - OneOfPossibility("tcp_config", request.tcp_config), - OneOfPossibility("http_config", request.http_config), - OneOfPossibility("https_config", request.https_config), - ] - ), } @@ -2419,10 +2029,4 @@ def marshal_ZonedApiUpdateSubscriberRequest( ] ), "name": request.name, - **resolve_one_of( - [ - OneOfPossibility("email_config", request.email_config), - OneOfPossibility("webhook_config", request.webhook_config), - ] - ), }