From d17c8943cfe687ef8c9d58f8beb2aca64d96d2b0 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 21:50:29 +0000 Subject: [PATCH] feat(api): update via SDK Studio (#248) --- api.md | 59 +++++++++--------- .../resources/zero_trust/access/bookmarks.py | 38 ++++++------ .../zero_trust/access/service_tokens.py | 38 ++++++------ .../resources/zero_trust/devices/networks.py | 38 ++++++------ .../devices/posture/integrations.py | 38 ++++++------ .../zero_trust/devices/posture/posture.py | 20 +++--- .../dex/traceroute_test_results/__init__.py | 24 +++---- .../traceroute_test_results/network_path.py | 48 +++++++------- .../traceroute_test_results.py | 36 +++++------ .../zero_trust/dex/traceroute_tests.py | 2 +- src/cloudflare/types/zero_trust/__init__.py | 1 + .../types/zero_trust/access/__init__.py | 4 +- .../access/{bookmarks.py => bookmark.py} | 4 +- .../{ervice_token.py => service_token.py} | 4 +- .../types/zero_trust/devices/__init__.py | 10 +-- .../devices/{input.py => device_input.py} | 4 +- .../{input_param.py => device_input_param.py} | 4 +- .../devices/{match.py => device_match.py} | 4 +- .../{match_param.py => device_match_param.py} | 4 +- .../devices/{network.py => device_network.py} | 4 +- .../zero_trust/devices/device_posture_rule.py | 8 +-- .../devices/network_delete_response.py | 4 +- .../zero_trust/devices/posture/__init__.py | 2 +- .../{integrations.py => integration.py} | 4 +- .../devices/posture_create_params.py | 8 +-- .../devices/posture_update_params.py | 8 +-- .../types/zero_trust/dex/__init__.py | 1 - .../dex/traceroute_test_results/__init__.py | 2 +- ...k_path.py => network_path_get_response.py} | 4 +- .../zero_trust/{dex => }/network_path.py | 2 +- .../zero_trust/access/test_bookmarks.py | 50 +++++++-------- .../zero_trust/access/test_service_tokens.py | 62 +++++++++---------- .../devices/posture/test_integrations.py | 58 ++++++++--------- .../zero_trust/devices/test_networks.py | 58 ++++++++--------- .../zero_trust/dex/test_traceroute_tests.py | 2 +- .../test_network_path.py | 14 ++--- 36 files changed, 334 insertions(+), 337 deletions(-) rename src/cloudflare/types/zero_trust/access/{bookmarks.py => bookmark.py} (93%) rename src/cloudflare/types/zero_trust/access/{ervice_token.py => service_token.py} (93%) rename src/cloudflare/types/zero_trust/devices/{input.py => device_input.py} (99%) rename src/cloudflare/types/zero_trust/devices/{input_param.py => device_input_param.py} (99%) rename src/cloudflare/types/zero_trust/devices/{match.py => device_match.py} (83%) rename src/cloudflare/types/zero_trust/devices/{match_param.py => device_match_param.py} (75%) rename src/cloudflare/types/zero_trust/devices/{network.py => device_network.py} (93%) rename src/cloudflare/types/zero_trust/devices/posture/{integrations.py => integration.py} (94%) rename src/cloudflare/types/zero_trust/dex/traceroute_test_results/{network_path.py => network_path_get_response.py} (93%) rename src/cloudflare/types/zero_trust/{dex => }/network_path.py (95%) diff --git a/api.md b/api.md index 6ab9d656227..08554fe1e9f 100644 --- a/api.md +++ b/api.md @@ -4666,7 +4666,7 @@ Types: ```python from cloudflare.types.zero_trust.devices import ( - Network, + DeviceNetwork, UnnamedSchemaRefD2b048663faf5e0cd5c90501b71171de, NetworkDeleteResponse, ) @@ -4674,11 +4674,11 @@ from cloudflare.types.zero_trust.devices import ( Methods: -- client.zero_trust.devices.networks.create(\*, account_id, \*\*params) -> Optional -- client.zero_trust.devices.networks.update(network_id, \*, account_id, \*\*params) -> Optional -- client.zero_trust.devices.networks.list(\*, account_id) -> SyncSinglePage[Network] +- client.zero_trust.devices.networks.create(\*, account_id, \*\*params) -> Optional +- client.zero_trust.devices.networks.update(network_id, \*, account_id, \*\*params) -> Optional +- client.zero_trust.devices.networks.list(\*, account_id) -> SyncSinglePage[DeviceNetwork] - client.zero_trust.devices.networks.delete(network_id, \*, account_id, \*\*params) -> Optional -- client.zero_trust.devices.networks.get(network_id, \*, account_id) -> Optional +- client.zero_trust.devices.networks.get(network_id, \*, account_id) -> Optional ### Policies @@ -4775,9 +4775,9 @@ Types: ```python from cloudflare.types.zero_trust.devices import ( + DeviceInput, + DeviceMatch, DevicePostureRule, - Input, - Match, UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930, UnnamedSchemaRef41885dd46b9e0294254c49305a273681, UnnamedSchemaRef9e35ef84511131488ae286ce78ac4b27, @@ -4799,18 +4799,18 @@ Types: ```python from cloudflare.types.zero_trust.devices.posture import ( - Integrations, + Integration, UnnamedSchemaRefB84b377dfc9454d455b646d4bc9ab507, ) ``` Methods: -- client.zero_trust.devices.posture.integrations.create(\*, account_id, \*\*params) -> Optional -- client.zero_trust.devices.posture.integrations.list(\*, account_id) -> SyncSinglePage[Integrations] +- client.zero_trust.devices.posture.integrations.create(\*, account_id, \*\*params) -> Optional +- client.zero_trust.devices.posture.integrations.list(\*, account_id) -> SyncSinglePage[Integration] - client.zero_trust.devices.posture.integrations.delete(integration_id, \*, account_id, \*\*params) -> UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a -- client.zero_trust.devices.posture.integrations.edit(integration_id, \*, account_id, \*\*params) -> Optional -- client.zero_trust.devices.posture.integrations.get(integration_id, \*, account_id) -> Optional +- client.zero_trust.devices.posture.integrations.edit(integration_id, \*, account_id, \*\*params) -> Optional +- client.zero_trust.devices.posture.integrations.get(integration_id, \*, account_id) -> Optional ### Revoke @@ -5065,7 +5065,7 @@ Types: ```python from cloudflare.types.zero_trust.access import ( - ErviceToken, + ServiceToken, ServiceTokenCreateResponse, ServiceTokenRotateResponse, ) @@ -5074,10 +5074,10 @@ from cloudflare.types.zero_trust.access import ( Methods: - client.zero_trust.access.service_tokens.create(\*, account_id, zone_id, \*\*params) -> ServiceTokenCreateResponse -- client.zero_trust.access.service_tokens.update(uuid, \*, account_id, zone_id, \*\*params) -> ErviceToken -- client.zero_trust.access.service_tokens.list(\*, account_id, zone_id) -> SyncSinglePage[ErviceToken] -- client.zero_trust.access.service_tokens.delete(uuid, \*, account_id, zone_id) -> ErviceToken -- client.zero_trust.access.service_tokens.refresh(uuid, \*, identifier) -> ErviceToken +- client.zero_trust.access.service_tokens.update(uuid, \*, account_id, zone_id, \*\*params) -> ServiceToken +- client.zero_trust.access.service_tokens.list(\*, account_id, zone_id) -> SyncSinglePage[ServiceToken] +- client.zero_trust.access.service_tokens.delete(uuid, \*, account_id, zone_id) -> ServiceToken +- client.zero_trust.access.service_tokens.refresh(uuid, \*, identifier) -> ServiceToken - client.zero_trust.access.service_tokens.rotate(uuid, \*, identifier) -> ServiceTokenRotateResponse ### Bookmarks @@ -5085,16 +5085,16 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.access import Bookmarks, BookmarkDeleteResponse +from cloudflare.types.zero_trust.access import Bookmark, BookmarkDeleteResponse ``` Methods: -- client.zero_trust.access.bookmarks.create(uuid, \*, identifier, \*\*params) -> Bookmarks -- client.zero_trust.access.bookmarks.update(uuid, \*, identifier, \*\*params) -> Bookmarks -- client.zero_trust.access.bookmarks.list(identifier) -> SyncSinglePage[Bookmarks] +- client.zero_trust.access.bookmarks.create(uuid, \*, identifier, \*\*params) -> Bookmark +- client.zero_trust.access.bookmarks.update(uuid, \*, identifier, \*\*params) -> Bookmark +- client.zero_trust.access.bookmarks.list(identifier) -> SyncSinglePage[Bookmark] - client.zero_trust.access.bookmarks.delete(uuid, \*, identifier, \*\*params) -> BookmarkDeleteResponse -- client.zero_trust.access.bookmarks.get(uuid, \*, identifier) -> Bookmarks +- client.zero_trust.access.bookmarks.get(uuid, \*, identifier) -> Bookmark ### Keys @@ -5218,6 +5218,7 @@ Types: ```python from cloudflare.types.zero_trust import ( + NetworkPath, Percentiles, UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11, ) @@ -5310,34 +5311,30 @@ Methods: ### TracerouteTestResults -#### NetworkPathResource +#### NetworkPath Types: ```python -from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPath +from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse ``` Methods: -- client.zero_trust.dex.traceroute_test_results.network_path.get(test_result_id, \*, account_id) -> NetworkPath +- client.zero_trust.dex.traceroute_test_results.network_path.get(test_result_id, \*, account_id) -> NetworkPathGetResponse ### TracerouteTests Types: ```python -from cloudflare.types.zero_trust.dex import ( - NetworkPath, - Traceroute, - TracerouteTestPercentilesResponse, -) +from cloudflare.types.zero_trust.dex import Traceroute, TracerouteTestPercentilesResponse ``` Methods: - client.zero_trust.dex.traceroute_tests.get(test_id, \*, account_id, \*\*params) -> Traceroute -- client.zero_trust.dex.traceroute_tests.network_path(test_id, \*, account_id, \*\*params) -> NetworkPath +- client.zero_trust.dex.traceroute_tests.network_path(test_id, \*, account_id, \*\*params) -> NetworkPath - client.zero_trust.dex.traceroute_tests.percentiles(test_id, \*, account_id, \*\*params) -> TracerouteTestPercentilesResponse ## Tunnels diff --git a/src/cloudflare/resources/zero_trust/access/bookmarks.py b/src/cloudflare/resources/zero_trust/access/bookmarks.py index 5f60532620d..8ceee6a5db5 100644 --- a/src/cloudflare/resources/zero_trust/access/bookmarks.py +++ b/src/cloudflare/resources/zero_trust/access/bookmarks.py @@ -26,8 +26,8 @@ make_request_options, ) from ....types.zero_trust.access import ( + Bookmark, BookmarkDeleteResponse, - bookmarks, bookmark_create_params, bookmark_delete_params, bookmark_update_params, @@ -57,7 +57,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Create a new Bookmark application. @@ -86,7 +86,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) def update( @@ -101,7 +101,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Updates a configured Bookmark application. @@ -130,7 +130,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) def list( @@ -143,7 +143,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[bookmarks.Bookmarks]: + ) -> SyncSinglePage[Bookmark]: """ Lists Bookmark applications. @@ -160,11 +160,11 @@ def list( raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}") return self._get_api_list( f"/accounts/{identifier}/access/bookmarks", - page=SyncSinglePage[bookmarks.Bookmarks], + page=SyncSinglePage[Bookmark], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=bookmarks.Bookmarks, + model=Bookmark, ) def delete( @@ -222,7 +222,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Fetches a single Bookmark application. @@ -250,7 +250,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) @@ -275,7 +275,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Create a new Bookmark application. @@ -304,7 +304,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) async def update( @@ -319,7 +319,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Updates a configured Bookmark application. @@ -348,7 +348,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) def list( @@ -361,7 +361,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[bookmarks.Bookmarks, AsyncSinglePage[bookmarks.Bookmarks]]: + ) -> AsyncPaginator[Bookmark, AsyncSinglePage[Bookmark]]: """ Lists Bookmark applications. @@ -378,11 +378,11 @@ def list( raise ValueError(f"Expected a non-empty value for `identifier` but received {identifier!r}") return self._get_api_list( f"/accounts/{identifier}/access/bookmarks", - page=AsyncSinglePage[bookmarks.Bookmarks], + page=AsyncSinglePage[Bookmark], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=bookmarks.Bookmarks, + model=Bookmark, ) async def delete( @@ -440,7 +440,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> bookmarks.Bookmarks: + ) -> Bookmark: """ Fetches a single Bookmark application. @@ -468,7 +468,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[bookmarks.Bookmarks], ResultWrapper[bookmarks.Bookmarks]), + cast_to=cast(Type[Bookmark], ResultWrapper[Bookmark]), ) diff --git a/src/cloudflare/resources/zero_trust/access/service_tokens.py b/src/cloudflare/resources/zero_trust/access/service_tokens.py index c250ab4ce70..49ecb7332b9 100644 --- a/src/cloudflare/resources/zero_trust/access/service_tokens.py +++ b/src/cloudflare/resources/zero_trust/access/service_tokens.py @@ -26,7 +26,7 @@ make_request_options, ) from ....types.zero_trust.access import ( - ErviceToken, + ServiceToken, ServiceTokenCreateResponse, ServiceTokenRotateResponse, service_token_create_params, @@ -132,7 +132,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Updates a configured service token. @@ -190,7 +190,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) def list( @@ -204,7 +204,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[ErviceToken]: + ) -> SyncSinglePage[ServiceToken]: """ Lists all service tokens. @@ -238,11 +238,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens", - page=SyncSinglePage[ErviceToken], + page=SyncSinglePage[ServiceToken], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=ErviceToken, + model=ServiceToken, ) def delete( @@ -257,7 +257,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Deletes a service token. @@ -302,7 +302,7 @@ def delete( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) def refresh( @@ -316,7 +316,7 @@ def refresh( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Refreshes the expiration of a service token. @@ -346,7 +346,7 @@ def refresh( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) def rotate( @@ -490,7 +490,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Updates a configured service token. @@ -548,7 +548,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) def list( @@ -562,7 +562,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[ErviceToken, AsyncSinglePage[ErviceToken]]: + ) -> AsyncPaginator[ServiceToken, AsyncSinglePage[ServiceToken]]: """ Lists all service tokens. @@ -596,11 +596,11 @@ def list( account_or_zone_id = zone_id return self._get_api_list( f"/{account_or_zone}/{account_or_zone_id}/access/service_tokens", - page=AsyncSinglePage[ErviceToken], + page=AsyncSinglePage[ServiceToken], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=ErviceToken, + model=ServiceToken, ) async def delete( @@ -615,7 +615,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Deletes a service token. @@ -660,7 +660,7 @@ async def delete( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) async def refresh( @@ -674,7 +674,7 @@ async def refresh( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> ErviceToken: + ) -> ServiceToken: """ Refreshes the expiration of a service token. @@ -704,7 +704,7 @@ async def refresh( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[ErviceToken], ResultWrapper[ErviceToken]), + cast_to=cast(Type[ServiceToken], ResultWrapper[ServiceToken]), ) async def rotate( diff --git a/src/cloudflare/resources/zero_trust/devices/networks.py b/src/cloudflare/resources/zero_trust/devices/networks.py index c954991bfdd..7fe68152bcd 100644 --- a/src/cloudflare/resources/zero_trust/devices/networks.py +++ b/src/cloudflare/resources/zero_trust/devices/networks.py @@ -27,7 +27,7 @@ make_request_options, ) from ....types.zero_trust.devices import ( - Network, + DeviceNetwork, NetworkDeleteResponse, network_create_params, network_delete_params, @@ -59,7 +59,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Creates a new device managed network. @@ -98,7 +98,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) def update( @@ -115,7 +115,7 @@ def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Updates a configured device managed network. @@ -158,7 +158,7 @@ def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) def list( @@ -171,7 +171,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Network]: + ) -> SyncSinglePage[DeviceNetwork]: """ Fetches a list of managed networks for an account. @@ -188,11 +188,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}/devices/networks", - page=SyncSinglePage[Network], + page=SyncSinglePage[DeviceNetwork], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Network, + model=DeviceNetwork, ) def delete( @@ -251,7 +251,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Fetches details for a single managed network. @@ -279,7 +279,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) @@ -305,7 +305,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Creates a new device managed network. @@ -344,7 +344,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) async def update( @@ -361,7 +361,7 @@ async def update( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Updates a configured device managed network. @@ -404,7 +404,7 @@ async def update( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) def list( @@ -417,7 +417,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Network, AsyncSinglePage[Network]]: + ) -> AsyncPaginator[DeviceNetwork, AsyncSinglePage[DeviceNetwork]]: """ Fetches a list of managed networks for an account. @@ -434,11 +434,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}/devices/networks", - page=AsyncSinglePage[Network], + page=AsyncSinglePage[DeviceNetwork], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Network, + model=DeviceNetwork, ) async def delete( @@ -497,7 +497,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Network]: + ) -> Optional[DeviceNetwork]: """ Fetches details for a single managed network. @@ -525,7 +525,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[Network]], ResultWrapper[Network]), + cast_to=cast(Type[Optional[DeviceNetwork]], ResultWrapper[DeviceNetwork]), ) diff --git a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py index da3e199dfff..c9b932ced2c 100644 --- a/src/cloudflare/resources/zero_trust/devices/posture/integrations.py +++ b/src/cloudflare/resources/zero_trust/devices/posture/integrations.py @@ -28,7 +28,7 @@ ) from .....types.shared import UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a from .....types.zero_trust.devices.posture import ( - integrations, + Integration, integration_edit_params, integration_create_params, integration_delete_params, @@ -60,7 +60,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Create a new device posture integration. @@ -102,7 +102,7 @@ def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) def list( @@ -115,7 +115,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[integrations.Integrations]: + ) -> SyncSinglePage[Integration]: """ Fetches the list of device posture integrations for an account. @@ -132,11 +132,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}/devices/posture/integration", - page=SyncSinglePage[integrations.Integrations], + page=SyncSinglePage[Integration], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=integrations.Integrations, + model=Integration, ) def delete( @@ -204,7 +204,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Updates a configured device posture integration. @@ -250,7 +250,7 @@ def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) def get( @@ -264,7 +264,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Fetches details for a single device posture integration. @@ -292,7 +292,7 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) @@ -319,7 +319,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Create a new device posture integration. @@ -361,7 +361,7 @@ async def create( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) def list( @@ -374,7 +374,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[integrations.Integrations, AsyncSinglePage[integrations.Integrations]]: + ) -> AsyncPaginator[Integration, AsyncSinglePage[Integration]]: """ Fetches the list of device posture integrations for an account. @@ -391,11 +391,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}/devices/posture/integration", - page=AsyncSinglePage[integrations.Integrations], + page=AsyncSinglePage[Integration], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=integrations.Integrations, + model=Integration, ) async def delete( @@ -463,7 +463,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Updates a configured device posture integration. @@ -509,7 +509,7 @@ async def edit( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) async def get( @@ -523,7 +523,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[integrations.Integrations]: + ) -> Optional[Integration]: """ Fetches details for a single device posture integration. @@ -551,7 +551,7 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[Optional[integrations.Integrations]], ResultWrapper[integrations.Integrations]), + cast_to=cast(Type[Optional[Integration]], ResultWrapper[Integration]), ) diff --git a/src/cloudflare/resources/zero_trust/devices/posture/posture.py b/src/cloudflare/resources/zero_trust/devices/posture/posture.py index 268fac7b5ec..3f51586138b 100644 --- a/src/cloudflare/resources/zero_trust/devices/posture/posture.py +++ b/src/cloudflare/resources/zero_trust/devices/posture/posture.py @@ -35,8 +35,8 @@ make_request_options, ) from .....types.zero_trust.devices import ( - InputParam, - MatchParam, + DeviceInputParam, + DeviceMatchParam, DevicePostureRule, PostureDeleteResponse, posture_create_params, @@ -88,8 +88,8 @@ def create( ], description: str | NotGiven = NOT_GIVEN, expiration: str | NotGiven = NOT_GIVEN, - input: InputParam | NotGiven = NOT_GIVEN, - match: Iterable[MatchParam] | NotGiven = NOT_GIVEN, + input: DeviceInputParam | NotGiven = NOT_GIVEN, + match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN, schedule: 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. @@ -181,8 +181,8 @@ def update( ], description: str | NotGiven = NOT_GIVEN, expiration: str | NotGiven = NOT_GIVEN, - input: InputParam | NotGiven = NOT_GIVEN, - match: Iterable[MatchParam] | NotGiven = NOT_GIVEN, + input: DeviceInputParam | NotGiven = NOT_GIVEN, + match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN, schedule: 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. @@ -411,8 +411,8 @@ async def create( ], description: str | NotGiven = NOT_GIVEN, expiration: str | NotGiven = NOT_GIVEN, - input: InputParam | NotGiven = NOT_GIVEN, - match: Iterable[MatchParam] | NotGiven = NOT_GIVEN, + input: DeviceInputParam | NotGiven = NOT_GIVEN, + match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN, schedule: 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. @@ -504,8 +504,8 @@ async def update( ], description: str | NotGiven = NOT_GIVEN, expiration: str | NotGiven = NOT_GIVEN, - input: InputParam | NotGiven = NOT_GIVEN, - match: Iterable[MatchParam] | NotGiven = NOT_GIVEN, + input: DeviceInputParam | NotGiven = NOT_GIVEN, + match: Iterable[DeviceMatchParam] | NotGiven = NOT_GIVEN, schedule: 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. diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/__init__.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/__init__.py index 3c5c1852114..29ddac57979 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/__init__.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/__init__.py @@ -1,12 +1,12 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. from .network_path import ( - NetworkPathResource, - AsyncNetworkPathResource, - NetworkPathResourceWithRawResponse, - AsyncNetworkPathResourceWithRawResponse, - NetworkPathResourceWithStreamingResponse, - AsyncNetworkPathResourceWithStreamingResponse, + NetworkPath, + AsyncNetworkPath, + NetworkPathWithRawResponse, + AsyncNetworkPathWithRawResponse, + NetworkPathWithStreamingResponse, + AsyncNetworkPathWithStreamingResponse, ) from .traceroute_test_results import ( TracerouteTestResults, @@ -18,12 +18,12 @@ ) __all__ = [ - "NetworkPathResource", - "AsyncNetworkPathResource", - "NetworkPathResourceWithRawResponse", - "AsyncNetworkPathResourceWithRawResponse", - "NetworkPathResourceWithStreamingResponse", - "AsyncNetworkPathResourceWithStreamingResponse", + "NetworkPath", + "AsyncNetworkPath", + "NetworkPathWithRawResponse", + "AsyncNetworkPathWithRawResponse", + "NetworkPathWithStreamingResponse", + "AsyncNetworkPathWithStreamingResponse", "TracerouteTestResults", "AsyncTracerouteTestResults", "TracerouteTestResultsWithRawResponse", diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py index c43708ea300..18fbbbb628a 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/network_path.py @@ -19,19 +19,19 @@ from ....._base_client import ( make_request_options, ) -from .....types.zero_trust.dex.traceroute_test_results import NetworkPath +from .....types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse -__all__ = ["NetworkPathResource", "AsyncNetworkPathResource"] +__all__ = ["NetworkPath", "AsyncNetworkPath"] -class NetworkPathResource(SyncAPIResource): +class NetworkPath(SyncAPIResource): @cached_property - def with_raw_response(self) -> NetworkPathResourceWithRawResponse: - return NetworkPathResourceWithRawResponse(self) + def with_raw_response(self) -> NetworkPathWithRawResponse: + return NetworkPathWithRawResponse(self) @cached_property - def with_streaming_response(self) -> NetworkPathResourceWithStreamingResponse: - return NetworkPathResourceWithStreamingResponse(self) + def with_streaming_response(self) -> NetworkPathWithStreamingResponse: + return NetworkPathWithStreamingResponse(self) def get( self, @@ -44,7 +44,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> NetworkPath: + ) -> NetworkPathGetResponse: """ Get a breakdown of hops and performance metrics for a specific traceroute test run @@ -73,18 +73,18 @@ def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[NetworkPath], ResultWrapper[NetworkPath]), + cast_to=cast(Type[NetworkPathGetResponse], ResultWrapper[NetworkPathGetResponse]), ) -class AsyncNetworkPathResource(AsyncAPIResource): +class AsyncNetworkPath(AsyncAPIResource): @cached_property - def with_raw_response(self) -> AsyncNetworkPathResourceWithRawResponse: - return AsyncNetworkPathResourceWithRawResponse(self) + def with_raw_response(self) -> AsyncNetworkPathWithRawResponse: + return AsyncNetworkPathWithRawResponse(self) @cached_property - def with_streaming_response(self) -> AsyncNetworkPathResourceWithStreamingResponse: - return AsyncNetworkPathResourceWithStreamingResponse(self) + def with_streaming_response(self) -> AsyncNetworkPathWithStreamingResponse: + return AsyncNetworkPathWithStreamingResponse(self) async def get( self, @@ -97,7 +97,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> NetworkPath: + ) -> NetworkPathGetResponse: """ Get a breakdown of hops and performance metrics for a specific traceroute test run @@ -126,12 +126,12 @@ async def get( timeout=timeout, post_parser=ResultWrapper._unwrapper, ), - cast_to=cast(Type[NetworkPath], ResultWrapper[NetworkPath]), + cast_to=cast(Type[NetworkPathGetResponse], ResultWrapper[NetworkPathGetResponse]), ) -class NetworkPathResourceWithRawResponse: - def __init__(self, network_path: NetworkPathResource) -> None: +class NetworkPathWithRawResponse: + def __init__(self, network_path: NetworkPath) -> None: self._network_path = network_path self.get = to_raw_response_wrapper( @@ -139,8 +139,8 @@ def __init__(self, network_path: NetworkPathResource) -> None: ) -class AsyncNetworkPathResourceWithRawResponse: - def __init__(self, network_path: AsyncNetworkPathResource) -> None: +class AsyncNetworkPathWithRawResponse: + def __init__(self, network_path: AsyncNetworkPath) -> None: self._network_path = network_path self.get = async_to_raw_response_wrapper( @@ -148,8 +148,8 @@ def __init__(self, network_path: AsyncNetworkPathResource) -> None: ) -class NetworkPathResourceWithStreamingResponse: - def __init__(self, network_path: NetworkPathResource) -> None: +class NetworkPathWithStreamingResponse: + def __init__(self, network_path: NetworkPath) -> None: self._network_path = network_path self.get = to_streamed_response_wrapper( @@ -157,8 +157,8 @@ def __init__(self, network_path: NetworkPathResource) -> None: ) -class AsyncNetworkPathResourceWithStreamingResponse: - def __init__(self, network_path: AsyncNetworkPathResource) -> None: +class AsyncNetworkPathWithStreamingResponse: + def __init__(self, network_path: AsyncNetworkPath) -> None: self._network_path = network_path self.get = async_to_streamed_response_wrapper( diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py index ee43d4e01ba..6b536de666a 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_test_results/traceroute_test_results.py @@ -4,12 +4,12 @@ from ....._compat import cached_property from .network_path import ( - NetworkPathResource, - AsyncNetworkPathResource, - NetworkPathResourceWithRawResponse, - AsyncNetworkPathResourceWithRawResponse, - NetworkPathResourceWithStreamingResponse, - AsyncNetworkPathResourceWithStreamingResponse, + NetworkPath, + AsyncNetworkPath, + NetworkPathWithRawResponse, + AsyncNetworkPathWithRawResponse, + NetworkPathWithStreamingResponse, + AsyncNetworkPathWithStreamingResponse, ) from ....._resource import SyncAPIResource, AsyncAPIResource @@ -18,8 +18,8 @@ class TracerouteTestResults(SyncAPIResource): @cached_property - def network_path(self) -> NetworkPathResource: - return NetworkPathResource(self._client) + def network_path(self) -> NetworkPath: + return NetworkPath(self._client) @cached_property def with_raw_response(self) -> TracerouteTestResultsWithRawResponse: @@ -32,8 +32,8 @@ def with_streaming_response(self) -> TracerouteTestResultsWithStreamingResponse: class AsyncTracerouteTestResults(AsyncAPIResource): @cached_property - def network_path(self) -> AsyncNetworkPathResource: - return AsyncNetworkPathResource(self._client) + def network_path(self) -> AsyncNetworkPath: + return AsyncNetworkPath(self._client) @cached_property def with_raw_response(self) -> AsyncTracerouteTestResultsWithRawResponse: @@ -49,8 +49,8 @@ def __init__(self, traceroute_test_results: TracerouteTestResults) -> None: self._traceroute_test_results = traceroute_test_results @cached_property - def network_path(self) -> NetworkPathResourceWithRawResponse: - return NetworkPathResourceWithRawResponse(self._traceroute_test_results.network_path) + def network_path(self) -> NetworkPathWithRawResponse: + return NetworkPathWithRawResponse(self._traceroute_test_results.network_path) class AsyncTracerouteTestResultsWithRawResponse: @@ -58,8 +58,8 @@ def __init__(self, traceroute_test_results: AsyncTracerouteTestResults) -> None: self._traceroute_test_results = traceroute_test_results @cached_property - def network_path(self) -> AsyncNetworkPathResourceWithRawResponse: - return AsyncNetworkPathResourceWithRawResponse(self._traceroute_test_results.network_path) + def network_path(self) -> AsyncNetworkPathWithRawResponse: + return AsyncNetworkPathWithRawResponse(self._traceroute_test_results.network_path) class TracerouteTestResultsWithStreamingResponse: @@ -67,8 +67,8 @@ def __init__(self, traceroute_test_results: TracerouteTestResults) -> None: self._traceroute_test_results = traceroute_test_results @cached_property - def network_path(self) -> NetworkPathResourceWithStreamingResponse: - return NetworkPathResourceWithStreamingResponse(self._traceroute_test_results.network_path) + def network_path(self) -> NetworkPathWithStreamingResponse: + return NetworkPathWithStreamingResponse(self._traceroute_test_results.network_path) class AsyncTracerouteTestResultsWithStreamingResponse: @@ -76,5 +76,5 @@ def __init__(self, traceroute_test_results: AsyncTracerouteTestResults) -> None: self._traceroute_test_results = traceroute_test_results @cached_property - def network_path(self) -> AsyncNetworkPathResourceWithStreamingResponse: - return AsyncNetworkPathResourceWithStreamingResponse(self._traceroute_test_results.network_path) + def network_path(self) -> AsyncNetworkPathWithStreamingResponse: + return AsyncNetworkPathWithStreamingResponse(self._traceroute_test_results.network_path) diff --git a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py index bb6fecece28..9b3c1bb067e 100644 --- a/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py +++ b/src/cloudflare/resources/zero_trust/dex/traceroute_tests.py @@ -24,9 +24,9 @@ from ...._base_client import ( make_request_options, ) +from ....types.zero_trust import NetworkPath from ....types.zero_trust.dex import ( Traceroute, - NetworkPath, TracerouteTestPercentilesResponse, traceroute_test_get_params, traceroute_test_percentiles_params, diff --git a/src/cloudflare/types/zero_trust/__init__.py b/src/cloudflare/types/zero_trust/__init__.py index 33f2bb57fa3..7af7ec60887 100644 --- a/src/cloudflare/types/zero_trust/__init__.py +++ b/src/cloudflare/types/zero_trust/__init__.py @@ -16,6 +16,7 @@ from .country_rule import CountryRule as CountryRule from .ip_list_rule import IPListRule as IPListRule from .login_design import LoginDesign as LoginDesign +from .network_path import NetworkPath as NetworkPath from .organization import Organization as Organization from .tunnel_param import TunnelParam as TunnelParam from .everyone_rule import EveryoneRule as EveryoneRule diff --git a/src/cloudflare/types/zero_trust/access/__init__.py b/src/cloudflare/types/zero_trust/access/__init__.py index 2a3e6bf33ed..399271bed1b 100644 --- a/src/cloudflare/types/zero_trust/access/__init__.py +++ b/src/cloudflare/types/zero_trust/access/__init__.py @@ -4,16 +4,16 @@ from .tag import Tag as Tag from .user import User as User -from .bookmarks import Bookmarks as Bookmarks +from .bookmark import Bookmark as Bookmark from .application import Application as Application from .certificate import Certificate as Certificate from .custom_page import CustomPage as CustomPage from .app_id_param import AppIDParam as AppIDParam from .cors_headers import CorsHeaders as CorsHeaders -from .ervice_token import ErviceToken as ErviceToken from .allowed_idpsh import AllowedIdpsh as AllowedIdpsh from .custom_pagesh import CustomPagesh as CustomPagesh from .saml_saas_app import SAMLSaasApp as SAMLSaasApp +from .service_token import ServiceToken as ServiceToken from .allowed_headersh import AllowedHeadersh as AllowedHeadersh from .allowed_methodsh import AllowedMethodsh as AllowedMethodsh from .allowed_originsh import AllowedOriginsh as AllowedOriginsh diff --git a/src/cloudflare/types/zero_trust/access/bookmarks.py b/src/cloudflare/types/zero_trust/access/bookmark.py similarity index 93% rename from src/cloudflare/types/zero_trust/access/bookmarks.py rename to src/cloudflare/types/zero_trust/access/bookmark.py index 5c83ddd611e..5d20f8b964c 100644 --- a/src/cloudflare/types/zero_trust/access/bookmarks.py +++ b/src/cloudflare/types/zero_trust/access/bookmark.py @@ -5,10 +5,10 @@ from ...._models import BaseModel -__all__ = ["Bookmarks"] +__all__ = ["Bookmark"] -class Bookmarks(BaseModel): +class Bookmark(BaseModel): id: Optional[str] = None """The unique identifier for the Bookmark application.""" diff --git a/src/cloudflare/types/zero_trust/access/ervice_token.py b/src/cloudflare/types/zero_trust/access/service_token.py similarity index 93% rename from src/cloudflare/types/zero_trust/access/ervice_token.py rename to src/cloudflare/types/zero_trust/access/service_token.py index 879f7c574e8..97ffd3bcdeb 100644 --- a/src/cloudflare/types/zero_trust/access/ervice_token.py +++ b/src/cloudflare/types/zero_trust/access/service_token.py @@ -5,10 +5,10 @@ from ...._models import BaseModel -__all__ = ["ErviceToken"] +__all__ = ["ServiceToken"] -class ErviceToken(BaseModel): +class ServiceToken(BaseModel): id: Optional[object] = None """The ID of the service token.""" diff --git a/src/cloudflare/types/zero_trust/devices/__init__.py b/src/cloudflare/types/zero_trust/devices/__init__.py index fd475f9516f..325b3488d77 100644 --- a/src/cloudflare/types/zero_trust/devices/__init__.py +++ b/src/cloudflare/types/zero_trust/devices/__init__.py @@ -2,16 +2,16 @@ from __future__ import annotations -from .input import Input as Input -from .match import Match as Match -from .network import Network as Network -from .input_param import InputParam as InputParam -from .match_param import MatchParam as MatchParam from .schema_data import SchemaData as SchemaData from .schema_http import SchemaHTTP as SchemaHTTP +from .device_input import DeviceInput as DeviceInput +from .device_match import DeviceMatch as DeviceMatch +from .device_network import DeviceNetwork as DeviceNetwork from .device_settings import DeviceSettings as DeviceSettings from .settings_policy import SettingsPolicy as SettingsPolicy from .schema_data_param import SchemaDataParam as SchemaDataParam +from .device_input_param import DeviceInputParam as DeviceInputParam +from .device_match_param import DeviceMatchParam as DeviceMatchParam from .policy_edit_params import PolicyEditParams as PolicyEditParams from .device_posture_rule import DevicePostureRule as DevicePostureRule from .policy_create_params import PolicyCreateParams as PolicyCreateParams diff --git a/src/cloudflare/types/zero_trust/devices/input.py b/src/cloudflare/types/zero_trust/devices/device_input.py similarity index 99% rename from src/cloudflare/types/zero_trust/devices/input.py rename to src/cloudflare/types/zero_trust/devices/device_input.py index ba464e5fce9..84f7faf215c 100644 --- a/src/cloudflare/types/zero_trust/devices/input.py +++ b/src/cloudflare/types/zero_trust/devices/device_input.py @@ -10,7 +10,7 @@ from .unnamed_schema_ref_41885dd46b9e0294254c49305a273681 import UnnamedSchemaRef41885dd46b9e0294254c49305a273681 __all__ = [ - "Input", + "DeviceInput", "TeamsDevicesFileInputRequest", "TeamsDevicesUniqueClientIDInputRequest", "TeamsDevicesDomainJoinedInputRequest", @@ -249,7 +249,7 @@ class TeamsDevicesSentineloneS2sInputRequest(BaseModel): """operator""" -Input = Union[ +DeviceInput = Union[ TeamsDevicesFileInputRequest, TeamsDevicesUniqueClientIDInputRequest, TeamsDevicesDomainJoinedInputRequest, diff --git a/src/cloudflare/types/zero_trust/devices/input_param.py b/src/cloudflare/types/zero_trust/devices/device_input_param.py similarity index 99% rename from src/cloudflare/types/zero_trust/devices/input_param.py rename to src/cloudflare/types/zero_trust/devices/device_input_param.py index 9fcd537954f..2895c6f9f9e 100644 --- a/src/cloudflare/types/zero_trust/devices/input_param.py +++ b/src/cloudflare/types/zero_trust/devices/device_input_param.py @@ -10,7 +10,7 @@ from .unnamed_schema_ref_41885dd46b9e0294254c49305a273681 import UnnamedSchemaRef41885dd46b9e0294254c49305a273681 __all__ = [ - "InputParam", + "DeviceInputParam", "TeamsDevicesFileInputRequest", "TeamsDevicesUniqueClientIDInputRequest", "TeamsDevicesDomainJoinedInputRequest", @@ -251,7 +251,7 @@ class TeamsDevicesSentineloneS2sInputRequest(TypedDict, total=False): """operator""" -InputParam = Union[ +DeviceInputParam = Union[ TeamsDevicesFileInputRequest, TeamsDevicesUniqueClientIDInputRequest, TeamsDevicesDomainJoinedInputRequest, diff --git a/src/cloudflare/types/zero_trust/devices/match.py b/src/cloudflare/types/zero_trust/devices/device_match.py similarity index 83% rename from src/cloudflare/types/zero_trust/devices/match.py rename to src/cloudflare/types/zero_trust/devices/device_match.py index e1eecd9a3f0..719a707d6f2 100644 --- a/src/cloudflare/types/zero_trust/devices/match.py +++ b/src/cloudflare/types/zero_trust/devices/device_match.py @@ -5,8 +5,8 @@ from ...._models import BaseModel -__all__ = ["Match"] +__all__ = ["DeviceMatch"] -class Match(BaseModel): +class DeviceMatch(BaseModel): platform: Optional[Literal["windows", "mac", "linux", "android", "ios"]] = None diff --git a/src/cloudflare/types/zero_trust/devices/match_param.py b/src/cloudflare/types/zero_trust/devices/device_match_param.py similarity index 75% rename from src/cloudflare/types/zero_trust/devices/match_param.py rename to src/cloudflare/types/zero_trust/devices/device_match_param.py index 406c0c86448..8ecbc486e4f 100644 --- a/src/cloudflare/types/zero_trust/devices/match_param.py +++ b/src/cloudflare/types/zero_trust/devices/device_match_param.py @@ -4,8 +4,8 @@ from typing_extensions import Literal, TypedDict -__all__ = ["MatchParam"] +__all__ = ["DeviceMatchParam"] -class MatchParam(TypedDict, total=False): +class DeviceMatchParam(TypedDict, total=False): platform: Literal["windows", "mac", "linux", "android", "ios"] diff --git a/src/cloudflare/types/zero_trust/devices/network.py b/src/cloudflare/types/zero_trust/devices/device_network.py similarity index 93% rename from src/cloudflare/types/zero_trust/devices/network.py rename to src/cloudflare/types/zero_trust/devices/device_network.py index c14db25c5e8..db154213768 100644 --- a/src/cloudflare/types/zero_trust/devices/network.py +++ b/src/cloudflare/types/zero_trust/devices/device_network.py @@ -5,7 +5,7 @@ from ...._models import BaseModel -__all__ = ["Network", "Config"] +__all__ = ["DeviceNetwork", "Config"] class Config(BaseModel): @@ -23,7 +23,7 @@ class Config(BaseModel): """ -class Network(BaseModel): +class DeviceNetwork(BaseModel): config: Optional[Config] = None """ The configuration object containing information for the WARP client to detect diff --git a/src/cloudflare/types/zero_trust/devices/device_posture_rule.py b/src/cloudflare/types/zero_trust/devices/device_posture_rule.py index 10b79163706..1817b557e0b 100644 --- a/src/cloudflare/types/zero_trust/devices/device_posture_rule.py +++ b/src/cloudflare/types/zero_trust/devices/device_posture_rule.py @@ -3,9 +3,9 @@ from typing import List, Optional from typing_extensions import Literal -from .input import Input -from .match import Match from ...._models import BaseModel +from .device_input import DeviceInput +from .device_match import DeviceMatch __all__ = ["DevicePostureRule"] @@ -24,10 +24,10 @@ class DevicePostureRule(BaseModel): WARP client. """ - input: Optional[Input] = None + input: Optional[DeviceInput] = None """The value to be checked against.""" - match: Optional[List[Match]] = None + match: Optional[List[DeviceMatch]] = None """The conditions that the client must match to run the rule.""" name: Optional[str] = None diff --git a/src/cloudflare/types/zero_trust/devices/network_delete_response.py b/src/cloudflare/types/zero_trust/devices/network_delete_response.py index 42c17ee3722..a849bc78a8a 100644 --- a/src/cloudflare/types/zero_trust/devices/network_delete_response.py +++ b/src/cloudflare/types/zero_trust/devices/network_delete_response.py @@ -2,8 +2,8 @@ from typing import List -from .network import Network +from .device_network import DeviceNetwork __all__ = ["NetworkDeleteResponse"] -NetworkDeleteResponse = List[Network] +NetworkDeleteResponse = List[DeviceNetwork] diff --git a/src/cloudflare/types/zero_trust/devices/posture/__init__.py b/src/cloudflare/types/zero_trust/devices/posture/__init__.py index 5c17711ca35..b020c834d8f 100644 --- a/src/cloudflare/types/zero_trust/devices/posture/__init__.py +++ b/src/cloudflare/types/zero_trust/devices/posture/__init__.py @@ -2,7 +2,7 @@ from __future__ import annotations -from .integrations import Integrations as Integrations +from .integration import Integration as Integration from .integration_edit_params import IntegrationEditParams as IntegrationEditParams from .integration_create_params import IntegrationCreateParams as IntegrationCreateParams from .integration_delete_params import IntegrationDeleteParams as IntegrationDeleteParams diff --git a/src/cloudflare/types/zero_trust/devices/posture/integrations.py b/src/cloudflare/types/zero_trust/devices/posture/integration.py similarity index 94% rename from src/cloudflare/types/zero_trust/devices/posture/integrations.py rename to src/cloudflare/types/zero_trust/devices/posture/integration.py index 92299fc0a04..505d151031f 100644 --- a/src/cloudflare/types/zero_trust/devices/posture/integrations.py +++ b/src/cloudflare/types/zero_trust/devices/posture/integration.py @@ -5,7 +5,7 @@ from ....._models import BaseModel -__all__ = ["Integrations", "Config"] +__all__ = ["Integration", "Config"] class Config(BaseModel): @@ -19,7 +19,7 @@ class Config(BaseModel): """The Workspace One client ID provided in the Workspace One Admin Dashboard.""" -class Integrations(BaseModel): +class Integration(BaseModel): id: Optional[str] = None """API UUID.""" diff --git a/src/cloudflare/types/zero_trust/devices/posture_create_params.py b/src/cloudflare/types/zero_trust/devices/posture_create_params.py index 286e4842e1f..69c45532eed 100644 --- a/src/cloudflare/types/zero_trust/devices/posture_create_params.py +++ b/src/cloudflare/types/zero_trust/devices/posture_create_params.py @@ -5,8 +5,8 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from .input_param import InputParam -from .match_param import MatchParam +from .device_input_param import DeviceInputParam +from .device_match_param import DeviceMatchParam __all__ = ["PostureCreateParams"] @@ -52,10 +52,10 @@ class PostureCreateParams(TypedDict, total=False): WARP client. """ - input: InputParam + input: DeviceInputParam """The value to be checked against.""" - match: Iterable[MatchParam] + match: Iterable[DeviceMatchParam] """The conditions that the client must match to run the rule.""" schedule: str diff --git a/src/cloudflare/types/zero_trust/devices/posture_update_params.py b/src/cloudflare/types/zero_trust/devices/posture_update_params.py index 2ae7c1816e0..7d32102d7dd 100644 --- a/src/cloudflare/types/zero_trust/devices/posture_update_params.py +++ b/src/cloudflare/types/zero_trust/devices/posture_update_params.py @@ -5,8 +5,8 @@ from typing import Iterable from typing_extensions import Literal, Required, TypedDict -from .input_param import InputParam -from .match_param import MatchParam +from .device_input_param import DeviceInputParam +from .device_match_param import DeviceMatchParam __all__ = ["PostureUpdateParams"] @@ -52,10 +52,10 @@ class PostureUpdateParams(TypedDict, total=False): WARP client. """ - input: InputParam + input: DeviceInputParam """The value to be checked against.""" - match: Iterable[MatchParam] + match: Iterable[DeviceMatchParam] """The conditions that the client must match to run the rule.""" schedule: str diff --git a/src/cloudflare/types/zero_trust/dex/__init__.py b/src/cloudflare/types/zero_trust/dex/__init__.py index c5e2baab0f3..efa573e206b 100644 --- a/src/cloudflare/types/zero_trust/dex/__init__.py +++ b/src/cloudflare/types/zero_trust/dex/__init__.py @@ -6,7 +6,6 @@ from .live_stat import LiveStat as LiveStat from .traceroute import Traceroute as Traceroute from .http_details import HTTPDetails as HTTPDetails -from .network_path import NetworkPath as NetworkPath from .colo_list_params import ColoListParams as ColoListParams from .test_list_params import TestListParams as TestListParams from .test_list_response import TestListResponse as TestListResponse diff --git a/src/cloudflare/types/zero_trust/dex/traceroute_test_results/__init__.py b/src/cloudflare/types/zero_trust/dex/traceroute_test_results/__init__.py index ed98d6fa184..02438e6c643 100644 --- a/src/cloudflare/types/zero_trust/dex/traceroute_test_results/__init__.py +++ b/src/cloudflare/types/zero_trust/dex/traceroute_test_results/__init__.py @@ -2,4 +2,4 @@ from __future__ import annotations -from .network_path import NetworkPath as NetworkPath +from .network_path_get_response import NetworkPathGetResponse as NetworkPathGetResponse diff --git a/src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path.py b/src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path_get_response.py similarity index 93% rename from src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path.py rename to src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path_get_response.py index 17c0f78cf28..2dc7a507b92 100644 --- a/src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path.py +++ b/src/cloudflare/types/zero_trust/dex/traceroute_test_results/network_path_get_response.py @@ -7,7 +7,7 @@ from ....._models import BaseModel -__all__ = ["NetworkPath", "Hop", "HopLocation"] +__all__ = ["NetworkPathGetResponse", "Hop", "HopLocation"] class HopLocation(BaseModel): @@ -38,7 +38,7 @@ class Hop(BaseModel): rtt_ms: Optional[int] = FieldInfo(alias="rttMs", default=None) -class NetworkPath(BaseModel): +class NetworkPathGetResponse(BaseModel): hops: List[Hop] """an array of the hops taken by the device to reach the end destination""" diff --git a/src/cloudflare/types/zero_trust/dex/network_path.py b/src/cloudflare/types/zero_trust/network_path.py similarity index 95% rename from src/cloudflare/types/zero_trust/dex/network_path.py rename to src/cloudflare/types/zero_trust/network_path.py index 679f83c929a..49dad29ba53 100644 --- a/src/cloudflare/types/zero_trust/dex/network_path.py +++ b/src/cloudflare/types/zero_trust/network_path.py @@ -5,7 +5,7 @@ from pydantic import Field as FieldInfo -from ...._models import BaseModel +from ..._models import BaseModel __all__ = ["NetworkPath"] diff --git a/tests/api_resources/zero_trust/access/test_bookmarks.py b/tests/api_resources/zero_trust/access/test_bookmarks.py index 7c9feaa759c..bfb64c68100 100644 --- a/tests/api_resources/zero_trust/access/test_bookmarks.py +++ b/tests/api_resources/zero_trust/access/test_bookmarks.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.zero_trust.access import ( - Bookmarks, + Bookmark, BookmarkDeleteResponse, ) @@ -29,7 +29,7 @@ def test_method_create(self, client: Cloudflare) -> None: identifier="699d98642c564d2e855e9661899b7252", body={}, ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -43,7 +43,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" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -57,7 +57,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -86,7 +86,7 @@ def test_method_update(self, client: Cloudflare) -> None: identifier="699d98642c564d2e855e9661899b7252", body={}, ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -100,7 +100,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" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -114,7 +114,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -141,7 +141,7 @@ def test_method_list(self, client: Cloudflare) -> None: bookmark = client.zero_trust.access.bookmarks.list( "699d98642c564d2e855e9661899b7252", ) - assert_matches_type(SyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -153,7 +153,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" bookmark = response.parse() - assert_matches_type(SyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -165,7 +165,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = response.parse() - assert_matches_type(SyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(SyncSinglePage[Bookmark], bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -241,7 +241,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", identifier="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -254,7 +254,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" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -267,7 +267,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -298,7 +298,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: identifier="699d98642c564d2e855e9661899b7252", body={}, ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -312,7 +312,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" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -326,7 +326,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -355,7 +355,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: identifier="699d98642c564d2e855e9661899b7252", body={}, ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -369,7 +369,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" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -383,7 +383,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -410,7 +410,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: bookmark = await async_client.zero_trust.access.bookmarks.list( "699d98642c564d2e855e9661899b7252", ) - assert_matches_type(AsyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -422,7 +422,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" bookmark = await response.parse() - assert_matches_type(AsyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -434,7 +434,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = await response.parse() - assert_matches_type(AsyncSinglePage[Bookmarks], bookmark, path=["response"]) + assert_matches_type(AsyncSinglePage[Bookmark], bookmark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -510,7 +510,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", identifier="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -523,7 +523,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" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) @pytest.mark.skip() @parametrize @@ -536,7 +536,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" bookmark = await response.parse() - assert_matches_type(Bookmarks, bookmark, path=["response"]) + assert_matches_type(Bookmark, bookmark, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/access/test_service_tokens.py b/tests/api_resources/zero_trust/access/test_service_tokens.py index ca6aa7c42bf..28ebab16704 100644 --- a/tests/api_resources/zero_trust/access/test_service_tokens.py +++ b/tests/api_resources/zero_trust/access/test_service_tokens.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.zero_trust.access import ( - ErviceToken, + ServiceToken, ServiceTokenCreateResponse, ServiceTokenRotateResponse, ) @@ -98,7 +98,7 @@ def test_method_update(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -110,7 +110,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: duration="60m", name="CI/CD token", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -124,7 +124,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" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -138,7 +138,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -173,7 +173,7 @@ def test_method_list(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -182,7 +182,7 @@ def test_method_list_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(SyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -195,7 +195,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" service_token = response.parse() - assert_matches_type(SyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -208,7 +208,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(SyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(SyncSinglePage[ServiceToken], service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -235,7 +235,7 @@ def test_method_delete(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -245,7 +245,7 @@ def test_method_delete_with_all_params(self, client: Cloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -259,7 +259,7 @@ def test_raw_response_delete(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -273,7 +273,7 @@ def test_streaming_response_delete(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -308,7 +308,7 @@ def test_method_refresh(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", identifier="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -321,7 +321,7 @@ def test_raw_response_refresh(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -334,7 +334,7 @@ def test_streaming_response_refresh(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -485,7 +485,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -497,7 +497,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare duration="60m", name="CI/CD token", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -511,7 +511,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" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -525,7 +525,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -560,7 +560,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -569,7 +569,7 @@ async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) account_id="string", zone_id="string", ) - assert_matches_type(AsyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -582,7 +582,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" service_token = await response.parse() - assert_matches_type(AsyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -595,7 +595,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(AsyncSinglePage[ErviceToken], service_token, path=["response"]) + assert_matches_type(AsyncSinglePage[ServiceToken], service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -622,7 +622,7 @@ async def test_method_delete(self, async_client: AsyncCloudflare) -> None: account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -632,7 +632,7 @@ async def test_method_delete_with_all_params(self, async_client: AsyncCloudflare account_id="string", zone_id="string", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -646,7 +646,7 @@ async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -660,7 +660,7 @@ async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True @@ -695,7 +695,7 @@ async def test_method_refresh(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", identifier="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -708,7 +708,7 @@ async def test_raw_response_refresh(self, async_client: AsyncCloudflare) -> None assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) @pytest.mark.skip() @parametrize @@ -721,7 +721,7 @@ async def test_streaming_response_refresh(self, async_client: AsyncCloudflare) - assert response.http_request.headers.get("X-Stainless-Lang") == "python" service_token = await response.parse() - assert_matches_type(ErviceToken, service_token, path=["response"]) + assert_matches_type(ServiceToken, service_token, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/devices/posture/test_integrations.py b/tests/api_resources/zero_trust/devices/posture/test_integrations.py index 5322abbcd35..26c9cb0c844 100644 --- a/tests/api_resources/zero_trust/devices/posture/test_integrations.py +++ b/tests/api_resources/zero_trust/devices/posture/test_integrations.py @@ -12,7 +12,7 @@ from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.shared import UnnamedSchemaRef9444735ca60712dbcf8afd832eb5716a from cloudflare.types.zero_trust.devices.posture import ( - Integrations, + Integration, ) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -36,7 +36,7 @@ def test_method_create(self, client: Cloudflare) -> None: name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -53,7 +53,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -74,7 +74,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" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -95,7 +95,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -122,7 +122,7 @@ def test_method_list(self, client: Cloudflare) -> None: integration = client.zero_trust.devices.posture.integrations.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(SyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(SyncSinglePage[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -134,7 +134,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" integration = response.parse() - assert_matches_type(SyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(SyncSinglePage[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -146,7 +146,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = response.parse() - assert_matches_type(SyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(SyncSinglePage[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -222,7 +222,7 @@ def test_method_edit(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -240,7 +240,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -253,7 +253,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" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -266,7 +266,7 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -292,7 +292,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -305,7 +305,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" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -318,7 +318,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -356,7 +356,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -373,7 +373,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -394,7 +394,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" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -415,7 +415,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -442,7 +442,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: integration = await async_client.zero_trust.devices.posture.integrations.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(AsyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(AsyncSinglePage[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -454,7 +454,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" integration = await response.parse() - assert_matches_type(AsyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(AsyncSinglePage[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -466,7 +466,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = await response.parse() - assert_matches_type(AsyncSinglePage[Integrations], integration, path=["response"]) + assert_matches_type(AsyncSinglePage[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -542,7 +542,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -560,7 +560,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) name="My Workspace One Integration", type="workspace_one", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -573,7 +573,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" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -586,7 +586,7 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True @@ -612,7 +612,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -625,7 +625,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" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) @pytest.mark.skip() @parametrize @@ -638,7 +638,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" integration = await response.parse() - assert_matches_type(Optional[Integrations], integration, path=["response"]) + assert_matches_type(Optional[Integration], integration, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/devices/test_networks.py b/tests/api_resources/zero_trust/devices/test_networks.py index d91e09d5763..945e63aff1f 100644 --- a/tests/api_resources/zero_trust/devices/test_networks.py +++ b/tests/api_resources/zero_trust/devices/test_networks.py @@ -11,7 +11,7 @@ from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage from cloudflare.types.zero_trust.devices import ( - Network, + DeviceNetwork, NetworkDeleteResponse, ) @@ -30,7 +30,7 @@ def test_method_create(self, client: Cloudflare) -> None: name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -44,7 +44,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -59,7 +59,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" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -74,7 +74,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -96,7 +96,7 @@ def test_method_update(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -111,7 +111,7 @@ def test_method_update_with_all_params(self, client: Cloudflare) -> None: name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -124,7 +124,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" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -137,7 +137,7 @@ def test_streaming_response_update(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -162,7 +162,7 @@ def test_method_list(self, client: Cloudflare) -> None: network = client.zero_trust.devices.networks.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(SyncSinglePage[Network], network, path=["response"]) + assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -174,7 +174,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" network = response.parse() - assert_matches_type(SyncSinglePage[Network], network, path=["response"]) + assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -186,7 +186,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = response.parse() - assert_matches_type(SyncSinglePage[Network], network, path=["response"]) + assert_matches_type(SyncSinglePage[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -262,7 +262,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -275,7 +275,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" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -288,7 +288,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -320,7 +320,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -334,7 +334,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -349,7 +349,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" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -364,7 +364,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -386,7 +386,7 @@ async def test_method_update(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -401,7 +401,7 @@ async def test_method_update_with_all_params(self, async_client: AsyncCloudflare name="managed-network-1", type="tls", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -414,7 +414,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" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -427,7 +427,7 @@ async def test_streaming_response_update(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -452,7 +452,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: network = await async_client.zero_trust.devices.networks.list( account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(AsyncSinglePage[Network], network, path=["response"]) + assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -464,7 +464,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" network = await response.parse() - assert_matches_type(AsyncSinglePage[Network], network, path=["response"]) + assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -476,7 +476,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = await response.parse() - assert_matches_type(AsyncSinglePage[Network], network, path=["response"]) + assert_matches_type(AsyncSinglePage[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True @@ -552,7 +552,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="699d98642c564d2e855e9661899b7252", ) - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -565,7 +565,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" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) @pytest.mark.skip() @parametrize @@ -578,7 +578,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" network = await response.parse() - assert_matches_type(Optional[Network], network, path=["response"]) + assert_matches_type(Optional[DeviceNetwork], network, path=["response"]) assert cast(Any, response.is_closed) is True diff --git a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py index 674e41cd649..8c006167e61 100644 --- a/tests/api_resources/zero_trust/dex/test_traceroute_tests.py +++ b/tests/api_resources/zero_trust/dex/test_traceroute_tests.py @@ -9,9 +9,9 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type +from cloudflare.types.zero_trust import NetworkPath from cloudflare.types.zero_trust.dex import ( Traceroute, - NetworkPath, TracerouteTestPercentilesResponse, ) diff --git a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py index 60a912d414a..738dcfcb6ec 100644 --- a/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py +++ b/tests/api_resources/zero_trust/dex/traceroute_test_results/test_network_path.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPath +from cloudflare.types.zero_trust.dex.traceroute_test_results import NetworkPathGetResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -24,7 +24,7 @@ def test_method_get(self, client: Cloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) @pytest.mark.skip() @parametrize @@ -37,7 +37,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" network_path = response.parse() - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) @pytest.mark.skip() @parametrize @@ -50,7 +50,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" network_path = response.parse() - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) assert cast(Any, response.is_closed) is True @@ -80,7 +80,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", account_id="01a7362d577a6c3019a474fd6f485823", ) - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) @pytest.mark.skip() @parametrize @@ -93,7 +93,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" network_path = await response.parse() - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) @pytest.mark.skip() @parametrize @@ -106,7 +106,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" network_path = await response.parse() - assert_matches_type(NetworkPath, network_path, path=["response"]) + assert_matches_type(NetworkPathGetResponse, network_path, path=["response"]) assert cast(Any, response.is_closed) is True