From c6c81d4d82a072945d4a8a3582afe6b9f8d43e1f Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 02:47:36 +0000 Subject: [PATCH] feat(api): update via SDK Studio (#290) --- api.md | 97 +++++---------- .../resources/addressing/prefixes/prefixes.py | 41 +++---- .../resources/keyless_certificates.py | 25 ++-- .../load_balancers/monitors/monitors.py | 50 ++++---- src/cloudflare/resources/logpush/jobs.py | 41 +++---- .../hostnames/hostnames.py | 10 +- .../resources/pagerules/pagerules.py | 14 +-- .../resources/secondary_dns/peers.py | 47 +++----- .../zero_trust/gateway/lists/lists.py | 51 ++++---- src/cloudflare/types/__init__.py | 5 +- src/cloudflare/types/addressing/__init__.py | 5 +- .../{prefix_get_response.py => prefix.py} | 4 +- .../addressing/prefix_create_response.py | 59 --------- .../types/addressing/prefix_edit_response.py | 59 --------- .../types/addressing/prefix_list_response.py | 59 --------- src/cloudflare/types/component.py | 19 --- .../waf/packages/rule_edit_response.py | 2 +- .../waf/packages/rule_list_response.py | 2 +- .../types/load_balancers/__init__.py | 6 +- .../{monitor_get_response.py => monitor.py} | 4 +- .../load_balancers/monitor_create_response.py | 113 ------------------ .../load_balancers/monitor_edit_response.py | 113 ------------------ .../load_balancers/monitor_list_response.py | 113 ------------------ .../load_balancers/monitor_update_response.py | 113 ------------------ src/cloudflare/types/logpush/__init__.py | 5 +- .../logpush/datasets/job_get_response.py | 82 +------------ .../types/logpush/job_create_response.py | 82 ------------- .../types/logpush/job_list_response.py | 82 ------------- .../types/logpush/job_update_response.py | 82 ------------- .../{job_get_response.py => logpush_job.py} | 4 +- .../types/origin_tls_client_auth/__init__.py | 1 - .../authenticated_origin_pull.py | 56 ++++++++- .../types/origin_tls_client_auth/id.py | 79 ------------ src/cloudflare/types/page_rule.py | 4 +- .../types/pagerule_create_params.py | 4 +- src/cloudflare/types/pagerule_edit_params.py | 4 +- .../types/pagerule_update_params.py | 4 +- src/cloudflare/types/rate_plan.py | 14 ++- src/cloudflare/types/rate_plan_param.py | 12 +- .../types/secondary_dns/__init__.py | 5 +- .../{peer_get_response.py => peer.py} | 4 +- .../secondary_dns/peer_create_response.py | 38 ------ .../types/secondary_dns/peer_list_response.py | 38 ------ .../secondary_dns/peer_update_response.py | 38 ------ src/cloudflare/types/{targes.py => target.py} | 4 +- .../{targes_param.py => target_param.py} | 4 +- .../types/zero_trust/gateway/__init__.py | 7 +- .../types/zero_trust/gateway/gateway_item.py | 15 +++ ...ay_list_param.py => gateway_item_param.py} | 4 +- .../types/zero_trust/gateway/gateway_list.py | 19 ++- .../zero_trust/gateway/list_create_params.py | 4 +- .../gateway/list_create_response.py | 4 +- .../zero_trust/gateway/list_edit_params.py | 4 +- .../zero_trust/gateway/list_edit_response.py | 30 ----- .../zero_trust/gateway/list_get_response.py | 30 ----- .../zero_trust/gateway/list_list_response.py | 30 ----- .../gateway/list_update_response.py | 30 ----- .../gateway/lists/item_list_response.py | 4 +- .../types/zone_authenticated_origin_pull.py | 31 ++++- .../api_resources/addressing/test_prefixes.py | 53 ++++---- .../load_balancers/test_monitors.py | 78 ++++++------ tests/api_resources/logpush/test_jobs.py | 69 +++++------ .../origin_tls_client_auth/test_hostnames.py | 17 +-- .../api_resources/secondary_dns/test_peers.py | 57 +++++---- .../test_keyless_certificates.py | 45 ++++--- .../zero_trust/gateway/test_lists.py | 61 +++++----- 66 files changed, 516 insertions(+), 1774 deletions(-) rename src/cloudflare/types/addressing/{prefix_get_response.py => prefix.py} (95%) delete mode 100644 src/cloudflare/types/addressing/prefix_create_response.py delete mode 100644 src/cloudflare/types/addressing/prefix_edit_response.py delete mode 100644 src/cloudflare/types/addressing/prefix_list_response.py delete mode 100644 src/cloudflare/types/component.py rename src/cloudflare/types/load_balancers/{monitor_get_response.py => monitor.py} (97%) delete mode 100644 src/cloudflare/types/load_balancers/monitor_create_response.py delete mode 100644 src/cloudflare/types/load_balancers/monitor_edit_response.py delete mode 100644 src/cloudflare/types/load_balancers/monitor_list_response.py delete mode 100644 src/cloudflare/types/load_balancers/monitor_update_response.py delete mode 100644 src/cloudflare/types/logpush/job_create_response.py delete mode 100644 src/cloudflare/types/logpush/job_list_response.py delete mode 100644 src/cloudflare/types/logpush/job_update_response.py rename src/cloudflare/types/logpush/{job_get_response.py => logpush_job.py} (97%) delete mode 100644 src/cloudflare/types/origin_tls_client_auth/id.py rename src/cloudflare/types/secondary_dns/{peer_get_response.py => peer.py} (94%) delete mode 100644 src/cloudflare/types/secondary_dns/peer_create_response.py delete mode 100644 src/cloudflare/types/secondary_dns/peer_list_response.py delete mode 100644 src/cloudflare/types/secondary_dns/peer_update_response.py rename src/cloudflare/types/{targes.py => target.py} (91%) rename src/cloudflare/types/{targes_param.py => target_param.py} (90%) create mode 100644 src/cloudflare/types/zero_trust/gateway/gateway_item.py rename src/cloudflare/types/zero_trust/gateway/{gateway_list_param.py => gateway_item_param.py} (73%) delete mode 100644 src/cloudflare/types/zero_trust/gateway/list_edit_response.py delete mode 100644 src/cloudflare/types/zero_trust/gateway/list_get_response.py delete mode 100644 src/cloudflare/types/zero_trust/gateway/list_list_response.py delete mode 100644 src/cloudflare/types/zero_trust/gateway/list_update_response.py diff --git a/api.md b/api.md index d924e3c3b1b..847dabb3a0f 100644 --- a/api.md +++ b/api.md @@ -195,7 +195,6 @@ from cloudflare.types.user import ( RatePlan, Subscription, SubscriptionComponent, - SubscriptionComponentValue, SubscriptionZone, SubscriptionUpdateResponse, SubscriptionDeleteResponse, @@ -1051,24 +1050,17 @@ Methods: Types: ```python -from cloudflare.types.load_balancers import ( - MonitorCreateResponse, - MonitorUpdateResponse, - MonitorListResponse, - MonitorDeleteResponse, - MonitorEditResponse, - MonitorGetResponse, -) +from cloudflare.types.load_balancers import Monitor, MonitorDeleteResponse ``` Methods: -- client.load_balancers.monitors.create(\*, account_id, \*\*params) -> MonitorCreateResponse -- client.load_balancers.monitors.update(monitor_id, \*, account_id, \*\*params) -> MonitorUpdateResponse -- client.load_balancers.monitors.list(\*, account_id) -> SyncSinglePage[MonitorListResponse] +- client.load_balancers.monitors.create(\*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.update(monitor_id, \*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.list(\*, account_id) -> SyncSinglePage[Monitor] - client.load_balancers.monitors.delete(monitor_id, \*, account_id, \*\*params) -> MonitorDeleteResponse -- client.load_balancers.monitors.edit(monitor_id, \*, account_id, \*\*params) -> MonitorEditResponse -- client.load_balancers.monitors.get(monitor_id, \*, account_id) -> MonitorGetResponse +- client.load_balancers.monitors.edit(monitor_id, \*, account_id, \*\*params) -> Monitor +- client.load_balancers.monitors.get(monitor_id, \*, account_id) -> Monitor ### Previews @@ -1442,7 +1434,7 @@ Methods: Types: ```python -from cloudflare.types import Component, RatePlan, RatePlanGetResponse +from cloudflare.types import RatePlan, RatePlanGetResponse ``` Methods: @@ -2027,11 +2019,11 @@ from cloudflare.types import Hostname, KeylessCertificate, Tunnel, KeylessCertif Methods: -- client.keyless_certificates.create(\*, zone_id, \*\*params) -> Hostname +- client.keyless_certificates.create(\*, zone_id, \*\*params) -> KeylessCertificate - client.keyless_certificates.list(\*, zone_id) -> SyncSinglePage[KeylessCertificate] - client.keyless_certificates.delete(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificateDeleteResponse -- client.keyless_certificates.edit(keyless_certificate_id, \*, zone_id, \*\*params) -> Hostname -- client.keyless_certificates.get(keyless_certificate_id, \*, zone_id) -> Hostname +- client.keyless_certificates.edit(keyless_certificate_id, \*, zone_id, \*\*params) -> KeylessCertificate +- client.keyless_certificates.get(keyless_certificate_id, \*, zone_id) -> KeylessCertificate # Logpush @@ -2079,24 +2071,16 @@ Methods: Types: ```python -from cloudflare.types.logpush import ( - LogpushJob, - OutputOptions, - JobCreateResponse, - JobUpdateResponse, - JobListResponse, - JobDeleteResponse, - JobGetResponse, -) +from cloudflare.types.logpush import LogpushJob, OutputOptions, JobDeleteResponse ``` Methods: -- client.logpush.jobs.create(\*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.update(job_id, \*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.list(\*, account_id, zone_id) -> SyncSinglePage[Optional] +- client.logpush.jobs.create(\*, account_id, zone_id, \*\*params) -> Optional +- client.logpush.jobs.update(job_id, \*, account_id, zone_id, \*\*params) -> Optional +- client.logpush.jobs.list(\*, account_id, zone_id) -> SyncSinglePage[Optional] - client.logpush.jobs.delete(job_id, \*, account_id, zone_id, \*\*params) -> Optional -- client.logpush.jobs.get(job_id, \*, account_id, zone_id) -> Optional +- client.logpush.jobs.get(job_id, \*, account_id, zone_id) -> Optional ## Ownership @@ -2230,7 +2214,7 @@ from cloudflare.types.origin_tls_client_auth import ( Methods: - client.origin_tls_client_auth.hostnames.update(\*, zone_id, \*\*params) -> Optional -- client.origin_tls_client_auth.hostnames.get(hostname, \*, zone_id) -> ID +- client.origin_tls_client_auth.hostnames.get(hostname, \*, zone_id) -> AuthenticatedOriginPull ### Certificates @@ -2273,7 +2257,7 @@ Types: from cloudflare.types import ( PageRule, Route, - Targes, + Target, URLTarget, PageruleCreateResponse, PageruleUpdateResponse, @@ -2419,23 +2403,16 @@ Methods: Types: ```python -from cloudflare.types.secondary_dns import ( - Peer, - PeerCreateResponse, - PeerUpdateResponse, - PeerListResponse, - PeerDeleteResponse, - PeerGetResponse, -) +from cloudflare.types.secondary_dns import Peer, PeerDeleteResponse ``` Methods: -- client.secondary_dns.peers.create(\*, account_id, \*\*params) -> PeerCreateResponse -- client.secondary_dns.peers.update(peer_id, \*, account_id, \*\*params) -> PeerUpdateResponse -- client.secondary_dns.peers.list(\*, account_id) -> SyncSinglePage[PeerListResponse] +- client.secondary_dns.peers.create(\*, account_id, \*\*params) -> Peer +- client.secondary_dns.peers.update(peer_id, \*, account_id, \*\*params) -> Peer +- client.secondary_dns.peers.list(\*, account_id) -> SyncSinglePage[Peer] - client.secondary_dns.peers.delete(peer_id, \*, account_id, \*\*params) -> PeerDeleteResponse -- client.secondary_dns.peers.get(peer_id, \*, account_id) -> PeerGetResponse +- client.secondary_dns.peers.get(peer_id, \*, account_id) -> Peer ## TSIGs @@ -3305,23 +3282,16 @@ Methods: Types: ```python -from cloudflare.types.addressing import ( - Prefix, - PrefixCreateResponse, - PrefixListResponse, - PrefixDeleteResponse, - PrefixEditResponse, - PrefixGetResponse, -) +from cloudflare.types.addressing import Prefix, PrefixDeleteResponse ``` Methods: -- client.addressing.prefixes.create(\*, account_id, \*\*params) -> PrefixCreateResponse -- client.addressing.prefixes.list(\*, account_id) -> SyncSinglePage[PrefixListResponse] +- client.addressing.prefixes.create(\*, account_id, \*\*params) -> Prefix +- client.addressing.prefixes.list(\*, account_id) -> SyncSinglePage[Prefix] - client.addressing.prefixes.delete(prefix_id, \*, account_id, \*\*params) -> Optional -- client.addressing.prefixes.edit(prefix_id, \*, account_id, \*\*params) -> PrefixEditResponse -- client.addressing.prefixes.get(prefix_id, \*, account_id) -> PrefixGetResponse +- client.addressing.prefixes.edit(prefix_id, \*, account_id, \*\*params) -> Prefix +- client.addressing.prefixes.get(prefix_id, \*, account_id) -> Prefix ### BGP @@ -5714,24 +5684,21 @@ Types: ```python from cloudflare.types.zero_trust.gateway import ( + GatewayItem, GatewayList, ListCreateResponse, - ListUpdateResponse, - ListListResponse, ListDeleteResponse, - ListEditResponse, - ListGetResponse, ) ``` Methods: - client.zero_trust.gateway.lists.create(\*, account_id, \*\*params) -> ListCreateResponse -- client.zero_trust.gateway.lists.update(list_id, \*, account_id, \*\*params) -> ListUpdateResponse -- client.zero_trust.gateway.lists.list(\*, account_id) -> SyncSinglePage[ListListResponse] +- client.zero_trust.gateway.lists.update(list_id, \*, account_id, \*\*params) -> GatewayList +- client.zero_trust.gateway.lists.list(\*, account_id) -> SyncSinglePage[GatewayList] - client.zero_trust.gateway.lists.delete(list_id, \*, account_id, \*\*params) -> ListDeleteResponse -- client.zero_trust.gateway.lists.edit(list_id, \*, account_id, \*\*params) -> ListEditResponse -- client.zero_trust.gateway.lists.get(list_id, \*, account_id) -> ListGetResponse +- client.zero_trust.gateway.lists.edit(list_id, \*, account_id, \*\*params) -> GatewayList +- client.zero_trust.gateway.lists.get(list_id, \*, account_id) -> GatewayList #### Items diff --git a/src/cloudflare/resources/addressing/prefixes/prefixes.py b/src/cloudflare/resources/addressing/prefixes/prefixes.py index 0243cefbdf9..e187e9f4a55 100644 --- a/src/cloudflare/resources/addressing/prefixes/prefixes.py +++ b/src/cloudflare/resources/addressing/prefixes/prefixes.py @@ -43,10 +43,7 @@ make_request_options, ) from ....types.addressing import ( - PrefixGetResponse, - PrefixEditResponse, - PrefixListResponse, - PrefixCreateResponse, + Prefix, PrefixDeleteResponse, prefix_edit_params, prefix_create_params, @@ -86,7 +83,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixCreateResponse: + ) -> Prefix: """ Add a new prefix under the account. @@ -126,7 +123,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) def list( @@ -139,7 +136,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[PrefixListResponse]: + ) -> SyncSinglePage[Prefix]: """ List all prefixes owned by the account. @@ -158,11 +155,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/addressing/prefixes", - page=SyncSinglePage[PrefixListResponse], + page=SyncSinglePage[Prefix], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=PrefixListResponse, + model=Prefix, ) def delete( @@ -228,7 +225,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixEditResponse: + ) -> Prefix: """ Modify the description for a prefix owned by the account. @@ -261,7 +258,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) def get( @@ -275,7 +272,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixGetResponse: + ) -> Prefix: """ List a particular prefix owned by the account. @@ -305,7 +302,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) @@ -339,7 +336,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixCreateResponse: + ) -> Prefix: """ Add a new prefix under the account. @@ -379,7 +376,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) def list( @@ -392,7 +389,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[PrefixListResponse, AsyncSinglePage[PrefixListResponse]]: + ) -> AsyncPaginator[Prefix, AsyncSinglePage[Prefix]]: """ List all prefixes owned by the account. @@ -411,11 +408,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/addressing/prefixes", - page=AsyncSinglePage[PrefixListResponse], + page=AsyncSinglePage[Prefix], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=PrefixListResponse, + model=Prefix, ) async def delete( @@ -481,7 +478,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixEditResponse: + ) -> Prefix: """ Modify the description for a prefix owned by the account. @@ -514,7 +511,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) async def get( @@ -528,7 +525,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PrefixGetResponse: + ) -> Prefix: """ List a particular prefix owned by the account. @@ -558,7 +555,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]), + cast_to=cast(Type[Prefix], ResultWrapper[Prefix]), ) diff --git a/src/cloudflare/resources/keyless_certificates.py b/src/cloudflare/resources/keyless_certificates.py index 75b1888a6bf..dcf1e3ea495 100644 --- a/src/cloudflare/resources/keyless_certificates.py +++ b/src/cloudflare/resources/keyless_certificates.py @@ -7,7 +7,6 @@ import httpx from ..types import ( - Hostname, TunnelParam, BundleMethod, KeylessCertificate, @@ -64,7 +63,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """ Create Keyless SSL Configuration @@ -117,7 +116,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) def list( @@ -220,7 +219,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """This will update attributes of a Keyless SSL. Consists of one or more of the @@ -275,7 +274,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) def get( @@ -289,7 +288,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """ Get details for one Keyless SSL configuration. @@ -321,7 +320,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) @@ -350,7 +349,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """ Create Keyless SSL Configuration @@ -403,7 +402,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) def list( @@ -506,7 +505,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """This will update attributes of a Keyless SSL. Consists of one or more of the @@ -561,7 +560,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) async def get( @@ -575,7 +574,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Hostname: + ) -> KeylessCertificate: """ Get details for one Keyless SSL configuration. @@ -607,7 +606,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Hostname], ResultWrapper[Hostname]), + cast_to=cast(Type[KeylessCertificate], ResultWrapper[KeylessCertificate]), ) diff --git a/src/cloudflare/resources/load_balancers/monitors/monitors.py b/src/cloudflare/resources/load_balancers/monitors/monitors.py index 389a8f6d5c5..57510ca1bcb 100644 --- a/src/cloudflare/resources/load_balancers/monitors/monitors.py +++ b/src/cloudflare/resources/load_balancers/monitors/monitors.py @@ -43,12 +43,8 @@ make_request_options, ) from ....types.load_balancers import ( - MonitorGetResponse, - MonitorEditResponse, - MonitorListResponse, - MonitorCreateResponse, + Monitor, MonitorDeleteResponse, - MonitorUpdateResponse, monitor_edit_params, monitor_create_params, monitor_delete_params, @@ -101,7 +97,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorCreateResponse: + ) -> Monitor: """ Create a configured monitor. @@ -197,7 +193,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorCreateResponse], ResultWrapper[MonitorCreateResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def update( @@ -227,7 +223,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorUpdateResponse: + ) -> Monitor: """ Modify a configured monitor. @@ -325,7 +321,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorUpdateResponse], ResultWrapper[MonitorUpdateResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -338,7 +334,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[MonitorListResponse]: + ) -> SyncSinglePage[Monitor]: """ List configured monitors for an account. @@ -357,11 +353,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/load_balancers/monitors", - page=SyncSinglePage[MonitorListResponse], + page=SyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=MonitorListResponse, + model=Monitor, ) def delete( @@ -435,7 +431,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorEditResponse: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -533,7 +529,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorEditResponse], ResultWrapper[MonitorEditResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def get( @@ -547,7 +543,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorGetResponse: + ) -> Monitor: """ List a single configured monitor for an account. @@ -575,7 +571,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorGetResponse], ResultWrapper[MonitorGetResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) @@ -622,7 +618,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorCreateResponse: + ) -> Monitor: """ Create a configured monitor. @@ -718,7 +714,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorCreateResponse], ResultWrapper[MonitorCreateResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def update( @@ -748,7 +744,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorUpdateResponse: + ) -> Monitor: """ Modify a configured monitor. @@ -846,7 +842,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorUpdateResponse], ResultWrapper[MonitorUpdateResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) def list( @@ -859,7 +855,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[MonitorListResponse, AsyncSinglePage[MonitorListResponse]]: + ) -> AsyncPaginator[Monitor, AsyncSinglePage[Monitor]]: """ List configured monitors for an account. @@ -878,11 +874,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/load_balancers/monitors", - page=AsyncSinglePage[MonitorListResponse], + page=AsyncSinglePage[Monitor], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=MonitorListResponse, + model=Monitor, ) async def delete( @@ -956,7 +952,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorEditResponse: + ) -> Monitor: """ Apply changes to an existing monitor, overwriting the supplied properties. @@ -1054,7 +1050,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorEditResponse], ResultWrapper[MonitorEditResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) async def get( @@ -1068,7 +1064,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> MonitorGetResponse: + ) -> Monitor: """ List a single configured monitor for an account. @@ -1096,7 +1092,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[MonitorGetResponse], ResultWrapper[MonitorGetResponse]), + cast_to=cast(Type[Monitor], ResultWrapper[Monitor]), ) diff --git a/src/cloudflare/resources/logpush/jobs.py b/src/cloudflare/resources/logpush/jobs.py index 784d6b09aba..520e6df2d0c 100644 --- a/src/cloudflare/resources/logpush/jobs.py +++ b/src/cloudflare/resources/logpush/jobs.py @@ -27,11 +27,8 @@ make_request_options, ) from ...types.logpush import ( - JobGetResponse, - JobListResponse, - JobCreateResponse, + LogpushJob, JobDeleteResponse, - JobUpdateResponse, OutputOptionsParam, job_create_params, job_delete_params, @@ -69,7 +66,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobCreateResponse]: + ) -> Optional[LogpushJob]: """ Creates a new Logpush job for an account or zone. @@ -150,7 +147,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) def update( @@ -171,7 +168,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobUpdateResponse]: + ) -> Optional[LogpushJob]: """ Updates a Logpush job. @@ -246,7 +243,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) def list( @@ -260,7 +257,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Optional[JobListResponse]]: + ) -> SyncSinglePage[Optional[LogpushJob]]: """ Lists Logpush jobs for an account or zone. @@ -294,11 +291,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/logpush/jobs", - page=SyncSinglePage[Optional[JobListResponse]], + page=SyncSinglePage[Optional[LogpushJob]], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=JobListResponse, + model=LogpushJob, ) def delete( @@ -378,7 +375,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobGetResponse]: + ) -> Optional[LogpushJob]: """ Gets the details of a Logpush job. @@ -421,7 +418,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) @@ -453,7 +450,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobCreateResponse]: + ) -> Optional[LogpushJob]: """ Creates a new Logpush job for an account or zone. @@ -534,7 +531,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) async def update( @@ -555,7 +552,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobUpdateResponse]: + ) -> Optional[LogpushJob]: """ Updates a Logpush job. @@ -630,7 +627,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) def list( @@ -644,7 +641,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Optional[JobListResponse], AsyncSinglePage[Optional[JobListResponse]]]: + ) -> AsyncPaginator[Optional[LogpushJob], AsyncSinglePage[Optional[LogpushJob]]]: """ Lists Logpush jobs for an account or zone. @@ -678,11 +675,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/logpush/jobs", - page=AsyncSinglePage[Optional[JobListResponse]], + page=AsyncSinglePage[Optional[LogpushJob]], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=JobListResponse, + model=LogpushJob, ) async def delete( @@ -762,7 +759,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[JobGetResponse]: + ) -> Optional[LogpushJob]: """ Gets the details of a Logpush job. @@ -805,7 +802,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]), + cast_to=cast(Type[Optional[LogpushJob]], ResultWrapper[LogpushJob]), ) diff --git a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py b/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py index bdf976384d5..a3dff7129f7 100644 --- a/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py +++ b/src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py @@ -31,7 +31,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.origin_tls_client_auth import ID, HostnameUpdateResponse, hostname_update_params +from ....types.origin_tls_client_auth import HostnameUpdateResponse, AuthenticatedOriginPull, hostname_update_params __all__ = ["Hostnames", "AsyncHostnames"] @@ -105,7 +105,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ID: + ) -> AuthenticatedOriginPull: """ Get the Hostname Status for Client Authentication @@ -136,7 +136,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ID], ResultWrapper[ID]), + cast_to=cast(Type[AuthenticatedOriginPull], ResultWrapper[AuthenticatedOriginPull]), ) @@ -209,7 +209,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ID: + ) -> AuthenticatedOriginPull: """ Get the Hostname Status for Client Authentication @@ -240,7 +240,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ID], ResultWrapper[ID]), + cast_to=cast(Type[AuthenticatedOriginPull], ResultWrapper[AuthenticatedOriginPull]), ) diff --git a/src/cloudflare/resources/pagerules/pagerules.py b/src/cloudflare/resources/pagerules/pagerules.py index ae8f577e9dc..181d22aea68 100644 --- a/src/cloudflare/resources/pagerules/pagerules.py +++ b/src/cloudflare/resources/pagerules/pagerules.py @@ -9,7 +9,7 @@ from ...types import ( RouteParam, - TargesParam, + TargetParam, PageruleGetResponse, PageruleEditResponse, PageruleListResponse, @@ -69,7 +69,7 @@ def create( *, zone_id: str, actions: Iterable[RouteParam], - targets: Iterable[TargesParam], + targets: Iterable[TargetParam], priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -140,7 +140,7 @@ def update( *, zone_id: str, actions: Iterable[RouteParam], - targets: Iterable[TargesParam], + targets: Iterable[TargetParam], priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -326,7 +326,7 @@ def edit( actions: Iterable[RouteParam] | NotGiven = NOT_GIVEN, priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, - targets: Iterable[TargesParam] | NotGiven = NOT_GIVEN, + targets: Iterable[TargetParam] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -461,7 +461,7 @@ async def create( *, zone_id: str, actions: Iterable[RouteParam], - targets: Iterable[TargesParam], + targets: Iterable[TargetParam], priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -532,7 +532,7 @@ async def update( *, zone_id: str, actions: Iterable[RouteParam], - targets: Iterable[TargesParam], + targets: Iterable[TargetParam], priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -718,7 +718,7 @@ async def edit( actions: Iterable[RouteParam] | NotGiven = NOT_GIVEN, priority: int | NotGiven = NOT_GIVEN, status: Literal["active", "disabled"] | NotGiven = NOT_GIVEN, - targets: Iterable[TargesParam] | NotGiven = NOT_GIVEN, + targets: Iterable[TargetParam] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, diff --git a/src/cloudflare/resources/secondary_dns/peers.py b/src/cloudflare/resources/secondary_dns/peers.py index 0bb09fe0143..8377b851212 100644 --- a/src/cloudflare/resources/secondary_dns/peers.py +++ b/src/cloudflare/resources/secondary_dns/peers.py @@ -25,16 +25,7 @@ AsyncPaginator, make_request_options, ) -from ...types.secondary_dns import ( - PeerGetResponse, - PeerListResponse, - PeerCreateResponse, - PeerDeleteResponse, - PeerUpdateResponse, - peer_create_params, - peer_delete_params, - peer_update_params, -) +from ...types.secondary_dns import Peer, PeerDeleteResponse, peer_create_params, peer_delete_params, peer_update_params __all__ = ["Peers", "AsyncPeers"] @@ -59,7 +50,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerCreateResponse: + ) -> Peer: """ Create Peer. @@ -84,7 +75,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) def update( @@ -103,7 +94,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerUpdateResponse: + ) -> Peer: """ Modify Peer. @@ -155,7 +146,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) def list( @@ -168,7 +159,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[PeerListResponse]: + ) -> SyncSinglePage[Peer]: """ List Peers. @@ -185,11 +176,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/secondary_dns/peers", - page=SyncSinglePage[PeerListResponse], + page=SyncSinglePage[Peer], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=PeerListResponse, + model=Peer, ) def delete( @@ -245,7 +236,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerGetResponse: + ) -> Peer: """ Get Peer. @@ -271,7 +262,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) @@ -295,7 +286,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerCreateResponse: + ) -> Peer: """ Create Peer. @@ -320,7 +311,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) async def update( @@ -339,7 +330,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerUpdateResponse: + ) -> Peer: """ Modify Peer. @@ -391,7 +382,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) def list( @@ -404,7 +395,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[PeerListResponse, AsyncSinglePage[PeerListResponse]]: + ) -> AsyncPaginator[Peer, AsyncSinglePage[Peer]]: """ List Peers. @@ -421,11 +412,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/secondary_dns/peers", - page=AsyncSinglePage[PeerListResponse], + page=AsyncSinglePage[Peer], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=PeerListResponse, + model=Peer, ) async def delete( @@ -481,7 +472,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> PeerGetResponse: + ) -> Peer: """ Get Peer. @@ -507,7 +498,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]), + cast_to=cast(Type[Peer], ResultWrapper[Peer]), ) diff --git a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py index fc6af426b9f..c4c6d51aa0a 100644 --- a/src/cloudflare/resources/zero_trust/gateway/lists/lists.py +++ b/src/cloudflare/resources/zero_trust/gateway/lists/lists.py @@ -35,13 +35,10 @@ make_request_options, ) from .....types.zero_trust.gateway import ( - ListGetResponse, - GatewayListParam, - ListEditResponse, - ListListResponse, + GatewayList, + GatewayItemParam, ListCreateResponse, ListDeleteResponse, - ListUpdateResponse, list_edit_params, list_create_params, list_delete_params, @@ -71,7 +68,7 @@ def create( name: str, type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"], description: str | NotGiven = NOT_GIVEN, - items: Iterable[GatewayListParam] | NotGiven = NOT_GIVEN, + items: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -135,7 +132,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListUpdateResponse: + ) -> GatewayList: """ Updates a configured Zero Trust list. @@ -174,7 +171,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) def list( @@ -187,7 +184,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[ListListResponse]: + ) -> SyncSinglePage[GatewayList]: """ Fetches all Zero Trust lists for an account. @@ -204,11 +201,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/gateway/lists", - page=SyncSinglePage[ListListResponse], + page=SyncSinglePage[GatewayList], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=ListListResponse, + model=GatewayList, ) def delete( @@ -265,7 +262,7 @@ def edit( list_id: str, *, account_id: str, - append: Iterable[GatewayListParam] | NotGiven = NOT_GIVEN, + append: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN, remove: List[str] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -273,7 +270,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListEditResponse: + ) -> GatewayList: """ Appends or removes an item from a configured Zero Trust list. @@ -312,7 +309,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListEditResponse], ResultWrapper[ListEditResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) def get( @@ -326,7 +323,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListGetResponse: + ) -> GatewayList: """ Fetches a single Zero Trust list. @@ -354,7 +351,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) @@ -378,7 +375,7 @@ async def create( name: str, type: Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"], description: str | NotGiven = NOT_GIVEN, - items: Iterable[GatewayListParam] | NotGiven = NOT_GIVEN, + items: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -442,7 +439,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListUpdateResponse: + ) -> GatewayList: """ Updates a configured Zero Trust list. @@ -481,7 +478,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListUpdateResponse], ResultWrapper[ListUpdateResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) def list( @@ -494,7 +491,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[ListListResponse, AsyncSinglePage[ListListResponse]]: + ) -> AsyncPaginator[GatewayList, AsyncSinglePage[GatewayList]]: """ Fetches all Zero Trust lists for an account. @@ -511,11 +508,11 @@ def list( raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}") return self._get_api_list( f"/accounts/{account_id}/gateway/lists", - page=AsyncSinglePage[ListListResponse], + page=AsyncSinglePage[GatewayList], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=ListListResponse, + model=GatewayList, ) async def delete( @@ -572,7 +569,7 @@ async def edit( list_id: str, *, account_id: str, - append: Iterable[GatewayListParam] | NotGiven = NOT_GIVEN, + append: Iterable[GatewayItemParam] | NotGiven = NOT_GIVEN, remove: List[str] | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. @@ -580,7 +577,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListEditResponse: + ) -> GatewayList: """ Appends or removes an item from a configured Zero Trust list. @@ -619,7 +616,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListEditResponse], ResultWrapper[ListEditResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) async def get( @@ -633,7 +630,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ListGetResponse: + ) -> GatewayList: """ Fetches a single Zero Trust list. @@ -661,7 +658,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ListGetResponse], ResultWrapper[ListGetResponse]), + cast_to=cast(Type[GatewayList], ResultWrapper[GatewayList]), ) diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py index 1986dd954aa..f2105913a40 100644 --- a/src/cloudflare/types/__init__.py +++ b/src/cloudflare/types/__init__.py @@ -28,7 +28,7 @@ LoadBalancerPreview as LoadBalancerPreview, ) from .submit import Submit as Submit -from .targes import Targes as Targes +from .target import Target as Target from .tunnel import Tunnel as Tunnel from .account import Account as Account from .binding import Binding as Binding @@ -40,7 +40,6 @@ from .hostname import Hostname as Hostname from .settings import Settings as Settings from .calls_app import CallsApp as CallsApp -from .component import Component as Component from .dns_param import DNSParam as DNSParam from .page_rule import PageRule as PageRule from .rate_plan import RatePlan as RatePlan @@ -64,7 +63,7 @@ from .health_check import HealthCheck as HealthCheck from .origin_param import OriginParam as OriginParam from .respone_rule import ResponeRule as ResponeRule -from .targes_param import TargesParam as TargesParam +from .target_param import TargetParam as TargetParam from .tunnel_param import TunnelParam as TunnelParam from .waiting_room import WaitingRoom as WaitingRoom from .bundle_method import BundleMethod as BundleMethod diff --git a/src/cloudflare/types/addressing/__init__.py b/src/cloudflare/types/addressing/__init__.py index 432f22b7e76..09699f91e4e 100644 --- a/src/cloudflare/types/addressing/__init__.py +++ b/src/cloudflare/types/addressing/__init__.py @@ -2,15 +2,12 @@ from __future__ import annotations +from .prefix import Prefix as Prefix from .address_map import AddressMap as AddressMap from .prefix_edit_params import PrefixEditParams as PrefixEditParams -from .prefix_get_response import PrefixGetResponse as PrefixGetResponse from .prefix_create_params import PrefixCreateParams as PrefixCreateParams from .prefix_delete_params import PrefixDeleteParams as PrefixDeleteParams -from .prefix_edit_response import PrefixEditResponse as PrefixEditResponse -from .prefix_list_response import PrefixListResponse as PrefixListResponse from .service_list_response import ServiceListResponse as ServiceListResponse -from .prefix_create_response import PrefixCreateResponse as PrefixCreateResponse from .prefix_delete_response import PrefixDeleteResponse as PrefixDeleteResponse from .address_map_edit_params import AddressMapEditParams as AddressMapEditParams from .address_map_get_response import AddressMapGetResponse as AddressMapGetResponse diff --git a/src/cloudflare/types/addressing/prefix_get_response.py b/src/cloudflare/types/addressing/prefix.py similarity index 95% rename from src/cloudflare/types/addressing/prefix_get_response.py rename to src/cloudflare/types/addressing/prefix.py index 2d989739cb2..9dd12947704 100644 --- a/src/cloudflare/types/addressing/prefix_get_response.py +++ b/src/cloudflare/types/addressing/prefix.py @@ -5,10 +5,10 @@ from ..._models import BaseModel -__all__ = ["PrefixGetResponse"] +__all__ = ["Prefix"] -class PrefixGetResponse(BaseModel): +class Prefix(BaseModel): id: Optional[str] = None """Identifier""" diff --git a/src/cloudflare/types/addressing/prefix_create_response.py b/src/cloudflare/types/addressing/prefix_create_response.py deleted file mode 100644 index 3b65de87b01..00000000000 --- a/src/cloudflare/types/addressing/prefix_create_response.py +++ /dev/null @@ -1,59 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime - -from ..._models import BaseModel - -__all__ = ["PrefixCreateResponse"] - - -class PrefixCreateResponse(BaseModel): - id: Optional[str] = None - """Identifier""" - - account_id: Optional[str] = None - """Identifier""" - - advertised: Optional[bool] = None - """Prefix advertisement status to the Internet. - - This field is only not 'null' if on demand is enabled. - """ - - advertised_modified_at: Optional[datetime] = None - """Last time the advertisement status was changed. - - This field is only not 'null' if on demand is enabled. - """ - - approved: Optional[str] = None - """Approval state of the prefix (P = pending, V = active).""" - - asn: Optional[int] = None - """Autonomous System Number (ASN) the prefix will be advertised under.""" - - cidr: Optional[str] = None - """IP Prefix in Classless Inter-Domain Routing format.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """Description of the prefix.""" - - loa_document_id: Optional[str] = None - """Identifier for the uploaded LOA document.""" - - modified_at: Optional[datetime] = None - - on_demand_enabled: Optional[bool] = None - """ - Whether advertisement of the prefix to the Internet may be dynamically enabled - or disabled. - """ - - on_demand_locked: Optional[bool] = None - """ - Whether advertisement status of the prefix is locked, meaning it cannot be - changed. - """ diff --git a/src/cloudflare/types/addressing/prefix_edit_response.py b/src/cloudflare/types/addressing/prefix_edit_response.py deleted file mode 100644 index f01ab553be2..00000000000 --- a/src/cloudflare/types/addressing/prefix_edit_response.py +++ /dev/null @@ -1,59 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime - -from ..._models import BaseModel - -__all__ = ["PrefixEditResponse"] - - -class PrefixEditResponse(BaseModel): - id: Optional[str] = None - """Identifier""" - - account_id: Optional[str] = None - """Identifier""" - - advertised: Optional[bool] = None - """Prefix advertisement status to the Internet. - - This field is only not 'null' if on demand is enabled. - """ - - advertised_modified_at: Optional[datetime] = None - """Last time the advertisement status was changed. - - This field is only not 'null' if on demand is enabled. - """ - - approved: Optional[str] = None - """Approval state of the prefix (P = pending, V = active).""" - - asn: Optional[int] = None - """Autonomous System Number (ASN) the prefix will be advertised under.""" - - cidr: Optional[str] = None - """IP Prefix in Classless Inter-Domain Routing format.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """Description of the prefix.""" - - loa_document_id: Optional[str] = None - """Identifier for the uploaded LOA document.""" - - modified_at: Optional[datetime] = None - - on_demand_enabled: Optional[bool] = None - """ - Whether advertisement of the prefix to the Internet may be dynamically enabled - or disabled. - """ - - on_demand_locked: Optional[bool] = None - """ - Whether advertisement status of the prefix is locked, meaning it cannot be - changed. - """ diff --git a/src/cloudflare/types/addressing/prefix_list_response.py b/src/cloudflare/types/addressing/prefix_list_response.py deleted file mode 100644 index 1dca5210ba7..00000000000 --- a/src/cloudflare/types/addressing/prefix_list_response.py +++ /dev/null @@ -1,59 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime - -from ..._models import BaseModel - -__all__ = ["PrefixListResponse"] - - -class PrefixListResponse(BaseModel): - id: Optional[str] = None - """Identifier""" - - account_id: Optional[str] = None - """Identifier""" - - advertised: Optional[bool] = None - """Prefix advertisement status to the Internet. - - This field is only not 'null' if on demand is enabled. - """ - - advertised_modified_at: Optional[datetime] = None - """Last time the advertisement status was changed. - - This field is only not 'null' if on demand is enabled. - """ - - approved: Optional[str] = None - """Approval state of the prefix (P = pending, V = active).""" - - asn: Optional[int] = None - """Autonomous System Number (ASN) the prefix will be advertised under.""" - - cidr: Optional[str] = None - """IP Prefix in Classless Inter-Domain Routing format.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """Description of the prefix.""" - - loa_document_id: Optional[str] = None - """Identifier for the uploaded LOA document.""" - - modified_at: Optional[datetime] = None - - on_demand_enabled: Optional[bool] = None - """ - Whether advertisement of the prefix to the Internet may be dynamically enabled - or disabled. - """ - - on_demand_locked: Optional[bool] = None - """ - Whether advertisement status of the prefix is locked, meaning it cannot be - changed. - """ diff --git a/src/cloudflare/types/component.py b/src/cloudflare/types/component.py deleted file mode 100644 index 2c2a62b851e..00000000000 --- a/src/cloudflare/types/component.py +++ /dev/null @@ -1,19 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from typing_extensions import Literal - -from .._models import BaseModel - -__all__ = ["Component"] - - -class Component(BaseModel): - default: Optional[float] = None - """The default amount allocated.""" - - name: Optional[Literal["zones", "page_rules", "dedicated_certificates", "dedicated_certificates_custom"]] = None - """The unique component.""" - - unit_price: Optional[float] = None - """The unit price of the addon.""" diff --git a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py index 3571df468f8..ee9d690caa2 100644 --- a/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py +++ b/src/cloudflare/types/firewall/waf/packages/rule_edit_response.py @@ -31,7 +31,7 @@ class WAFManagedRulesAnomalyRule(BaseModel): group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" - mode: Literal["on", "off"] + mode: AllowedModesAnomaly """When set to `on`, the current WAF rule will be used when evaluating the request. Applies to anomaly detection WAF rules. diff --git a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py index 1da4d6fdd5d..29a688b1a13 100644 --- a/src/cloudflare/types/firewall/waf/packages/rule_list_response.py +++ b/src/cloudflare/types/firewall/waf/packages/rule_list_response.py @@ -31,7 +31,7 @@ class WAFManagedRulesAnomalyRule(BaseModel): group: WAFRuleGroup """The rule group to which the current WAF rule belongs.""" - mode: Literal["on", "off"] + mode: AllowedModesAnomaly """When set to `on`, the current WAF rule will be used when evaluating the request. Applies to anomaly detection WAF rules. diff --git a/src/cloudflare/types/load_balancers/__init__.py b/src/cloudflare/types/load_balancers/__init__.py index efdda69cbca..12a6bb95396 100644 --- a/src/cloudflare/types/load_balancers/__init__.py +++ b/src/cloudflare/types/load_balancers/__init__.py @@ -3,6 +3,7 @@ from __future__ import annotations from .pool import Pool as Pool +from .monitor import Monitor as Monitor from .pool_edit_params import PoolEditParams as PoolEditParams from .pool_list_params import PoolListParams as PoolListParams from .search_get_params import SearchGetParams as SearchGetParams @@ -13,15 +14,10 @@ from .monitor_edit_params import MonitorEditParams as MonitorEditParams from .region_get_response import RegionGetResponse as RegionGetResponse from .search_get_response import SearchGetResponse as SearchGetResponse -from .monitor_get_response import MonitorGetResponse as MonitorGetResponse from .pool_delete_response import PoolDeleteResponse as PoolDeleteResponse from .preview_get_response import PreviewGetResponse as PreviewGetResponse from .region_list_response import RegionListResponse as RegionListResponse from .monitor_create_params import MonitorCreateParams as MonitorCreateParams from .monitor_delete_params import MonitorDeleteParams as MonitorDeleteParams -from .monitor_edit_response import MonitorEditResponse as MonitorEditResponse -from .monitor_list_response import MonitorListResponse as MonitorListResponse from .monitor_update_params import MonitorUpdateParams as MonitorUpdateParams -from .monitor_create_response import MonitorCreateResponse as MonitorCreateResponse from .monitor_delete_response import MonitorDeleteResponse as MonitorDeleteResponse -from .monitor_update_response import MonitorUpdateResponse as MonitorUpdateResponse diff --git a/src/cloudflare/types/load_balancers/monitor_get_response.py b/src/cloudflare/types/load_balancers/monitor.py similarity index 97% rename from src/cloudflare/types/load_balancers/monitor_get_response.py rename to src/cloudflare/types/load_balancers/monitor.py index 8290d01dc43..5ab61feed08 100644 --- a/src/cloudflare/types/load_balancers/monitor_get_response.py +++ b/src/cloudflare/types/load_balancers/monitor.py @@ -6,10 +6,10 @@ from ..._models import BaseModel -__all__ = ["MonitorGetResponse"] +__all__ = ["Monitor"] -class MonitorGetResponse(BaseModel): +class Monitor(BaseModel): id: Optional[str] = None allow_insecure: Optional[bool] = None diff --git a/src/cloudflare/types/load_balancers/monitor_create_response.py b/src/cloudflare/types/load_balancers/monitor_create_response.py deleted file mode 100644 index 8089b74bcc5..00000000000 --- a/src/cloudflare/types/load_balancers/monitor_create_response.py +++ /dev/null @@ -1,113 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel - -__all__ = ["MonitorCreateResponse"] - - -class MonitorCreateResponse(BaseModel): - id: Optional[str] = None - - allow_insecure: Optional[bool] = None - """Do not validate the certificate when monitor use HTTPS. - - This parameter is currently only valid for HTTP and HTTPS monitors. - """ - - consecutive_down: Optional[int] = None - """ - To be marked unhealthy the monitored origin must fail this healthcheck N - consecutive times. - """ - - consecutive_up: Optional[int] = None - """ - To be marked healthy the monitored origin must pass this healthcheck N - consecutive times. - """ - - created_on: Optional[datetime] = None - - description: Optional[str] = None - """Object description.""" - - expected_body: Optional[str] = None - """A case-insensitive sub-string to look for in the response body. - - If this string is not found, the origin will be marked as unhealthy. This - parameter is only valid for HTTP and HTTPS monitors. - """ - - expected_codes: Optional[str] = None - """The expected HTTP response code or code range of the health check. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - follow_redirects: Optional[bool] = None - """Follow redirects if returned by the origin. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - header: Optional[object] = None - """The HTTP request headers to send in the health check. - - It is recommended you set a Host header by default. The User-Agent header cannot - be overridden. This parameter is only valid for HTTP and HTTPS monitors. - """ - - interval: Optional[int] = None - """The interval between each health check. - - Shorter intervals may improve failover time, but will increase load on the - origins as we check from multiple locations. - """ - - method: Optional[str] = None - """The method to use for the health check. - - This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' - for TCP based health checks. - """ - - modified_on: Optional[datetime] = None - - path: Optional[str] = None - """The endpoint path you want to conduct a health check against. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - port: Optional[int] = None - """The port number to connect to for the health check. - - Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define - the port when using a non-standard port (HTTP: default 80, HTTPS: default 443). - """ - - probe_zone: Optional[str] = None - """Assign this monitor to emulate the specified zone while probing. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - retries: Optional[int] = None - """ - The number of retries to attempt in case of a timeout before marking the origin - as unhealthy. Retries are attempted immediately. - """ - - timeout: Optional[int] = None - """The timeout (in seconds) before marking the health check as failed.""" - - type: Optional[Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"]] = None - """The protocol to use for the health check. - - Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', - 'UDP-ICMP', and 'SMTP'. - """ diff --git a/src/cloudflare/types/load_balancers/monitor_edit_response.py b/src/cloudflare/types/load_balancers/monitor_edit_response.py deleted file mode 100644 index aeb05c5163b..00000000000 --- a/src/cloudflare/types/load_balancers/monitor_edit_response.py +++ /dev/null @@ -1,113 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel - -__all__ = ["MonitorEditResponse"] - - -class MonitorEditResponse(BaseModel): - id: Optional[str] = None - - allow_insecure: Optional[bool] = None - """Do not validate the certificate when monitor use HTTPS. - - This parameter is currently only valid for HTTP and HTTPS monitors. - """ - - consecutive_down: Optional[int] = None - """ - To be marked unhealthy the monitored origin must fail this healthcheck N - consecutive times. - """ - - consecutive_up: Optional[int] = None - """ - To be marked healthy the monitored origin must pass this healthcheck N - consecutive times. - """ - - created_on: Optional[datetime] = None - - description: Optional[str] = None - """Object description.""" - - expected_body: Optional[str] = None - """A case-insensitive sub-string to look for in the response body. - - If this string is not found, the origin will be marked as unhealthy. This - parameter is only valid for HTTP and HTTPS monitors. - """ - - expected_codes: Optional[str] = None - """The expected HTTP response code or code range of the health check. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - follow_redirects: Optional[bool] = None - """Follow redirects if returned by the origin. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - header: Optional[object] = None - """The HTTP request headers to send in the health check. - - It is recommended you set a Host header by default. The User-Agent header cannot - be overridden. This parameter is only valid for HTTP and HTTPS monitors. - """ - - interval: Optional[int] = None - """The interval between each health check. - - Shorter intervals may improve failover time, but will increase load on the - origins as we check from multiple locations. - """ - - method: Optional[str] = None - """The method to use for the health check. - - This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' - for TCP based health checks. - """ - - modified_on: Optional[datetime] = None - - path: Optional[str] = None - """The endpoint path you want to conduct a health check against. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - port: Optional[int] = None - """The port number to connect to for the health check. - - Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define - the port when using a non-standard port (HTTP: default 80, HTTPS: default 443). - """ - - probe_zone: Optional[str] = None - """Assign this monitor to emulate the specified zone while probing. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - retries: Optional[int] = None - """ - The number of retries to attempt in case of a timeout before marking the origin - as unhealthy. Retries are attempted immediately. - """ - - timeout: Optional[int] = None - """The timeout (in seconds) before marking the health check as failed.""" - - type: Optional[Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"]] = None - """The protocol to use for the health check. - - Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', - 'UDP-ICMP', and 'SMTP'. - """ diff --git a/src/cloudflare/types/load_balancers/monitor_list_response.py b/src/cloudflare/types/load_balancers/monitor_list_response.py deleted file mode 100644 index 9aa8ceb39c3..00000000000 --- a/src/cloudflare/types/load_balancers/monitor_list_response.py +++ /dev/null @@ -1,113 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel - -__all__ = ["MonitorListResponse"] - - -class MonitorListResponse(BaseModel): - id: Optional[str] = None - - allow_insecure: Optional[bool] = None - """Do not validate the certificate when monitor use HTTPS. - - This parameter is currently only valid for HTTP and HTTPS monitors. - """ - - consecutive_down: Optional[int] = None - """ - To be marked unhealthy the monitored origin must fail this healthcheck N - consecutive times. - """ - - consecutive_up: Optional[int] = None - """ - To be marked healthy the monitored origin must pass this healthcheck N - consecutive times. - """ - - created_on: Optional[datetime] = None - - description: Optional[str] = None - """Object description.""" - - expected_body: Optional[str] = None - """A case-insensitive sub-string to look for in the response body. - - If this string is not found, the origin will be marked as unhealthy. This - parameter is only valid for HTTP and HTTPS monitors. - """ - - expected_codes: Optional[str] = None - """The expected HTTP response code or code range of the health check. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - follow_redirects: Optional[bool] = None - """Follow redirects if returned by the origin. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - header: Optional[object] = None - """The HTTP request headers to send in the health check. - - It is recommended you set a Host header by default. The User-Agent header cannot - be overridden. This parameter is only valid for HTTP and HTTPS monitors. - """ - - interval: Optional[int] = None - """The interval between each health check. - - Shorter intervals may improve failover time, but will increase load on the - origins as we check from multiple locations. - """ - - method: Optional[str] = None - """The method to use for the health check. - - This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' - for TCP based health checks. - """ - - modified_on: Optional[datetime] = None - - path: Optional[str] = None - """The endpoint path you want to conduct a health check against. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - port: Optional[int] = None - """The port number to connect to for the health check. - - Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define - the port when using a non-standard port (HTTP: default 80, HTTPS: default 443). - """ - - probe_zone: Optional[str] = None - """Assign this monitor to emulate the specified zone while probing. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - retries: Optional[int] = None - """ - The number of retries to attempt in case of a timeout before marking the origin - as unhealthy. Retries are attempted immediately. - """ - - timeout: Optional[int] = None - """The timeout (in seconds) before marking the health check as failed.""" - - type: Optional[Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"]] = None - """The protocol to use for the health check. - - Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', - 'UDP-ICMP', and 'SMTP'. - """ diff --git a/src/cloudflare/types/load_balancers/monitor_update_response.py b/src/cloudflare/types/load_balancers/monitor_update_response.py deleted file mode 100644 index 710f34caf93..00000000000 --- a/src/cloudflare/types/load_balancers/monitor_update_response.py +++ /dev/null @@ -1,113 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel - -__all__ = ["MonitorUpdateResponse"] - - -class MonitorUpdateResponse(BaseModel): - id: Optional[str] = None - - allow_insecure: Optional[bool] = None - """Do not validate the certificate when monitor use HTTPS. - - This parameter is currently only valid for HTTP and HTTPS monitors. - """ - - consecutive_down: Optional[int] = None - """ - To be marked unhealthy the monitored origin must fail this healthcheck N - consecutive times. - """ - - consecutive_up: Optional[int] = None - """ - To be marked healthy the monitored origin must pass this healthcheck N - consecutive times. - """ - - created_on: Optional[datetime] = None - - description: Optional[str] = None - """Object description.""" - - expected_body: Optional[str] = None - """A case-insensitive sub-string to look for in the response body. - - If this string is not found, the origin will be marked as unhealthy. This - parameter is only valid for HTTP and HTTPS monitors. - """ - - expected_codes: Optional[str] = None - """The expected HTTP response code or code range of the health check. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - follow_redirects: Optional[bool] = None - """Follow redirects if returned by the origin. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - header: Optional[object] = None - """The HTTP request headers to send in the health check. - - It is recommended you set a Host header by default. The User-Agent header cannot - be overridden. This parameter is only valid for HTTP and HTTPS monitors. - """ - - interval: Optional[int] = None - """The interval between each health check. - - Shorter intervals may improve failover time, but will increase load on the - origins as we check from multiple locations. - """ - - method: Optional[str] = None - """The method to use for the health check. - - This defaults to 'GET' for HTTP/HTTPS based checks and 'connection_established' - for TCP based health checks. - """ - - modified_on: Optional[datetime] = None - - path: Optional[str] = None - """The endpoint path you want to conduct a health check against. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - port: Optional[int] = None - """The port number to connect to for the health check. - - Required for TCP, UDP, and SMTP checks. HTTP and HTTPS checks should only define - the port when using a non-standard port (HTTP: default 80, HTTPS: default 443). - """ - - probe_zone: Optional[str] = None - """Assign this monitor to emulate the specified zone while probing. - - This parameter is only valid for HTTP and HTTPS monitors. - """ - - retries: Optional[int] = None - """ - The number of retries to attempt in case of a timeout before marking the origin - as unhealthy. Retries are attempted immediately. - """ - - timeout: Optional[int] = None - """The timeout (in seconds) before marking the health check as failed.""" - - type: Optional[Literal["http", "https", "tcp", "udp_icmp", "icmp_ping", "smtp"]] = None - """The protocol to use for the health check. - - Currently supported protocols are 'HTTP','HTTPS', 'TCP', 'ICMP-PING', - 'UDP-ICMP', and 'SMTP'. - """ diff --git a/src/cloudflare/types/logpush/__init__.py b/src/cloudflare/types/logpush/__init__.py index b5aac2564c6..3cb4874d683 100644 --- a/src/cloudflare/types/logpush/__init__.py +++ b/src/cloudflare/types/logpush/__init__.py @@ -2,18 +2,15 @@ from __future__ import annotations +from .logpush_job import LogpushJob as LogpushJob from .output_options import OutputOptions as OutputOptions -from .job_get_response import JobGetResponse as JobGetResponse from .edge_get_response import EdgeGetResponse as EdgeGetResponse from .job_create_params import JobCreateParams as JobCreateParams from .job_delete_params import JobDeleteParams as JobDeleteParams -from .job_list_response import JobListResponse as JobListResponse from .job_update_params import JobUpdateParams as JobUpdateParams from .edge_create_params import EdgeCreateParams as EdgeCreateParams from .instant_logpush_job import InstantLogpushJob as InstantLogpushJob -from .job_create_response import JobCreateResponse as JobCreateResponse from .job_delete_response import JobDeleteResponse as JobDeleteResponse -from .job_update_response import JobUpdateResponse as JobUpdateResponse from .output_options_param import OutputOptionsParam as OutputOptionsParam from .ownership_validation import OwnershipValidation as OwnershipValidation from .validate_origin_params import ValidateOriginParams as ValidateOriginParams diff --git a/src/cloudflare/types/logpush/datasets/job_get_response.py b/src/cloudflare/types/logpush/datasets/job_get_response.py index 6282a6c3169..18a04965c99 100644 --- a/src/cloudflare/types/logpush/datasets/job_get_response.py +++ b/src/cloudflare/types/logpush/datasets/job_get_response.py @@ -1,85 +1,9 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from typing import List, Optional -from datetime import datetime -from typing_extensions import Literal -from ...._models import BaseModel -from ..output_options import OutputOptions +from ..logpush_job import LogpushJob -__all__ = ["JobGetResponse", "JobGetResponseItem"] +__all__ = ["JobGetResponse"] - -class JobGetResponseItem(BaseModel): - id: Optional[int] = None - """Unique id of the job.""" - - dataset: Optional[str] = None - """Name of the dataset.""" - - destination_conf: Optional[str] = None - """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. - - Additional configuration parameters supported by the destination may be - included. - """ - - enabled: Optional[bool] = None - """Flag that indicates if the job is enabled.""" - - error_message: Optional[datetime] = None - """If not null, the job is currently failing. - - Failures are usually repetitive (example: no permissions to write to destination - bucket). Only the last failure is recorded. On successful execution of a job the - error_message and last_error are set to null. - """ - - frequency: Optional[Literal["high", "low"]] = None - """The frequency at which Cloudflare sends batches of logs to your destination. - - Setting frequency to high sends your logs in larger quantities of smaller files. - Setting frequency to low sends logs in smaller quantities of larger files. - """ - - last_complete: Optional[datetime] = None - """Records the last time for which logs have been successfully pushed. - - If the last successful push was for logs range 2018-07-23T10:00:00Z to - 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. - If the job has never run or has just been enabled and hasn't run yet then the - field will be empty. - """ - - last_error: Optional[datetime] = None - """Records the last time the job failed. - - If not null, the job is currently failing. If null, the job has either never - failed or has run successfully at least once since last failure. See also the - error_message field. - """ - - logpull_options: Optional[str] = None - """This field is deprecated. - - Use `output_options` instead. Configuration string. It specifies things like - requested fields and timestamp formats. If migrating from the logpull api, copy - the url (full url or just the query string) of your call here, and logpush will - keep on making this call for you, setting start and end times appropriately. - """ - - name: Optional[str] = None - """Optional human readable job name. - - Not unique. Cloudflare suggests that you set this to a meaningful string, like - the domain name, to make it easier to identify your job. - """ - - output_options: Optional[OutputOptions] = None - """The structured replacement for `logpull_options`. - - When including this field, the `logpull_option` field will be ignored. - """ - - -JobGetResponse = List[Optional[JobGetResponseItem]] +JobGetResponse = List[Optional[LogpushJob]] diff --git a/src/cloudflare/types/logpush/job_create_response.py b/src/cloudflare/types/logpush/job_create_response.py deleted file mode 100644 index 59ddaf3fb60..00000000000 --- a/src/cloudflare/types/logpush/job_create_response.py +++ /dev/null @@ -1,82 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel -from .output_options import OutputOptions - -__all__ = ["JobCreateResponse"] - - -class JobCreateResponse(BaseModel): - id: Optional[int] = None - """Unique id of the job.""" - - dataset: Optional[str] = None - """Name of the dataset.""" - - destination_conf: Optional[str] = None - """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. - - Additional configuration parameters supported by the destination may be - included. - """ - - enabled: Optional[bool] = None - """Flag that indicates if the job is enabled.""" - - error_message: Optional[datetime] = None - """If not null, the job is currently failing. - - Failures are usually repetitive (example: no permissions to write to destination - bucket). Only the last failure is recorded. On successful execution of a job the - error_message and last_error are set to null. - """ - - frequency: Optional[Literal["high", "low"]] = None - """The frequency at which Cloudflare sends batches of logs to your destination. - - Setting frequency to high sends your logs in larger quantities of smaller files. - Setting frequency to low sends logs in smaller quantities of larger files. - """ - - last_complete: Optional[datetime] = None - """Records the last time for which logs have been successfully pushed. - - If the last successful push was for logs range 2018-07-23T10:00:00Z to - 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. - If the job has never run or has just been enabled and hasn't run yet then the - field will be empty. - """ - - last_error: Optional[datetime] = None - """Records the last time the job failed. - - If not null, the job is currently failing. If null, the job has either never - failed or has run successfully at least once since last failure. See also the - error_message field. - """ - - logpull_options: Optional[str] = None - """This field is deprecated. - - Use `output_options` instead. Configuration string. It specifies things like - requested fields and timestamp formats. If migrating from the logpull api, copy - the url (full url or just the query string) of your call here, and logpush will - keep on making this call for you, setting start and end times appropriately. - """ - - name: Optional[str] = None - """Optional human readable job name. - - Not unique. Cloudflare suggests that you set this to a meaningful string, like - the domain name, to make it easier to identify your job. - """ - - output_options: Optional[OutputOptions] = None - """The structured replacement for `logpull_options`. - - When including this field, the `logpull_option` field will be ignored. - """ diff --git a/src/cloudflare/types/logpush/job_list_response.py b/src/cloudflare/types/logpush/job_list_response.py deleted file mode 100644 index 42361aac6a8..00000000000 --- a/src/cloudflare/types/logpush/job_list_response.py +++ /dev/null @@ -1,82 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel -from .output_options import OutputOptions - -__all__ = ["JobListResponse"] - - -class JobListResponse(BaseModel): - id: Optional[int] = None - """Unique id of the job.""" - - dataset: Optional[str] = None - """Name of the dataset.""" - - destination_conf: Optional[str] = None - """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. - - Additional configuration parameters supported by the destination may be - included. - """ - - enabled: Optional[bool] = None - """Flag that indicates if the job is enabled.""" - - error_message: Optional[datetime] = None - """If not null, the job is currently failing. - - Failures are usually repetitive (example: no permissions to write to destination - bucket). Only the last failure is recorded. On successful execution of a job the - error_message and last_error are set to null. - """ - - frequency: Optional[Literal["high", "low"]] = None - """The frequency at which Cloudflare sends batches of logs to your destination. - - Setting frequency to high sends your logs in larger quantities of smaller files. - Setting frequency to low sends logs in smaller quantities of larger files. - """ - - last_complete: Optional[datetime] = None - """Records the last time for which logs have been successfully pushed. - - If the last successful push was for logs range 2018-07-23T10:00:00Z to - 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. - If the job has never run or has just been enabled and hasn't run yet then the - field will be empty. - """ - - last_error: Optional[datetime] = None - """Records the last time the job failed. - - If not null, the job is currently failing. If null, the job has either never - failed or has run successfully at least once since last failure. See also the - error_message field. - """ - - logpull_options: Optional[str] = None - """This field is deprecated. - - Use `output_options` instead. Configuration string. It specifies things like - requested fields and timestamp formats. If migrating from the logpull api, copy - the url (full url or just the query string) of your call here, and logpush will - keep on making this call for you, setting start and end times appropriately. - """ - - name: Optional[str] = None - """Optional human readable job name. - - Not unique. Cloudflare suggests that you set this to a meaningful string, like - the domain name, to make it easier to identify your job. - """ - - output_options: Optional[OutputOptions] = None - """The structured replacement for `logpull_options`. - - When including this field, the `logpull_option` field will be ignored. - """ diff --git a/src/cloudflare/types/logpush/job_update_response.py b/src/cloudflare/types/logpush/job_update_response.py deleted file mode 100644 index 8d9b7b631a1..00000000000 --- a/src/cloudflare/types/logpush/job_update_response.py +++ /dev/null @@ -1,82 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel -from .output_options import OutputOptions - -__all__ = ["JobUpdateResponse"] - - -class JobUpdateResponse(BaseModel): - id: Optional[int] = None - """Unique id of the job.""" - - dataset: Optional[str] = None - """Name of the dataset.""" - - destination_conf: Optional[str] = None - """Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. - - Additional configuration parameters supported by the destination may be - included. - """ - - enabled: Optional[bool] = None - """Flag that indicates if the job is enabled.""" - - error_message: Optional[datetime] = None - """If not null, the job is currently failing. - - Failures are usually repetitive (example: no permissions to write to destination - bucket). Only the last failure is recorded. On successful execution of a job the - error_message and last_error are set to null. - """ - - frequency: Optional[Literal["high", "low"]] = None - """The frequency at which Cloudflare sends batches of logs to your destination. - - Setting frequency to high sends your logs in larger quantities of smaller files. - Setting frequency to low sends logs in smaller quantities of larger files. - """ - - last_complete: Optional[datetime] = None - """Records the last time for which logs have been successfully pushed. - - If the last successful push was for logs range 2018-07-23T10:00:00Z to - 2018-07-23T10:01:00Z then the value of this field will be 2018-07-23T10:01:00Z. - If the job has never run or has just been enabled and hasn't run yet then the - field will be empty. - """ - - last_error: Optional[datetime] = None - """Records the last time the job failed. - - If not null, the job is currently failing. If null, the job has either never - failed or has run successfully at least once since last failure. See also the - error_message field. - """ - - logpull_options: Optional[str] = None - """This field is deprecated. - - Use `output_options` instead. Configuration string. It specifies things like - requested fields and timestamp formats. If migrating from the logpull api, copy - the url (full url or just the query string) of your call here, and logpush will - keep on making this call for you, setting start and end times appropriately. - """ - - name: Optional[str] = None - """Optional human readable job name. - - Not unique. Cloudflare suggests that you set this to a meaningful string, like - the domain name, to make it easier to identify your job. - """ - - output_options: Optional[OutputOptions] = None - """The structured replacement for `logpull_options`. - - When including this field, the `logpull_option` field will be ignored. - """ diff --git a/src/cloudflare/types/logpush/job_get_response.py b/src/cloudflare/types/logpush/logpush_job.py similarity index 97% rename from src/cloudflare/types/logpush/job_get_response.py rename to src/cloudflare/types/logpush/logpush_job.py index d89f119fd84..0abab1cd0b8 100644 --- a/src/cloudflare/types/logpush/job_get_response.py +++ b/src/cloudflare/types/logpush/logpush_job.py @@ -7,10 +7,10 @@ from ..._models import BaseModel from .output_options import OutputOptions -__all__ = ["JobGetResponse"] +__all__ = ["LogpushJob"] -class JobGetResponse(BaseModel): +class LogpushJob(BaseModel): id: Optional[int] = None """Unique id of the job.""" diff --git a/src/cloudflare/types/origin_tls_client_auth/__init__.py b/src/cloudflare/types/origin_tls_client_auth/__init__.py index 46472fc8374..608cef2cd9d 100644 --- a/src/cloudflare/types/origin_tls_client_auth/__init__.py +++ b/src/cloudflare/types/origin_tls_client_auth/__init__.py @@ -2,7 +2,6 @@ from __future__ import annotations -from .id import ID as ID from .setting_get_response import SettingGetResponse as SettingGetResponse from .setting_update_params import SettingUpdateParams as SettingUpdateParams from .hostname_update_params import HostnameUpdateParams as HostnameUpdateParams diff --git a/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py b/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py index 97dc2c8e6e8..4f996546dc2 100644 --- a/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py +++ b/src/cloudflare/types/origin_tls_client_auth/authenticated_origin_pull.py @@ -1,6 +1,8 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from typing import Optional +from datetime import datetime +from typing_extensions import Literal from ..._models import BaseModel @@ -8,26 +10,70 @@ class AuthenticatedOriginPull(BaseModel): - id: Optional[str] = None - """Identifier""" - cert_id: Optional[str] = None """Identifier""" + cert_status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate or the association.""" + + cert_updated_at: Optional[datetime] = None + """The time when the certificate was updated.""" + + cert_uploaded_on: Optional[datetime] = None + """The time when the certificate was uploaded.""" + certificate: Optional[str] = None """The hostname certificate.""" + created_at: Optional[datetime] = None + """The time when the certificate was created.""" + enabled: Optional[bool] = None """Indicates whether hostname-level authenticated origin pulls is enabled. A null value voids the association. """ + expires_on: Optional[datetime] = None + """The date when the certificate expires.""" + hostname: Optional[str] = None """ The hostname on the origin for which the client certificate uploaded will be used. """ - private_key: Optional[str] = None - """The hostname certificate's private key.""" + issuer: Optional[str] = None + """The certificate authority that issued the certificate.""" + + serial_number: Optional[str] = None + """The serial number on the uploaded certificate.""" + + signature: Optional[str] = None + """The type of hash used for the certificate.""" + + status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate or the association.""" + + updated_at: Optional[datetime] = None + """The time when the certificate was updated.""" diff --git a/src/cloudflare/types/origin_tls_client_auth/id.py b/src/cloudflare/types/origin_tls_client_auth/id.py deleted file mode 100644 index f88df713fdf..00000000000 --- a/src/cloudflare/types/origin_tls_client_auth/id.py +++ /dev/null @@ -1,79 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ..._models import BaseModel - -__all__ = ["ID"] - - -class ID(BaseModel): - cert_id: Optional[str] = None - """Identifier""" - - cert_status: Optional[ - Literal[ - "initializing", - "pending_deployment", - "pending_deletion", - "active", - "deleted", - "deployment_timed_out", - "deletion_timed_out", - ] - ] = None - """Status of the certificate or the association.""" - - cert_updated_at: Optional[datetime] = None - """The time when the certificate was updated.""" - - cert_uploaded_on: Optional[datetime] = None - """The time when the certificate was uploaded.""" - - certificate: Optional[str] = None - """The hostname certificate.""" - - created_at: Optional[datetime] = None - """The time when the certificate was created.""" - - enabled: Optional[bool] = None - """Indicates whether hostname-level authenticated origin pulls is enabled. - - A null value voids the association. - """ - - expires_on: Optional[datetime] = None - """The date when the certificate expires.""" - - hostname: Optional[str] = None - """ - The hostname on the origin for which the client certificate uploaded will be - used. - """ - - issuer: Optional[str] = None - """The certificate authority that issued the certificate.""" - - serial_number: Optional[str] = None - """The serial number on the uploaded certificate.""" - - signature: Optional[str] = None - """The type of hash used for the certificate.""" - - status: Optional[ - Literal[ - "initializing", - "pending_deployment", - "pending_deletion", - "active", - "deleted", - "deployment_timed_out", - "deletion_timed_out", - ] - ] = None - """Status of the certificate or the association.""" - - updated_at: Optional[datetime] = None - """The time when the certificate was updated.""" diff --git a/src/cloudflare/types/page_rule.py b/src/cloudflare/types/page_rule.py index 2f6d75e96a0..ce052dd09e5 100644 --- a/src/cloudflare/types/page_rule.py +++ b/src/cloudflare/types/page_rule.py @@ -5,7 +5,7 @@ from typing_extensions import Literal from .route import Route -from .targes import Targes +from .target import Target from .._models import BaseModel __all__ = ["PageRule"] @@ -39,5 +39,5 @@ class PageRule(BaseModel): status: Literal["active", "disabled"] """The status of the Page Rule.""" - targets: List[Targes] + targets: List[Target] """The rule targets to evaluate on each request.""" diff --git a/src/cloudflare/types/pagerule_create_params.py b/src/cloudflare/types/pagerule_create_params.py index c55654e839b..dfbfb883782 100644 --- a/src/cloudflare/types/pagerule_create_params.py +++ b/src/cloudflare/types/pagerule_create_params.py @@ -6,7 +6,7 @@ from typing_extensions import Literal, Required, TypedDict from .route_param import RouteParam -from .targes_param import TargesParam +from .target_param import TargetParam __all__ = ["PageruleCreateParams"] @@ -21,7 +21,7 @@ class PageruleCreateParams(TypedDict, total=False): Actions can redirect to another URL or override settings, but not both. """ - targets: Required[Iterable[TargesParam]] + targets: Required[Iterable[TargetParam]] """The rule targets to evaluate on each request.""" priority: int diff --git a/src/cloudflare/types/pagerule_edit_params.py b/src/cloudflare/types/pagerule_edit_params.py index 5e7ad93b14c..5d2ed4636b2 100644 --- a/src/cloudflare/types/pagerule_edit_params.py +++ b/src/cloudflare/types/pagerule_edit_params.py @@ -6,7 +6,7 @@ from typing_extensions import Literal, Required, TypedDict from .route_param import RouteParam -from .targes_param import TargesParam +from .target_param import TargetParam __all__ = ["PageruleEditParams"] @@ -33,5 +33,5 @@ class PageruleEditParams(TypedDict, total=False): status: Literal["active", "disabled"] """The status of the Page Rule.""" - targets: Iterable[TargesParam] + targets: Iterable[TargetParam] """The rule targets to evaluate on each request.""" diff --git a/src/cloudflare/types/pagerule_update_params.py b/src/cloudflare/types/pagerule_update_params.py index 0a94354ed61..4637d036a12 100644 --- a/src/cloudflare/types/pagerule_update_params.py +++ b/src/cloudflare/types/pagerule_update_params.py @@ -6,7 +6,7 @@ from typing_extensions import Literal, Required, TypedDict from .route_param import RouteParam -from .targes_param import TargesParam +from .target_param import TargetParam __all__ = ["PageruleUpdateParams"] @@ -21,7 +21,7 @@ class PageruleUpdateParams(TypedDict, total=False): Actions can redirect to another URL or override settings, but not both. """ - targets: Required[Iterable[TargesParam]] + targets: Required[Iterable[TargetParam]] """The rule targets to evaluate on each request.""" priority: int diff --git a/src/cloudflare/types/rate_plan.py b/src/cloudflare/types/rate_plan.py index e98c7044d5b..64ed960cc44 100644 --- a/src/cloudflare/types/rate_plan.py +++ b/src/cloudflare/types/rate_plan.py @@ -4,9 +4,19 @@ from typing_extensions import Literal from .._models import BaseModel -from .component import Component -__all__ = ["RatePlan"] +__all__ = ["RatePlan", "Component"] + + +class Component(BaseModel): + default: Optional[float] = None + """The default amount allocated.""" + + name: Optional[Literal["zones", "page_rules", "dedicated_certificates", "dedicated_certificates_custom"]] = None + """The unique component.""" + + unit_price: Optional[float] = None + """The unit price of the addon.""" class RatePlan(BaseModel): diff --git a/src/cloudflare/types/rate_plan_param.py b/src/cloudflare/types/rate_plan_param.py index 36cc091ceae..7987224641d 100644 --- a/src/cloudflare/types/rate_plan_param.py +++ b/src/cloudflare/types/rate_plan_param.py @@ -3,11 +3,17 @@ from __future__ import annotations from typing import Iterable -from typing_extensions import TypedDict +from typing_extensions import Literal, TypedDict -from .component import Component +__all__ = ["RatePlanParam", "Component"] -__all__ = ["RatePlanParam"] + +class Component(TypedDict, total=False): + default: float + """The default amount allocated.""" + + name: Literal["zones", "page_rules", "dedicated_certificates", "dedicated_certificates_custom"] + """The unique component.""" class RatePlanParam(TypedDict, total=False): diff --git a/src/cloudflare/types/secondary_dns/__init__.py b/src/cloudflare/types/secondary_dns/__init__.py index 6617ed08977..72716c6630b 100644 --- a/src/cloudflare/types/secondary_dns/__init__.py +++ b/src/cloudflare/types/secondary_dns/__init__.py @@ -3,6 +3,7 @@ from __future__ import annotations from .acl import ACL as ACL +from .peer import Peer as Peer from .tsig import TSIG as TSIG from .force_axfr import ForceAXFR as ForceAXFR from .enable_transfer import EnableTransfer as EnableTransfer @@ -11,18 +12,14 @@ from .acl_create_params import ACLCreateParams as ACLCreateParams from .acl_delete_params import ACLDeleteParams as ACLDeleteParams from .acl_update_params import ACLUpdateParams as ACLUpdateParams -from .peer_get_response import PeerGetResponse as PeerGetResponse from .peer_create_params import PeerCreateParams as PeerCreateParams from .peer_delete_params import PeerDeleteParams as PeerDeleteParams -from .peer_list_response import PeerListResponse as PeerListResponse from .peer_update_params import PeerUpdateParams as PeerUpdateParams from .tsig_create_params import TSIGCreateParams as TSIGCreateParams from .tsig_delete_params import TSIGDeleteParams as TSIGDeleteParams from .tsig_update_params import TSIGUpdateParams as TSIGUpdateParams from .acl_delete_response import ACLDeleteResponse as ACLDeleteResponse -from .peer_create_response import PeerCreateResponse as PeerCreateResponse from .peer_delete_response import PeerDeleteResponse as PeerDeleteResponse -from .peer_update_response import PeerUpdateResponse as PeerUpdateResponse from .tsig_delete_response import TSIGDeleteResponse as TSIGDeleteResponse from .incoming_get_response import IncomingGetResponse as IncomingGetResponse from .outgoing_get_response import OutgoingGetResponse as OutgoingGetResponse diff --git a/src/cloudflare/types/secondary_dns/peer_get_response.py b/src/cloudflare/types/secondary_dns/peer.py similarity index 94% rename from src/cloudflare/types/secondary_dns/peer_get_response.py rename to src/cloudflare/types/secondary_dns/peer.py index 0ed79690966..502be2d220f 100644 --- a/src/cloudflare/types/secondary_dns/peer_get_response.py +++ b/src/cloudflare/types/secondary_dns/peer.py @@ -4,10 +4,10 @@ from ..._models import BaseModel -__all__ = ["PeerGetResponse"] +__all__ = ["Peer"] -class PeerGetResponse(BaseModel): +class Peer(BaseModel): id: str name: str diff --git a/src/cloudflare/types/secondary_dns/peer_create_response.py b/src/cloudflare/types/secondary_dns/peer_create_response.py deleted file mode 100644 index b793a770ba2..00000000000 --- a/src/cloudflare/types/secondary_dns/peer_create_response.py +++ /dev/null @@ -1,38 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from ..._models import BaseModel - -__all__ = ["PeerCreateResponse"] - - -class PeerCreateResponse(BaseModel): - id: str - - name: str - """The name of the peer.""" - - ip: Optional[str] = None - """ - IPv4/IPv6 address of primary or secondary nameserver, depending on what zone - this peer is linked to. For primary zones this IP defines the IP of the - secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary - zones this IP defines the IP of the primary nameserver Cloudflare will send - AXFR/IXFR requests to. - """ - - ixfr_enable: Optional[bool] = None - """Enable IXFR transfer protocol, default is AXFR. - - Only applicable to secondary zones. - """ - - port: Optional[float] = None - """ - DNS port of primary or secondary nameserver, depending on what zone this peer is - linked to. - """ - - tsig_id: Optional[str] = None - """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/secondary_dns/peer_list_response.py b/src/cloudflare/types/secondary_dns/peer_list_response.py deleted file mode 100644 index 89a0d78d331..00000000000 --- a/src/cloudflare/types/secondary_dns/peer_list_response.py +++ /dev/null @@ -1,38 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from ..._models import BaseModel - -__all__ = ["PeerListResponse"] - - -class PeerListResponse(BaseModel): - id: str - - name: str - """The name of the peer.""" - - ip: Optional[str] = None - """ - IPv4/IPv6 address of primary or secondary nameserver, depending on what zone - this peer is linked to. For primary zones this IP defines the IP of the - secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary - zones this IP defines the IP of the primary nameserver Cloudflare will send - AXFR/IXFR requests to. - """ - - ixfr_enable: Optional[bool] = None - """Enable IXFR transfer protocol, default is AXFR. - - Only applicable to secondary zones. - """ - - port: Optional[float] = None - """ - DNS port of primary or secondary nameserver, depending on what zone this peer is - linked to. - """ - - tsig_id: Optional[str] = None - """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/secondary_dns/peer_update_response.py b/src/cloudflare/types/secondary_dns/peer_update_response.py deleted file mode 100644 index 03c711bf653..00000000000 --- a/src/cloudflare/types/secondary_dns/peer_update_response.py +++ /dev/null @@ -1,38 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from ..._models import BaseModel - -__all__ = ["PeerUpdateResponse"] - - -class PeerUpdateResponse(BaseModel): - id: str - - name: str - """The name of the peer.""" - - ip: Optional[str] = None - """ - IPv4/IPv6 address of primary or secondary nameserver, depending on what zone - this peer is linked to. For primary zones this IP defines the IP of the - secondary nameserver Cloudflare will NOTIFY upon zone changes. For secondary - zones this IP defines the IP of the primary nameserver Cloudflare will send - AXFR/IXFR requests to. - """ - - ixfr_enable: Optional[bool] = None - """Enable IXFR transfer protocol, default is AXFR. - - Only applicable to secondary zones. - """ - - port: Optional[float] = None - """ - DNS port of primary or secondary nameserver, depending on what zone this peer is - linked to. - """ - - tsig_id: Optional[str] = None - """TSIG authentication will be used for zone transfer if configured.""" diff --git a/src/cloudflare/types/targes.py b/src/cloudflare/types/target.py similarity index 91% rename from src/cloudflare/types/targes.py rename to src/cloudflare/types/target.py index c3d68ecdcee..c421e3bf217 100644 --- a/src/cloudflare/types/targes.py +++ b/src/cloudflare/types/target.py @@ -4,7 +4,7 @@ from .._models import BaseModel -__all__ = ["Targes", "Constraint"] +__all__ = ["Target", "Constraint"] class Constraint(BaseModel): @@ -20,7 +20,7 @@ class Constraint(BaseModel): """ -class Targes(BaseModel): +class Target(BaseModel): constraint: Constraint """String constraint.""" diff --git a/src/cloudflare/types/targes_param.py b/src/cloudflare/types/target_param.py similarity index 90% rename from src/cloudflare/types/targes_param.py rename to src/cloudflare/types/target_param.py index 903dd2c5d74..2977b64466f 100644 --- a/src/cloudflare/types/targes_param.py +++ b/src/cloudflare/types/target_param.py @@ -4,7 +4,7 @@ from typing_extensions import Literal, Required, TypedDict -__all__ = ["TargesParam", "Constraint"] +__all__ = ["TargetParam", "Constraint"] class Constraint(TypedDict, total=False): @@ -20,7 +20,7 @@ class Constraint(TypedDict, total=False): """ -class TargesParam(TypedDict, total=False): +class TargetParam(TypedDict, total=False): constraint: Required[Constraint] """String constraint.""" diff --git a/src/cloudflare/types/zero_trust/gateway/__init__.py b/src/cloudflare/types/zero_trust/gateway/__init__.py index d38e8f7f114..836e219582a 100644 --- a/src/cloudflare/types/zero_trust/gateway/__init__.py +++ b/src/cloudflare/types/zero_trust/gateway/__init__.py @@ -7,6 +7,7 @@ from .location import Location as Location from .schedule import Schedule as Schedule from .gateway_ips import GatewayIPs as GatewayIPs +from .gateway_item import GatewayItem as GatewayItem from .gateway_list import GatewayList as GatewayList from .gateway_rule import GatewayRule as GatewayRule from .rule_setting import RuleSetting as RuleSetting @@ -19,12 +20,9 @@ from .gateway_settings import GatewaySettings as GatewaySettings from .list_edit_params import ListEditParams as ListEditParams from .location_network import LocationNetwork as LocationNetwork -from .list_get_response import ListGetResponse as ListGetResponse -from .gateway_list_param import GatewayListParam as GatewayListParam +from .gateway_item_param import GatewayItemParam as GatewayItemParam from .list_create_params import ListCreateParams as ListCreateParams from .list_delete_params import ListDeleteParams as ListDeleteParams -from .list_edit_response import ListEditResponse as ListEditResponse -from .list_list_response import ListListResponse as ListListResponse from .list_update_params import ListUpdateParams as ListUpdateParams from .protocol_detection import ProtocolDetection as ProtocolDetection from .rule_create_params import RuleCreateParams as RuleCreateParams @@ -37,7 +35,6 @@ from .fips_settings_param import FipsSettingsParam as FipsSettingsParam from .list_create_response import ListCreateResponse as ListCreateResponse from .list_delete_response import ListDeleteResponse as ListDeleteResponse -from .list_update_response import ListUpdateResponse as ListUpdateResponse from .rule_delete_response import RuleDeleteResponse as RuleDeleteResponse from .activity_log_settings import ActivityLogSettings as ActivityLogSettings from .logging_update_params import LoggingUpdateParams as LoggingUpdateParams diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_item.py b/src/cloudflare/types/zero_trust/gateway/gateway_item.py new file mode 100644 index 00000000000..44efdae06e5 --- /dev/null +++ b/src/cloudflare/types/zero_trust/gateway/gateway_item.py @@ -0,0 +1,15 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional +from datetime import datetime + +from ...._models import BaseModel + +__all__ = ["GatewayItem"] + + +class GatewayItem(BaseModel): + created_at: Optional[datetime] = None + + value: Optional[str] = None + """The value of the item in a list.""" diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_list_param.py b/src/cloudflare/types/zero_trust/gateway/gateway_item_param.py similarity index 73% rename from src/cloudflare/types/zero_trust/gateway/gateway_list_param.py rename to src/cloudflare/types/zero_trust/gateway/gateway_item_param.py index a33211b143a..5b5d081859d 100644 --- a/src/cloudflare/types/zero_trust/gateway/gateway_list_param.py +++ b/src/cloudflare/types/zero_trust/gateway/gateway_item_param.py @@ -4,9 +4,9 @@ from typing_extensions import TypedDict -__all__ = ["GatewayListParam"] +__all__ = ["GatewayItemParam"] -class GatewayListParam(TypedDict, total=False): +class GatewayItemParam(TypedDict, total=False): value: str """The value of the item in a list.""" diff --git a/src/cloudflare/types/zero_trust/gateway/gateway_list.py b/src/cloudflare/types/zero_trust/gateway/gateway_list.py index 8bc302edf80..f24abb3c84a 100644 --- a/src/cloudflare/types/zero_trust/gateway/gateway_list.py +++ b/src/cloudflare/types/zero_trust/gateway/gateway_list.py @@ -2,6 +2,7 @@ from typing import Optional from datetime import datetime +from typing_extensions import Literal from ...._models import BaseModel @@ -9,7 +10,21 @@ class GatewayList(BaseModel): + id: Optional[str] = None + """API Resource UUID tag.""" + + count: Optional[float] = None + """The number of items in the list.""" + created_at: Optional[datetime] = None - value: Optional[str] = None - """The value of the item in a list.""" + description: Optional[str] = None + """The description of the list.""" + + name: Optional[str] = None + """The name of the list.""" + + type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None + """The type of list.""" + + updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_create_params.py b/src/cloudflare/types/zero_trust/gateway/list_create_params.py index 28fae17b9f3..c1d48ff069c 100644 --- a/src/cloudflare/types/zero_trust/gateway/list_create_params.py +++ b/src/cloudflare/types/zero_trust/gateway/list_create_params.py @@ -5,7 +5,7 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from .gateway_list_param import GatewayListParam +from .gateway_item_param import GatewayItemParam __all__ = ["ListCreateParams"] @@ -22,5 +22,5 @@ class ListCreateParams(TypedDict, total=False): description: str """The description of the list.""" - items: Iterable[GatewayListParam] + items: Iterable[GatewayItemParam] """The items in the list.""" diff --git a/src/cloudflare/types/zero_trust/gateway/list_create_response.py b/src/cloudflare/types/zero_trust/gateway/list_create_response.py index 54c60a0f64a..5db7e9b6e86 100644 --- a/src/cloudflare/types/zero_trust/gateway/list_create_response.py +++ b/src/cloudflare/types/zero_trust/gateway/list_create_response.py @@ -5,7 +5,7 @@ from typing_extensions import Literal from ...._models import BaseModel -from .gateway_list import GatewayList +from .gateway_item import GatewayItem __all__ = ["ListCreateResponse"] @@ -19,7 +19,7 @@ class ListCreateResponse(BaseModel): description: Optional[str] = None """The description of the list.""" - items: Optional[List[GatewayList]] = None + items: Optional[List[GatewayItem]] = None """The items in the list.""" name: Optional[str] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py index c1e99775fc7..bdc08db33cc 100644 --- a/src/cloudflare/types/zero_trust/gateway/list_edit_params.py +++ b/src/cloudflare/types/zero_trust/gateway/list_edit_params.py @@ -5,7 +5,7 @@ from typing import List, Iterable from typing_extensions import Required, TypedDict -from .gateway_list_param import GatewayListParam +from .gateway_item_param import GatewayItemParam __all__ = ["ListEditParams"] @@ -13,7 +13,7 @@ class ListEditParams(TypedDict, total=False): account_id: Required[str] - append: Iterable[GatewayListParam] + append: Iterable[GatewayItemParam] """The items in the list.""" remove: List[str] diff --git a/src/cloudflare/types/zero_trust/gateway/list_edit_response.py b/src/cloudflare/types/zero_trust/gateway/list_edit_response.py deleted file mode 100644 index c0910e68561..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/list_edit_response.py +++ /dev/null @@ -1,30 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ...._models import BaseModel - -__all__ = ["ListEditResponse"] - - -class ListEditResponse(BaseModel): - id: Optional[str] = None - """API Resource UUID tag.""" - - count: Optional[float] = None - """The number of items in the list.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """The description of the list.""" - - name: Optional[str] = None - """The name of the list.""" - - type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None - """The type of list.""" - - updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_get_response.py b/src/cloudflare/types/zero_trust/gateway/list_get_response.py deleted file mode 100644 index 218845d820e..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/list_get_response.py +++ /dev/null @@ -1,30 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ...._models import BaseModel - -__all__ = ["ListGetResponse"] - - -class ListGetResponse(BaseModel): - id: Optional[str] = None - """API Resource UUID tag.""" - - count: Optional[float] = None - """The number of items in the list.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """The description of the list.""" - - name: Optional[str] = None - """The name of the list.""" - - type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None - """The type of list.""" - - updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_list_response.py b/src/cloudflare/types/zero_trust/gateway/list_list_response.py deleted file mode 100644 index fe21d862d2e..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/list_list_response.py +++ /dev/null @@ -1,30 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ...._models import BaseModel - -__all__ = ["ListListResponse"] - - -class ListListResponse(BaseModel): - id: Optional[str] = None - """API Resource UUID tag.""" - - count: Optional[float] = None - """The number of items in the list.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """The description of the list.""" - - name: Optional[str] = None - """The name of the list.""" - - type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None - """The type of list.""" - - updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/list_update_response.py b/src/cloudflare/types/zero_trust/gateway/list_update_response.py deleted file mode 100644 index f991c0cd4a5..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/list_update_response.py +++ /dev/null @@ -1,30 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional -from datetime import datetime -from typing_extensions import Literal - -from ...._models import BaseModel - -__all__ = ["ListUpdateResponse"] - - -class ListUpdateResponse(BaseModel): - id: Optional[str] = None - """API Resource UUID tag.""" - - count: Optional[float] = None - """The number of items in the list.""" - - created_at: Optional[datetime] = None - - description: Optional[str] = None - """The description of the list.""" - - name: Optional[str] = None - """The name of the list.""" - - type: Optional[Literal["SERIAL", "URL", "DOMAIN", "EMAIL", "IP"]] = None - """The type of list.""" - - updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py index 2d3b1511c90..5c1ec2f93af 100644 --- a/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py +++ b/src/cloudflare/types/zero_trust/gateway/lists/item_list_response.py @@ -2,8 +2,8 @@ from typing import List -from ..gateway_list import GatewayList +from ..gateway_item import GatewayItem __all__ = ["ItemListResponse"] -ItemListResponse = List[GatewayList] +ItemListResponse = List[GatewayItem] diff --git a/src/cloudflare/types/zone_authenticated_origin_pull.py b/src/cloudflare/types/zone_authenticated_origin_pull.py index 4508c09a303..0dd3da6f667 100644 --- a/src/cloudflare/types/zone_authenticated_origin_pull.py +++ b/src/cloudflare/types/zone_authenticated_origin_pull.py @@ -1,6 +1,8 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from typing import Optional +from datetime import datetime +from typing_extensions import Literal from .._models import BaseModel @@ -14,8 +16,27 @@ class ZoneAuthenticatedOriginPull(BaseModel): certificate: Optional[str] = None """The zone's leaf certificate.""" - enabled: Optional[bool] = None - """Indicates whether zone-level authenticated origin pulls is enabled.""" - - private_key: Optional[str] = None - """The zone's private key.""" + expires_on: Optional[datetime] = None + """When the certificate from the authority expires.""" + + issuer: Optional[str] = None + """The certificate authority that issued the certificate.""" + + signature: Optional[str] = None + """The type of hash used for the certificate.""" + + status: Optional[ + Literal[ + "initializing", + "pending_deployment", + "pending_deletion", + "active", + "deleted", + "deployment_timed_out", + "deletion_timed_out", + ] + ] = None + """Status of the certificate activation.""" + + uploaded_on: Optional[datetime] = None + """This is the time the certificate was uploaded.""" diff --git a/tests/api_resources/addressing/test_prefixes.py b/tests/api_resources/addressing/test_prefixes.py index 1e3f989ea49..8c570378484 100644 --- a/tests/api_resources/addressing/test_prefixes.py +++ b/tests/api_resources/addressing/test_prefixes.py @@ -11,10 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.addressing import ( - PrefixGetResponse, - PrefixEditResponse, - PrefixListResponse, - PrefixCreateResponse, + Prefix, PrefixDeleteResponse, ) @@ -33,7 +30,7 @@ def test_method_create(self, client: Cloudflare) -> None: cidr="192.0.2.0/24", loa_document_id="d933b1530bc56c9953cf8ce166da8004", ) - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -48,7 +45,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -63,7 +60,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -84,7 +81,7 @@ def test_method_list(self, client: Cloudflare) -> None: prefix = client.addressing.prefixes.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -96,7 +93,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -108,7 +105,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(SyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(SyncSinglePage[Prefix], prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -185,7 +182,7 @@ def test_method_edit(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", description="Internal test prefix", ) - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -199,7 +196,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -213,7 +210,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -241,7 +238,7 @@ def test_method_get(self, client: Cloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -254,7 +251,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -267,7 +264,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = response.parse() - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -299,7 +296,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: cidr="192.0.2.0/24", loa_document_id="d933b1530bc56c9953cf8ce166da8004", ) - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -314,7 +311,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -329,7 +326,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixCreateResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -350,7 +347,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: prefix = await async_client.addressing.prefixes.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -362,7 +359,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -374,7 +371,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(AsyncSinglePage[PrefixListResponse], prefix, path=["response"]) + assert_matches_type(AsyncSinglePage[Prefix], prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -451,7 +448,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", description="Internal test prefix", ) - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -465,7 +462,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -479,7 +476,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixEditResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True @@ -507,7 +504,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -520,7 +517,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) @pytest.mark.skip() @parametrize @@ -533,7 +530,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" prefix = await response.parse() - assert_matches_type(PrefixGetResponse, prefix, path=["response"]) + assert_matches_type(Prefix, prefix, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/load_balancers/test_monitors.py b/tests/api_resources/load_balancers/test_monitors.py index 0bb56cc5368..1fc1f757124 100644 --- a/tests/api_resources/load_balancers/test_monitors.py +++ b/tests/api_resources/load_balancers/test_monitors.py @@ -11,12 +11,8 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.load_balancers import ( - MonitorGetResponse, - MonitorEditResponse, - MonitorListResponse, - MonitorCreateResponse, + Monitor, MonitorDeleteResponse, - MonitorUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -32,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -59,7 +55,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -72,7 +68,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -85,7 +81,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -106,7 +102,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -134,7 +130,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -148,7 +144,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -162,7 +158,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -189,7 +185,7 @@ def test_method_list(self, client: Cloudflare) -> None: monitor = client.load_balancers.monitors.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -201,7 +197,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(SyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -213,7 +209,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(SyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(SyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -290,7 +286,7 @@ def test_method_edit(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -318,7 +314,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -332,7 +328,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -346,7 +342,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -374,7 +370,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -387,7 +383,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -400,7 +396,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = response.parse() - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -430,7 +426,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -457,7 +453,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -470,7 +466,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -483,7 +479,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorCreateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -504,7 +500,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -532,7 +528,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -546,7 +542,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -560,7 +556,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorUpdateResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -587,7 +583,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: monitor = await async_client.load_balancers.monitors.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -599,7 +595,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -611,7 +607,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(AsyncSinglePage[MonitorListResponse], monitor, path=["response"]) + assert_matches_type(AsyncSinglePage[Monitor], monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -688,7 +684,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", expected_codes="2xx", ) - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -716,7 +712,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) load_balancer_monitor_timeout=0, type="https", ) - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -730,7 +726,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -744,7 +740,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorEditResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True @@ -772,7 +768,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f1aba936b94213e5b8dca0c0dbf1f9cc", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -785,7 +781,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) @pytest.mark.skip() @parametrize @@ -798,7 +794,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" monitor = await response.parse() - assert_matches_type(MonitorGetResponse, monitor, path=["response"]) + assert_matches_type(Monitor, monitor, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/logpush/test_jobs.py b/tests/api_resources/logpush/test_jobs.py index f716fb9dda9..ced0fa8530c 100644 --- a/tests/api_resources/logpush/test_jobs.py +++ b/tests/api_resources/logpush/test_jobs.py @@ -11,11 +11,8 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.logpush import ( - JobGetResponse, - JobListResponse, - JobCreateResponse, + LogpushJob, JobDeleteResponse, - JobUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -32,7 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -62,7 +59,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -76,7 +73,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -90,7 +87,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -119,7 +116,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -148,7 +145,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -162,7 +159,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -176,7 +173,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -204,7 +201,7 @@ def test_method_list(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -213,7 +210,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -226,7 +223,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -239,7 +236,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(SyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(SyncSinglePage[Optional[LogpushJob]], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -339,7 +336,7 @@ def test_method_get(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -349,7 +346,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -363,7 +360,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -377,7 +374,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = response.parse() - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -410,7 +407,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -440,7 +437,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -454,7 +451,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -468,7 +465,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobCreateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -497,7 +494,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -526,7 +523,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare }, ownership_challenge="00000000000000000000", ) - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -540,7 +537,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -554,7 +551,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobUpdateResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -582,7 +579,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -591,7 +588,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -604,7 +601,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -617,7 +614,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(AsyncSinglePage[Optional[JobListResponse]], job, path=["response"]) + assert_matches_type(AsyncSinglePage[Optional[LogpushJob]], job, path=["response"]) assert cast(Any, response.is_closed) is True @@ -717,7 +714,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -727,7 +724,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) - account_id="string", zone_id="string", ) - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -741,7 +738,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) @pytest.mark.skip() @parametrize @@ -755,7 +752,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" job = await response.parse() - assert_matches_type(Optional[JobGetResponse], job, path=["response"]) + assert_matches_type(Optional[LogpushJob], job, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/origin_tls_client_auth/test_hostnames.py b/tests/api_resources/origin_tls_client_auth/test_hostnames.py index 6947bbad7ac..a3247d84853 100644 --- a/tests/api_resources/origin_tls_client_auth/test_hostnames.py +++ b/tests/api_resources/origin_tls_client_auth/test_hostnames.py @@ -9,7 +9,10 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.origin_tls_client_auth import ID, HostnameUpdateResponse +from cloudflare.types.origin_tls_client_auth import ( + HostnameUpdateResponse, + AuthenticatedOriginPull, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -70,7 +73,7 @@ def test_method_get(self, client: Cloudflare) -> None: "app.example.com", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) @pytest.mark.skip() @parametrize @@ -83,7 +86,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" hostname = response.parse() - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) @pytest.mark.skip() @parametrize @@ -96,7 +99,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" hostname = response.parse() - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) assert cast(Any, response.is_closed) is True @@ -172,7 +175,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "app.example.com", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) @pytest.mark.skip() @parametrize @@ -185,7 +188,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" hostname = await response.parse() - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) @pytest.mark.skip() @parametrize @@ -198,7 +201,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" hostname = await response.parse() - assert_matches_type(ID, hostname, path=["response"]) + assert_matches_type(AuthenticatedOriginPull, hostname, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/secondary_dns/test_peers.py b/tests/api_resources/secondary_dns/test_peers.py index a0bebc373fe..c42e05c6157 100644 --- a/tests/api_resources/secondary_dns/test_peers.py +++ b/tests/api_resources/secondary_dns/test_peers.py @@ -11,11 +11,8 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.secondary_dns import ( - PeerGetResponse, - PeerListResponse, - PeerCreateResponse, + Peer, PeerDeleteResponse, - PeerUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -31,7 +28,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", body={}, ) - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -44,7 +41,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -57,7 +54,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -78,7 +75,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", name="my-peer-1", ) - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -92,7 +89,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: port=53, tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a", ) - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -106,7 +103,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -120,7 +117,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -147,7 +144,7 @@ def test_method_list(self, client: Cloudflare) -> None: peer = client.secondary_dns.peers.list( account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -159,7 +156,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -171,7 +168,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(SyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(SyncSinglePage[Peer], peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -247,7 +244,7 @@ def test_method_get(self, client: Cloudflare) -> None: "23ff594956f20c2a721606e94745a8aa", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -260,7 +257,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -273,7 +270,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = response.parse() - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -303,7 +300,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", body={}, ) - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -316,7 +313,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -329,7 +326,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerCreateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -350,7 +347,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="01a7362d577a6c3019a474fd6f485823", name="my-peer-1", ) - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -364,7 +361,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare port=53, tsig_id="69cd1e104af3e6ed3cb344f263fd0d5a", ) - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -378,7 +375,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -392,7 +389,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerUpdateResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -419,7 +416,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: peer = await async_client.secondary_dns.peers.list( account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -431,7 +428,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -443,7 +440,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(AsyncSinglePage[PeerListResponse], peer, path=["response"]) + assert_matches_type(AsyncSinglePage[Peer], peer, path=["response"]) assert cast(Any, response.is_closed) is True @@ -519,7 +516,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "23ff594956f20c2a721606e94745a8aa", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -532,7 +529,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) @pytest.mark.skip() @parametrize @@ -545,7 +542,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" peer = await response.parse() - assert_matches_type(PeerGetResponse, peer, path=["response"]) + assert_matches_type(Peer, peer, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/test_keyless_certificates.py b/tests/api_resources/test_keyless_certificates.py index 6144dd8edad..89d02091487 100644 --- a/tests/api_resources/test_keyless_certificates.py +++ b/tests/api_resources/test_keyless_certificates.py @@ -10,7 +10,6 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.types import ( - Hostname, KeylessCertificate, KeylessCertificateDeleteResponse, ) @@ -31,7 +30,7 @@ def test_method_create(self, client: Cloudflare) -> None: host="example.com", port=24008, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -48,7 +47,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: "vnet_id": "7365377a-85a4-4390-9480-531ef7dc7a3c", }, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -63,7 +62,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -78,7 +77,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -201,7 +200,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -218,7 +217,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: "vnet_id": "7365377a-85a4-4390-9480-531ef7dc7a3c", }, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -231,7 +230,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -244,7 +243,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -272,7 +271,7 @@ def test_method_get(self, client: Cloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -285,7 +284,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -298,7 +297,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -332,7 +331,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: host="example.com", port=24008, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -349,7 +348,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare "vnet_id": "7365377a-85a4-4390-9480-531ef7dc7a3c", }, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -364,7 +363,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -379,7 +378,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -502,7 +501,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -519,7 +518,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) "vnet_id": "7365377a-85a4-4390-9480-531ef7dc7a3c", }, ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -532,7 +531,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -545,7 +544,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True @@ -573,7 +572,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "023e105f4ecef8ad9ca31a8372d0c353", zone_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -586,7 +585,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) @pytest.mark.skip() @parametrize @@ -599,7 +598,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" keyless_certificate = await response.parse() - assert_matches_type(Hostname, keyless_certificate, path=["response"]) + assert_matches_type(KeylessCertificate, keyless_certificate, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/gateway/test_lists.py b/tests/api_resources/zero_trust/gateway/test_lists.py index 90639596e26..0cd197d0afd 100644 --- a/tests/api_resources/zero_trust/gateway/test_lists.py +++ b/tests/api_resources/zero_trust/gateway/test_lists.py @@ -11,12 +11,9 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.zero_trust.gateway import ( - ListGetResponse, - ListEditResponse, - ListListResponse, + GatewayList, ListCreateResponse, ListDeleteResponse, - ListUpdateResponse, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -95,7 +92,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="699d98642c564d2e855e9661899b7252", name="Admin Serial Numbers", ) - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -106,7 +103,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: name="Admin Serial Numbers", description="The serial numbers for administrators", ) - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -120,7 +117,7 @@ def test_raw_response_update(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -134,7 +131,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -161,7 +158,7 @@ def test_method_list(self, client: Cloudflare) -> None: list = client.zero_trust.gateway.lists.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(SyncSinglePage[GatewayList], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -173,7 +170,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(SyncSinglePage[GatewayList], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -185,7 +182,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(SyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(SyncSinglePage[GatewayList], list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -261,7 +258,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -272,7 +269,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: append=[{"value": "8GE8721REF"}, {"value": "8GE8721REF"}, {"value": "8GE8721REF"}], remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"], ) - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -285,7 +282,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -298,7 +295,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -324,7 +321,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -337,7 +334,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -350,7 +347,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = response.parse() - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -443,7 +440,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="699d98642c564d2e855e9661899b7252", name="Admin Serial Numbers", ) - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -454,7 +451,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare name="Admin Serial Numbers", description="The serial numbers for administrators", ) - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -468,7 +465,7 @@ async def test_raw_response_update(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -482,7 +479,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListUpdateResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -509,7 +506,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: list = await async_client.zero_trust.gateway.lists.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(AsyncSinglePage[GatewayList], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -521,7 +518,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(AsyncSinglePage[GatewayList], list, path=["response"]) @pytest.mark.skip() @parametrize @@ -533,7 +530,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(AsyncSinglePage[ListListResponse], list, path=["response"]) + assert_matches_type(AsyncSinglePage[GatewayList], list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -609,7 +606,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -620,7 +617,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) append=[{"value": "8GE8721REF"}, {"value": "8GE8721REF"}, {"value": "8GE8721REF"}], remove=["8GE8721REF", "8GE8721REF", "8GE8721REF"], ) - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -633,7 +630,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -646,7 +643,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListEditResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True @@ -672,7 +669,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -685,7 +682,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) @pytest.mark.skip() @parametrize @@ -698,7 +695,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" list = await response.parse() - assert_matches_type(ListGetResponse, list, path=["response"]) + assert_matches_type(GatewayList, list, path=["response"]) assert cast(Any, response.is_closed) is True