diff --git a/api.md b/api.md index 340d20bfc094..91c61fd0011c 100644 --- a/api.md +++ b/api.md @@ -5252,12 +5252,12 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.access import User +from cloudflare.types.zero_trust.access import AccessUser ``` Methods: -- client.zero_trust.access.users.list(identifier) -> SyncSinglePage[User] +- client.zero_trust.access.users.list(identifier) -> SyncSinglePage[AccessUser] #### ActiveSessions diff --git a/src/cloudflare/resources/zero_trust/access/users/users.py b/src/cloudflare/resources/zero_trust/access/users/users.py index 04e0097f8f38..98d725628d14 100644 --- a/src/cloudflare/resources/zero_trust/access/users/users.py +++ b/src/cloudflare/resources/zero_trust/access/users/users.py @@ -42,7 +42,7 @@ LastSeenIdentityWithStreamingResponse, AsyncLastSeenIdentityWithStreamingResponse, ) -from .....types.zero_trust.access import User +from .....types.zero_trust.access import AccessUser __all__ = ["Users", "AsyncUsers"] @@ -78,7 +78,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[User]: + ) -> SyncSinglePage[AccessUser]: """ Gets a list of users for an account. @@ -97,11 +97,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/users", - page=SyncSinglePage[User], + page=SyncSinglePage[AccessUser], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=User, + model=AccessUser, ) @@ -136,7 +136,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[User, AsyncSinglePage[User]]: + ) -> AsyncPaginator[AccessUser, AsyncSinglePage[AccessUser]]: """ Gets a list of users for an account. @@ -155,11 +155,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/users", - page=AsyncSinglePage[User], + page=AsyncSinglePage[AccessUser], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=User, + model=AccessUser, ) diff --git a/src/cloudflare/types/zero_trust/access/__init__.py b/src/cloudflare/types/zero_trust/access/__init__.py index d930f650c7e8..8aa8ea34237e 100644 --- a/src/cloudflare/types/zero_trust/access/__init__.py +++ b/src/cloudflare/types/zero_trust/access/__init__.py @@ -3,8 +3,8 @@ from __future__ import annotations from .tag import Tag as Tag -from .user import User as User from .bookmark import Bookmark as Bookmark +from .access_user import AccessUser as AccessUser from .application import Application as Application from .certificate import Certificate as Certificate from .custom_page import CustomPage as CustomPage diff --git a/src/cloudflare/types/zero_trust/access/user.py b/src/cloudflare/types/zero_trust/access/access_user.py similarity index 95% rename from src/cloudflare/types/zero_trust/access/user.py rename to src/cloudflare/types/zero_trust/access/access_user.py index 93d90a734995..2430d721cf21 100644 --- a/src/cloudflare/types/zero_trust/access/user.py +++ b/src/cloudflare/types/zero_trust/access/access_user.py @@ -5,10 +5,10 @@ from ...._models import BaseModel -__all__ = ["User"] +__all__ = ["AccessUser"] -class User(BaseModel): +class AccessUser(BaseModel): id: Optional[str] = None """UUID""" diff --git a/tests/api_resources/zero_trust/access/test_users.py b/tests/api_resources/zero_trust/access/test_users.py index 744e3ad3bf7b..150520760032 100644 --- a/tests/api_resources/zero_trust/access/test_users.py +++ b/tests/api_resources/zero_trust/access/test_users.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.zero_trust.access import User +from cloudflare.types.zero_trust.access import AccessUser base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -24,7 +24,7 @@ def test_method_list(self, client: Cloudflare) -> None: user = client.zero_trust.access.users.list( "023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[User], user, path=["response"]) + assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"]) @pytest.mark.skip() @parametrize @@ -36,7 +36,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" user = response.parse() - assert_matches_type(SyncSinglePage[User], user, path=["response"]) + assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"]) @pytest.mark.skip() @parametrize @@ -48,7 +48,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" user = response.parse() - assert_matches_type(SyncSinglePage[User], user, path=["response"]) + assert_matches_type(SyncSinglePage[AccessUser], user, path=["response"]) assert cast(Any, response.is_closed) is True @@ -70,7 +70,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: user = await async_client.zero_trust.access.users.list( "023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[User], user, path=["response"]) + assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"]) @pytest.mark.skip() @parametrize @@ -82,7 +82,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" user = await response.parse() - assert_matches_type(AsyncSinglePage[User], user, path=["response"]) + assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"]) @pytest.mark.skip() @parametrize @@ -94,7 +94,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" user = await response.parse() - assert_matches_type(AsyncSinglePage[User], user, path=["response"]) + assert_matches_type(AsyncSinglePage[AccessUser], user, path=["response"]) assert cast(Any, response.is_closed) is True