feat(warp_connector)!: move under zero trust namespace (#2220)

Author: stainless-app[bot]

api.md

@@ -4681,30 +4681,6 @@ Methods:
 
 - <code title="post /accounts/{account_id}/r2/temp-access-credentials">client.r2.temporary_credentials.<a href="./src/cloudflare/resources/r2/temporary_credentials.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/r2/temporary_credential_create_params.py">params</a>) -> <a href="./src/cloudflare/types/r2/temporary_credential_create_response.py">TemporaryCredentialCreateResponse</a></code>
 
-# WARPConnector
-
-Types:
-
-```python
-from cloudflare.types.warp_connector import (
-    WARPConnectorCreateResponse,
-    WARPConnectorListResponse,
-    WARPConnectorDeleteResponse,
-    WARPConnectorEditResponse,
-    WARPConnectorGetResponse,
-    WARPConnectorTokenResponse,
-)
-```
-
-Methods:
-
-- <code title="post /accounts/{account_id}/warp_connector">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_create_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_create_response.py">WARPConnectorCreateResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_list_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_list_response.py">SyncV4PagePaginationArray[WARPConnectorListResponse]</a></code>
-- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_delete_response.py">WARPConnectorDeleteResponse</a></code>
-- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/warp_connector/warp_connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_edit_response.py">WARPConnectorEditResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_get_response.py">WARPConnectorGetResponse</a></code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.warp_connector.<a href="./src/cloudflare/resources/warp_connector.py">token</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/warp_connector/warp_connector_token_response.py">str</a></code>
-
 # WorkersForPlatforms
 
 ## Dispatch
@@ -5750,6 +5726,30 @@ Methods:
 - <code title="patch /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnel_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnel_edit_response.py">TunnelEditResponse</a></code>
 - <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zero_trust.tunnels.<a href="./src/cloudflare/resources/zero_trust/tunnels/tunnels.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnel_get_response.py">TunnelGetResponse</a></code>
 
+### WARPConnector
+
+Types:
+
+```python
+from cloudflare.types.zero_trust.tunnels import (
+    WARPConnectorCreateResponse,
+    WARPConnectorListResponse,
+    WARPConnectorDeleteResponse,
+    WARPConnectorEditResponse,
+    WARPConnectorGetResponse,
+    WARPConnectorTokenResponse,
+)
+```
+
+Methods:
+
+- <code title="post /accounts/{account_id}/warp_connector">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py">WARPConnectorCreateResponse</a></code>
+- <code title="get /accounts/{account_id}/warp_connector">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">list</a>(\*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_list_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_list_response.py">SyncV4PagePaginationArray[WARPConnectorListResponse]</a></code>
+- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">delete</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_delete_response.py">WARPConnectorDeleteResponse</a></code>
+- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">edit</a>(tunnel_id, \*, account_id, \*\*<a href="src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_edit_response.py">WARPConnectorEditResponse</a></code>
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">get</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_get_response.py">WARPConnectorGetResponse</a></code>
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.zero_trust.tunnels.warp_connector.<a href="./src/cloudflare/resources/zero_trust/tunnels/warp_connector.py">token</a>(tunnel_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/tunnels/warp_connector_token_response.py">str</a></code>
+
 ### Configurations
 
 Types:

src/cloudflare/_client.py

@@ -101,7 +101,6 @@
         dcv_delegation,
         email_security,
         load_balancers,
-        warp_connector,
         cloud_connector,
         durable_objects,
         request_tracers,
@@ -575,12 +574,6 @@ def r2(self) -> r2.R2Resource:
 
         return R2Resource(self)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.WARPConnectorResource:
-        from .resources.warp_connector import WARPConnectorResource
-
-        return WARPConnectorResource(self)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.WorkersForPlatformsResource:
         from .resources.workers_for_platforms import WorkersForPlatformsResource
@@ -1346,12 +1339,6 @@ def r2(self) -> r2.AsyncR2Resource:
 
         return AsyncR2Resource(self)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.AsyncWARPConnectorResource:
-        from .resources.warp_connector import AsyncWARPConnectorResource
-
-        return AsyncWARPConnectorResource(self)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.AsyncWorkersForPlatformsResource:
         from .resources.workers_for_platforms import AsyncWorkersForPlatformsResource
@@ -2050,12 +2037,6 @@ def r2(self) -> r2.R2ResourceWithRawResponse:
 
         return R2ResourceWithRawResponse(self._client.r2)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.WARPConnectorResourceWithRawResponse:
-        from .resources.warp_connector import WARPConnectorResourceWithRawResponse
-
-        return WARPConnectorResourceWithRawResponse(self._client.warp_connector)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.WorkersForPlatformsResourceWithRawResponse:
         from .resources.workers_for_platforms import WorkersForPlatformsResourceWithRawResponse
@@ -2575,12 +2556,6 @@ def r2(self) -> r2.AsyncR2ResourceWithRawResponse:
 
         return AsyncR2ResourceWithRawResponse(self._client.r2)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.AsyncWARPConnectorResourceWithRawResponse:
-        from .resources.warp_connector import AsyncWARPConnectorResourceWithRawResponse
-
-        return AsyncWARPConnectorResourceWithRawResponse(self._client.warp_connector)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.AsyncWorkersForPlatformsResourceWithRawResponse:
         from .resources.workers_for_platforms import AsyncWorkersForPlatformsResourceWithRawResponse
@@ -3100,12 +3075,6 @@ def r2(self) -> r2.R2ResourceWithStreamingResponse:
 
         return R2ResourceWithStreamingResponse(self._client.r2)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.WARPConnectorResourceWithStreamingResponse:
-        from .resources.warp_connector import WARPConnectorResourceWithStreamingResponse
-
-        return WARPConnectorResourceWithStreamingResponse(self._client.warp_connector)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.WorkersForPlatformsResourceWithStreamingResponse:
         from .resources.workers_for_platforms import WorkersForPlatformsResourceWithStreamingResponse
@@ -3629,12 +3598,6 @@ def r2(self) -> r2.AsyncR2ResourceWithStreamingResponse:
 
         return AsyncR2ResourceWithStreamingResponse(self._client.r2)
 
-    @cached_property
-    def warp_connector(self) -> warp_connector.AsyncWARPConnectorResourceWithStreamingResponse:
-        from .resources.warp_connector import AsyncWARPConnectorResourceWithStreamingResponse
-
-        return AsyncWARPConnectorResourceWithStreamingResponse(self._client.warp_connector)
-
     @cached_property
     def workers_for_platforms(self) -> workers_for_platforms.AsyncWorkersForPlatformsResourceWithStreamingResponse:
         from .resources.workers_for_platforms import AsyncWorkersForPlatformsResourceWithStreamingResponse

src/cloudflare/resources/zero_trust/tunnels/__init__.py

@@ -48,8 +48,22 @@
     ConfigurationsResourceWithStreamingResponse,
     AsyncConfigurationsResourceWithStreamingResponse,
 )
+from .warp_connector import (
+    WARPConnectorResource,
+    AsyncWARPConnectorResource,
+    WARPConnectorResourceWithRawResponse,
+    AsyncWARPConnectorResourceWithRawResponse,
+    WARPConnectorResourceWithStreamingResponse,
+    AsyncWARPConnectorResourceWithStreamingResponse,
+)
 
 __all__ = [
+    "WARPConnectorResource",
+    "AsyncWARPConnectorResource",
+    "WARPConnectorResourceWithRawResponse",
+    "AsyncWARPConnectorResourceWithRawResponse",
+    "WARPConnectorResourceWithStreamingResponse",
+    "AsyncWARPConnectorResourceWithStreamingResponse",
     "ConfigurationsResource",
     "AsyncConfigurationsResource",
     "ConfigurationsResourceWithRawResponse",

src/cloudflare/resources/zero_trust/tunnels/tunnels.py

@@ -63,6 +63,14 @@
     ConfigurationsResourceWithStreamingResponse,
     AsyncConfigurationsResourceWithStreamingResponse,
 )
+from .warp_connector import (
+    WARPConnectorResource,
+    AsyncWARPConnectorResource,
+    WARPConnectorResourceWithRawResponse,
+    AsyncWARPConnectorResourceWithRawResponse,
+    WARPConnectorResourceWithStreamingResponse,
+    AsyncWARPConnectorResourceWithStreamingResponse,
+)
 from ...._base_client import AsyncPaginator, make_request_options
 from ....types.zero_trust import tunnel_edit_params, tunnel_list_params, tunnel_create_params
 from ....types.zero_trust.tunnel_get_response import TunnelGetResponse
@@ -75,6 +83,10 @@
 
 
 class TunnelsResource(SyncAPIResource):
+    @cached_property
+    def warp_connector(self) -> WARPConnectorResource:
+        return WARPConnectorResource(self._client)
+
     @cached_property
     def configurations(self) -> ConfigurationsResource:
         return ConfigurationsResource(self._client)
@@ -426,6 +438,10 @@ def get(
 
 
 class AsyncTunnelsResource(AsyncAPIResource):
+    @cached_property
+    def warp_connector(self) -> AsyncWARPConnectorResource:
+        return AsyncWARPConnectorResource(self._client)
+
     @cached_property
     def configurations(self) -> AsyncConfigurationsResource:
         return AsyncConfigurationsResource(self._client)
@@ -796,6 +812,10 @@ def __init__(self, tunnels: TunnelsResource) -> None:
             tunnels.get,
         )
 
+    @cached_property
+    def warp_connector(self) -> WARPConnectorResourceWithRawResponse:
+        return WARPConnectorResourceWithRawResponse(self._tunnels.warp_connector)
+
     @cached_property
     def configurations(self) -> ConfigurationsResourceWithRawResponse:
         return ConfigurationsResourceWithRawResponse(self._tunnels.configurations)
@@ -837,6 +857,10 @@ def __init__(self, tunnels: AsyncTunnelsResource) -> None:
             tunnels.get,
         )
 
+    @cached_property
+    def warp_connector(self) -> AsyncWARPConnectorResourceWithRawResponse:
+        return AsyncWARPConnectorResourceWithRawResponse(self._tunnels.warp_connector)
+
     @cached_property
     def configurations(self) -> AsyncConfigurationsResourceWithRawResponse:
         return AsyncConfigurationsResourceWithRawResponse(self._tunnels.configurations)
@@ -878,6 +902,10 @@ def __init__(self, tunnels: TunnelsResource) -> None:
             tunnels.get,
         )
 
+    @cached_property
+    def warp_connector(self) -> WARPConnectorResourceWithStreamingResponse:
+        return WARPConnectorResourceWithStreamingResponse(self._tunnels.warp_connector)
+
     @cached_property
     def configurations(self) -> ConfigurationsResourceWithStreamingResponse:
         return ConfigurationsResourceWithStreamingResponse(self._tunnels.configurations)
@@ -919,6 +947,10 @@ def __init__(self, tunnels: AsyncTunnelsResource) -> None:
             tunnels.get,
         )
 
+    @cached_property
+    def warp_connector(self) -> AsyncWARPConnectorResourceWithStreamingResponse:
+        return AsyncWARPConnectorResourceWithStreamingResponse(self._tunnels.warp_connector)
+
     @cached_property
     def configurations(self) -> AsyncConfigurationsResourceWithStreamingResponse:
         return AsyncConfigurationsResourceWithStreamingResponse(self._tunnels.configurations)

src/cloudflare/resources/warp_connector.py renamed to src/cloudflare/resources/zero_trust/tunnels/warp_connector.py

@@ -8,29 +8,33 @@
 
 import httpx
 
-from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import (
+from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
+from ...._utils import (
     maybe_transform,
     async_maybe_transform,
 )
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
+from ...._compat import cached_property
+from ...._resource import SyncAPIResource, AsyncAPIResource
+from ...._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from .._wrappers import ResultWrapper
-from ..pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from .._base_client import AsyncPaginator, make_request_options
-from ..types.warp_connector import warp_connector_edit_params, warp_connector_list_params, warp_connector_create_params
-from ..types.warp_connector.warp_connector_get_response import WARPConnectorGetResponse
-from ..types.warp_connector.warp_connector_edit_response import WARPConnectorEditResponse
-from ..types.warp_connector.warp_connector_list_response import WARPConnectorListResponse
-from ..types.warp_connector.warp_connector_token_response import WARPConnectorTokenResponse
-from ..types.warp_connector.warp_connector_create_response import WARPConnectorCreateResponse
-from ..types.warp_connector.warp_connector_delete_response import WARPConnectorDeleteResponse
+from ...._wrappers import ResultWrapper
+from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.zero_trust.tunnels import (
+    warp_connector_edit_params,
+    warp_connector_list_params,
+    warp_connector_create_params,
+)
+from ....types.zero_trust.tunnels.warp_connector_get_response import WARPConnectorGetResponse
+from ....types.zero_trust.tunnels.warp_connector_edit_response import WARPConnectorEditResponse
+from ....types.zero_trust.tunnels.warp_connector_list_response import WARPConnectorListResponse
+from ....types.zero_trust.tunnels.warp_connector_token_response import WARPConnectorTokenResponse
+from ....types.zero_trust.tunnels.warp_connector_create_response import WARPConnectorCreateResponse
+from ....types.zero_trust.tunnels.warp_connector_delete_response import WARPConnectorDeleteResponse
 
 __all__ = ["WARPConnectorResource", "AsyncWARPConnectorResource"]
 

src/cloudflare/types/warp_connector/__init__.py

@@ -9,5 +9,14 @@
 from .management_create_params import ManagementCreateParams as ManagementCreateParams
 from .configuration_get_response import ConfigurationGetResponse as ConfigurationGetResponse
 from .management_create_response import ManagementCreateResponse as ManagementCreateResponse
+from .warp_connector_edit_params import WARPConnectorEditParams as WARPConnectorEditParams
+from .warp_connector_list_params import WARPConnectorListParams as WARPConnectorListParams
 from .configuration_update_params import ConfigurationUpdateParams as ConfigurationUpdateParams
+from .warp_connector_get_response import WARPConnectorGetResponse as WARPConnectorGetResponse
+from .warp_connector_create_params import WARPConnectorCreateParams as WARPConnectorCreateParams
+from .warp_connector_edit_response import WARPConnectorEditResponse as WARPConnectorEditResponse
+from .warp_connector_list_response import WARPConnectorListResponse as WARPConnectorListResponse
 from .configuration_update_response import ConfigurationUpdateResponse as ConfigurationUpdateResponse
+from .warp_connector_token_response import WARPConnectorTokenResponse as WARPConnectorTokenResponse
+from .warp_connector_create_response import WARPConnectorCreateResponse as WARPConnectorCreateResponse
+from .warp_connector_delete_response import WARPConnectorDeleteResponse as WARPConnectorDeleteResponse

src/cloudflare/types/zero_trust/tunnels/__init__.py

@@ -4,8 +4,8 @@
 from datetime import datetime
 from typing_extensions import Literal, TypeAlias
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
+from ...shared.cloudflare_tunnel import CloudflareTunnel
 
 __all__ = ["WARPConnectorCreateResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
 

src/cloudflare/types/warp_connector/warp_connector_create_params.py renamed to src/cloudflare/types/zero_trust/tunnels/warp_connector_create_params.py

@@ -4,8 +4,8 @@
 from datetime import datetime
 from typing_extensions import Literal, TypeAlias
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
+from ...shared.cloudflare_tunnel import CloudflareTunnel
 
 __all__ = ["WARPConnectorDeleteResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]
 

src/cloudflare/types/warp_connector/warp_connector_create_response.py renamed to src/cloudflare/types/zero_trust/tunnels/warp_connector_create_response.py

@@ -4,8 +4,8 @@
 from datetime import datetime
 from typing_extensions import Literal, TypeAlias
 
-from ..._models import BaseModel
-from ..shared.cloudflare_tunnel import CloudflareTunnel
+from ...._models import BaseModel
+from ...shared.cloudflare_tunnel import CloudflareTunnel
 
 __all__ = ["WARPConnectorEditResponse", "TunnelWARPConnectorTunnel", "TunnelWARPConnectorTunnelConnection"]