diff --git a/api.md b/api.md index ff3ba8e8c77..bb1656ac39f 100644 --- a/api.md +++ b/api.md @@ -971,6 +971,64 @@ Methods: - client.custom_nameservers.availabilty(\*, account_id) -> Optional[CustomNameserverAvailabiltyResponse] - client.custom_nameservers.get(\*, account_id) -> Optional[CustomNameserverGetResponse] +# DNSFirewall + +Types: + +```python +from cloudflare.types.dns_firewall import ( + AttackMitigation, + FirewallIPs, + UpstreamIPs, + DNSFirewallCreateResponse, + DNSFirewallListResponse, + DNSFirewallDeleteResponse, + DNSFirewallEditResponse, + DNSFirewallGetResponse, +) +``` + +Methods: + +- client.dns_firewall.create(\*, account_id, \*\*params) -> Optional[DNSFirewallCreateResponse] +- client.dns_firewall.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[DNSFirewallListResponse] +- client.dns_firewall.delete(dns_firewall_id, \*, account_id) -> Optional[DNSFirewallDeleteResponse] +- client.dns_firewall.edit(dns_firewall_id, \*, account_id, \*\*params) -> Optional[DNSFirewallEditResponse] +- client.dns_firewall.get(dns_firewall_id, \*, account_id) -> Optional[DNSFirewallGetResponse] + +## Analytics + +Types: + +```python +from cloudflare.types.dns_firewall import Delta +``` + +### Reports + +Methods: + +- client.dns_firewall.analytics.reports.get(dns_firewall_id, \*, account_id, \*\*params) -> Optional[Report] + +#### Bytimes + +Methods: + +- client.dns_firewall.analytics.reports.bytimes.get(dns_firewall_id, \*, account_id, \*\*params) -> Optional[ByTime] + +## ReverseDNS + +Types: + +```python +from cloudflare.types.dns_firewall import ReverseDNSEditResponse, ReverseDNSGetResponse +``` + +Methods: + +- client.dns_firewall.reverse_dns.edit(dns_firewall_id, \*, account_id, \*\*params) -> Optional[ReverseDNSEditResponse] +- client.dns_firewall.reverse_dns.get(dns_firewall_id, \*, account_id) -> Optional[ReverseDNSGetResponse] + # DNS Types: @@ -1110,64 +1168,6 @@ Methods: - client.dns.analytics.reports.bytimes.get(\*, zone_id, \*\*params) -> Optional[ByTime] -## Firewall - -Types: - -```python -from cloudflare.types.dns import ( - AttackMitigation, - FirewallIPs, - UpstreamIPs, - FirewallCreateResponse, - FirewallListResponse, - FirewallDeleteResponse, - FirewallEditResponse, - FirewallGetResponse, -) -``` - -Methods: - -- client.dns.firewall.create(\*, account_id, \*\*params) -> Optional[FirewallCreateResponse] -- client.dns.firewall.list(\*, account_id, \*\*params) -> SyncV4PagePaginationArray[FirewallListResponse] -- client.dns.firewall.delete(dns_firewall_id, \*, account_id) -> Optional[FirewallDeleteResponse] -- client.dns.firewall.edit(dns_firewall_id, \*, account_id, \*\*params) -> Optional[FirewallEditResponse] -- client.dns.firewall.get(dns_firewall_id, \*, account_id) -> Optional[FirewallGetResponse] - -### Analytics - -Types: - -```python -from cloudflare.types.dns.firewall import Delta -``` - -#### Reports - -Methods: - -- client.dns.firewall.analytics.reports.get(dns_firewall_id, \*, account_id, \*\*params) -> Optional[Report] - -##### Bytimes - -Methods: - -- client.dns.firewall.analytics.reports.bytimes.get(dns_firewall_id, \*, account_id, \*\*params) -> Optional[ByTime] - -### ReverseDNS - -Types: - -```python -from cloudflare.types.dns.firewall import ReverseDNSEditResponse, ReverseDNSGetResponse -``` - -Methods: - -- client.dns.firewall.reverse_dns.edit(dns_firewall_id, \*, account_id, \*\*params) -> Optional[ReverseDNSEditResponse] -- client.dns.firewall.reverse_dns.get(dns_firewall_id, \*, account_id) -> Optional[ReverseDNSGetResponse] - ## ZoneTransfers ### ForceAXFR diff --git a/src/cloudflare/_client.py b/src/cloudflare/_client.py index 9cc2a92dfe1..097857a110c 100644 --- a/src/cloudflare/_client.py +++ b/src/cloudflare/_client.py @@ -89,6 +89,7 @@ page_shield, rate_limits, url_scanner, + dns_firewall, healthchecks, security_txt, email_routing, @@ -302,6 +303,12 @@ def custom_nameservers(self) -> custom_nameservers.CustomNameserversResource: return CustomNameserversResource(self) + @cached_property + def dns_firewall(self) -> dns_firewall.DNSFirewallResource: + from .resources.dns_firewall import DNSFirewallResource + + return DNSFirewallResource(self) + @cached_property def dns(self) -> dns.DNSResource: from .resources.dns import DNSResource @@ -1055,6 +1062,12 @@ def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourc return AsyncCustomNameserversResource(self) + @cached_property + def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResource: + from .resources.dns_firewall import AsyncDNSFirewallResource + + return AsyncDNSFirewallResource(self) + @cached_property def dns(self) -> dns.AsyncDNSResource: from .resources.dns import AsyncDNSResource @@ -1741,6 +1754,12 @@ def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWith return CustomNameserversResourceWithRawResponse(self._client.custom_nameservers) + @cached_property + def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithRawResponse: + from .resources.dns_firewall import DNSFirewallResourceWithRawResponse + + return DNSFirewallResourceWithRawResponse(self._client.dns_firewall) + @cached_property def dns(self) -> dns.DNSResourceWithRawResponse: from .resources.dns import DNSResourceWithRawResponse @@ -2248,6 +2267,12 @@ def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourc return AsyncCustomNameserversResourceWithRawResponse(self._client.custom_nameservers) + @cached_property + def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithRawResponse: + from .resources.dns_firewall import AsyncDNSFirewallResourceWithRawResponse + + return AsyncDNSFirewallResourceWithRawResponse(self._client.dns_firewall) + @cached_property def dns(self) -> dns.AsyncDNSResourceWithRawResponse: from .resources.dns import AsyncDNSResourceWithRawResponse @@ -2755,6 +2780,12 @@ def custom_nameservers(self) -> custom_nameservers.CustomNameserversResourceWith return CustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers) + @cached_property + def dns_firewall(self) -> dns_firewall.DNSFirewallResourceWithStreamingResponse: + from .resources.dns_firewall import DNSFirewallResourceWithStreamingResponse + + return DNSFirewallResourceWithStreamingResponse(self._client.dns_firewall) + @cached_property def dns(self) -> dns.DNSResourceWithStreamingResponse: from .resources.dns import DNSResourceWithStreamingResponse @@ -3264,6 +3295,12 @@ def custom_nameservers(self) -> custom_nameservers.AsyncCustomNameserversResourc return AsyncCustomNameserversResourceWithStreamingResponse(self._client.custom_nameservers) + @cached_property + def dns_firewall(self) -> dns_firewall.AsyncDNSFirewallResourceWithStreamingResponse: + from .resources.dns_firewall import AsyncDNSFirewallResourceWithStreamingResponse + + return AsyncDNSFirewallResourceWithStreamingResponse(self._client.dns_firewall) + @cached_property def dns(self) -> dns.AsyncDNSResourceWithStreamingResponse: from .resources.dns import AsyncDNSResourceWithStreamingResponse diff --git a/src/cloudflare/resources/dns/__init__.py b/src/cloudflare/resources/dns/__init__.py index 8c19621a882..58768dba906 100644 --- a/src/cloudflare/resources/dns/__init__.py +++ b/src/cloudflare/resources/dns/__init__.py @@ -24,14 +24,6 @@ RecordsResourceWithStreamingResponse, AsyncRecordsResourceWithStreamingResponse, ) -from .firewall import ( - FirewallResource, - AsyncFirewallResource, - FirewallResourceWithRawResponse, - AsyncFirewallResourceWithRawResponse, - FirewallResourceWithStreamingResponse, - AsyncFirewallResourceWithStreamingResponse, -) from .settings import ( SettingsResource, AsyncSettingsResource, @@ -82,12 +74,6 @@ "AsyncAnalyticsResourceWithRawResponse", "AnalyticsResourceWithStreamingResponse", "AsyncAnalyticsResourceWithStreamingResponse", - "FirewallResource", - "AsyncFirewallResource", - "FirewallResourceWithRawResponse", - "AsyncFirewallResourceWithRawResponse", - "FirewallResourceWithStreamingResponse", - "AsyncFirewallResourceWithStreamingResponse", "ZoneTransfersResource", "AsyncZoneTransfersResource", "ZoneTransfersResourceWithRawResponse", diff --git a/src/cloudflare/resources/dns/analytics/reports/bytimes.py b/src/cloudflare/resources/dns/analytics/reports/bytimes.py index e6adc94b5ff..674c23fbddd 100644 --- a/src/cloudflare/resources/dns/analytics/reports/bytimes.py +++ b/src/cloudflare/resources/dns/analytics/reports/bytimes.py @@ -22,8 +22,8 @@ ) from ....._wrappers import ResultWrapper from ....._base_client import make_request_options -from .....types.dns.firewall import Delta -from .....types.dns.firewall.delta import Delta +from .....types.dns_firewall import Delta +from .....types.dns_firewall.delta import Delta from .....types.dns.analytics.reports import bytime_get_params from .....types.dns.analytics.reports.by_time import ByTime diff --git a/src/cloudflare/resources/dns/dns.py b/src/cloudflare/resources/dns/dns.py index 489b4876f42..ff32eb8c40d 100644 --- a/src/cloudflare/resources/dns/dns.py +++ b/src/cloudflare/resources/dns/dns.py @@ -18,14 +18,6 @@ RecordsResourceWithStreamingResponse, AsyncRecordsResourceWithStreamingResponse, ) -from .firewall import ( - FirewallResource, - AsyncFirewallResource, - FirewallResourceWithRawResponse, - AsyncFirewallResourceWithRawResponse, - FirewallResourceWithStreamingResponse, - AsyncFirewallResourceWithStreamingResponse, -) from .settings import ( SettingsResource, AsyncSettingsResource, @@ -52,7 +44,6 @@ ZoneTransfersResourceWithStreamingResponse, AsyncZoneTransfersResourceWithStreamingResponse, ) -from .firewall.firewall import FirewallResource, AsyncFirewallResource from .settings.settings import SettingsResource, AsyncSettingsResource from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource from .zone_transfers.zone_transfers import ZoneTransfersResource, AsyncZoneTransfersResource @@ -77,10 +68,6 @@ def settings(self) -> SettingsResource: def analytics(self) -> AnalyticsResource: return AnalyticsResource(self._client) - @cached_property - def firewall(self) -> FirewallResource: - return FirewallResource(self._client) - @cached_property def zone_transfers(self) -> ZoneTransfersResource: return ZoneTransfersResource(self._client) @@ -122,10 +109,6 @@ def settings(self) -> AsyncSettingsResource: def analytics(self) -> AsyncAnalyticsResource: return AsyncAnalyticsResource(self._client) - @cached_property - def firewall(self) -> AsyncFirewallResource: - return AsyncFirewallResource(self._client) - @cached_property def zone_transfers(self) -> AsyncZoneTransfersResource: return AsyncZoneTransfersResource(self._client) @@ -170,10 +153,6 @@ def settings(self) -> SettingsResourceWithRawResponse: def analytics(self) -> AnalyticsResourceWithRawResponse: return AnalyticsResourceWithRawResponse(self._dns.analytics) - @cached_property - def firewall(self) -> FirewallResourceWithRawResponse: - return FirewallResourceWithRawResponse(self._dns.firewall) - @cached_property def zone_transfers(self) -> ZoneTransfersResourceWithRawResponse: return ZoneTransfersResourceWithRawResponse(self._dns.zone_transfers) @@ -199,10 +178,6 @@ def settings(self) -> AsyncSettingsResourceWithRawResponse: def analytics(self) -> AsyncAnalyticsResourceWithRawResponse: return AsyncAnalyticsResourceWithRawResponse(self._dns.analytics) - @cached_property - def firewall(self) -> AsyncFirewallResourceWithRawResponse: - return AsyncFirewallResourceWithRawResponse(self._dns.firewall) - @cached_property def zone_transfers(self) -> AsyncZoneTransfersResourceWithRawResponse: return AsyncZoneTransfersResourceWithRawResponse(self._dns.zone_transfers) @@ -228,10 +203,6 @@ def settings(self) -> SettingsResourceWithStreamingResponse: def analytics(self) -> AnalyticsResourceWithStreamingResponse: return AnalyticsResourceWithStreamingResponse(self._dns.analytics) - @cached_property - def firewall(self) -> FirewallResourceWithStreamingResponse: - return FirewallResourceWithStreamingResponse(self._dns.firewall) - @cached_property def zone_transfers(self) -> ZoneTransfersResourceWithStreamingResponse: return ZoneTransfersResourceWithStreamingResponse(self._dns.zone_transfers) @@ -257,10 +228,6 @@ def settings(self) -> AsyncSettingsResourceWithStreamingResponse: def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse: return AsyncAnalyticsResourceWithStreamingResponse(self._dns.analytics) - @cached_property - def firewall(self) -> AsyncFirewallResourceWithStreamingResponse: - return AsyncFirewallResourceWithStreamingResponse(self._dns.firewall) - @cached_property def zone_transfers(self) -> AsyncZoneTransfersResourceWithStreamingResponse: return AsyncZoneTransfersResourceWithStreamingResponse(self._dns.zone_transfers) diff --git a/src/cloudflare/resources/dns/firewall/__init__.py b/src/cloudflare/resources/dns_firewall/__init__.py similarity index 68% rename from src/cloudflare/resources/dns/firewall/__init__.py rename to src/cloudflare/resources/dns_firewall/__init__.py index 1a5e619dd8f..e5a2a706b3a 100644 --- a/src/cloudflare/resources/dns/firewall/__init__.py +++ b/src/cloudflare/resources/dns_firewall/__init__.py @@ -1,13 +1,5 @@ # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. -from .firewall import ( - FirewallResource, - AsyncFirewallResource, - FirewallResourceWithRawResponse, - AsyncFirewallResourceWithRawResponse, - FirewallResourceWithStreamingResponse, - AsyncFirewallResourceWithStreamingResponse, -) from .analytics import ( AnalyticsResource, AsyncAnalyticsResource, @@ -24,6 +16,14 @@ ReverseDNSResourceWithStreamingResponse, AsyncReverseDNSResourceWithStreamingResponse, ) +from .dns_firewall import ( + DNSFirewallResource, + AsyncDNSFirewallResource, + DNSFirewallResourceWithRawResponse, + AsyncDNSFirewallResourceWithRawResponse, + DNSFirewallResourceWithStreamingResponse, + AsyncDNSFirewallResourceWithStreamingResponse, +) __all__ = [ "AnalyticsResource", @@ -38,10 +38,10 @@ "AsyncReverseDNSResourceWithRawResponse", "ReverseDNSResourceWithStreamingResponse", "AsyncReverseDNSResourceWithStreamingResponse", - "FirewallResource", - "AsyncFirewallResource", - "FirewallResourceWithRawResponse", - "AsyncFirewallResourceWithRawResponse", - "FirewallResourceWithStreamingResponse", - "AsyncFirewallResourceWithStreamingResponse", + "DNSFirewallResource", + "AsyncDNSFirewallResource", + "DNSFirewallResourceWithRawResponse", + "AsyncDNSFirewallResourceWithRawResponse", + "DNSFirewallResourceWithStreamingResponse", + "AsyncDNSFirewallResourceWithStreamingResponse", ] diff --git a/src/cloudflare/resources/dns/firewall/analytics/__init__.py b/src/cloudflare/resources/dns_firewall/analytics/__init__.py similarity index 100% rename from src/cloudflare/resources/dns/firewall/analytics/__init__.py rename to src/cloudflare/resources/dns_firewall/analytics/__init__.py diff --git a/src/cloudflare/resources/dns/firewall/analytics/analytics.py b/src/cloudflare/resources/dns_firewall/analytics/analytics.py similarity index 97% rename from src/cloudflare/resources/dns/firewall/analytics/analytics.py rename to src/cloudflare/resources/dns_firewall/analytics/analytics.py index 48391a6fc76..12826983e89 100644 --- a/src/cloudflare/resources/dns/firewall/analytics/analytics.py +++ b/src/cloudflare/resources/dns_firewall/analytics/analytics.py @@ -10,8 +10,8 @@ ReportsResourceWithStreamingResponse, AsyncReportsResourceWithStreamingResponse, ) -from ....._compat import cached_property -from ....._resource import SyncAPIResource, AsyncAPIResource +from ...._compat import cached_property +from ...._resource import SyncAPIResource, AsyncAPIResource from .reports.reports import ReportsResource, AsyncReportsResource __all__ = ["AnalyticsResource", "AsyncAnalyticsResource"] diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/__init__.py b/src/cloudflare/resources/dns_firewall/analytics/reports/__init__.py similarity index 100% rename from src/cloudflare/resources/dns/firewall/analytics/reports/__init__.py rename to src/cloudflare/resources/dns_firewall/analytics/reports/__init__.py diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py b/src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py similarity index 94% rename from src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py rename to src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py index ad5ee4b523d..df3a2894b44 100644 --- a/src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py +++ b/src/cloudflare/resources/dns_firewall/analytics/reports/bytimes.py @@ -7,25 +7,25 @@ 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 ......_base_client import make_request_options -from ......types.dns.firewall import Delta -from ......types.dns.firewall.delta import Delta -from ......types.dns.analytics.reports.by_time import ByTime -from ......types.dns.firewall.analytics.reports import bytime_get_params +from ....._wrappers import ResultWrapper +from ....._base_client import make_request_options +from .....types.dns_firewall import Delta +from .....types.dns_firewall.delta import Delta +from .....types.dns.analytics.reports.by_time import ByTime +from .....types.dns_firewall.analytics.reports import bytime_get_params __all__ = ["BytimesResource", "AsyncBytimesResource"] diff --git a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py b/src/cloudflare/resources/dns_firewall/analytics/reports/reports.py similarity index 96% rename from src/cloudflare/resources/dns/firewall/analytics/reports/reports.py rename to src/cloudflare/resources/dns_firewall/analytics/reports/reports.py index 2247daefff1..8c33b7cfdd2 100644 --- a/src/cloudflare/resources/dns/firewall/analytics/reports/reports.py +++ b/src/cloudflare/resources/dns_firewall/analytics/reports/reports.py @@ -15,23 +15,23 @@ BytimesResourceWithStreamingResponse, AsyncBytimesResourceWithStreamingResponse, ) -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 ......_base_client import make_request_options -from ......types.dns.analytics.report import Report -from ......types.dns.firewall.analytics import report_get_params +from ....._wrappers import ResultWrapper +from ....._base_client import make_request_options +from .....types.dns.analytics.report import Report +from .....types.dns_firewall.analytics import report_get_params __all__ = ["ReportsResource", "AsyncReportsResource"] diff --git a/src/cloudflare/resources/dns/firewall/firewall.py b/src/cloudflare/resources/dns_firewall/dns_firewall.py similarity index 82% rename from src/cloudflare/resources/dns/firewall/firewall.py rename to src/cloudflare/resources/dns_firewall/dns_firewall.py index 47f5a603dda..57cf7e69202 100644 --- a/src/cloudflare/resources/dns/firewall/firewall.py +++ b/src/cloudflare/resources/dns_firewall/dns_firewall.py @@ -6,11 +6,12 @@ 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 .analytics import ( AnalyticsResource, AsyncAnalyticsResource, @@ -19,7 +20,14 @@ AnalyticsResourceWithStreamingResponse, AsyncAnalyticsResourceWithStreamingResponse, ) -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 .reverse_dns import ( ReverseDNSResource, AsyncReverseDNSResource, @@ -28,30 +36,26 @@ ReverseDNSResourceWithStreamingResponse, AsyncReverseDNSResourceWithStreamingResponse, ) -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 ....types.dns import firewall_edit_params, firewall_list_params, firewall_create_params -from ....pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray -from ...._base_client import AsyncPaginator, make_request_options +from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from ..._base_client import AsyncPaginator, make_request_options from .analytics.analytics import AnalyticsResource, AsyncAnalyticsResource -from ....types.dns.upstream_ips import UpstreamIPs -from ....types.dns.firewall_get_response import FirewallGetResponse -from ....types.dns.firewall_edit_response import FirewallEditResponse -from ....types.dns.firewall_list_response import FirewallListResponse -from ....types.dns.attack_mitigation_param import AttackMitigationParam -from ....types.dns.firewall_create_response import FirewallCreateResponse -from ....types.dns.firewall_delete_response import FirewallDeleteResponse +from ...types.dns_firewall import ( + dns_firewall_edit_params, + dns_firewall_list_params, + dns_firewall_create_params, +) +from ...types.dns_firewall.upstream_ips import UpstreamIPs +from ...types.dns_firewall.attack_mitigation_param import AttackMitigationParam +from ...types.dns_firewall.dns_firewall_get_response import DNSFirewallGetResponse +from ...types.dns_firewall.dns_firewall_edit_response import DNSFirewallEditResponse +from ...types.dns_firewall.dns_firewall_list_response import DNSFirewallListResponse +from ...types.dns_firewall.dns_firewall_create_response import DNSFirewallCreateResponse +from ...types.dns_firewall.dns_firewall_delete_response import DNSFirewallDeleteResponse -__all__ = ["FirewallResource", "AsyncFirewallResource"] +__all__ = ["DNSFirewallResource", "AsyncDNSFirewallResource"] -class FirewallResource(SyncAPIResource): +class DNSFirewallResource(SyncAPIResource): @cached_property def analytics(self) -> AnalyticsResource: return AnalyticsResource(self._client) @@ -61,23 +65,23 @@ def reverse_dns(self) -> ReverseDNSResource: return ReverseDNSResource(self._client) @cached_property - def with_raw_response(self) -> FirewallResourceWithRawResponse: + def with_raw_response(self) -> DNSFirewallResourceWithRawResponse: """ This property can be used as a prefix for any HTTP method call to return the the raw response object instead of the parsed content. For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers """ - return FirewallResourceWithRawResponse(self) + return DNSFirewallResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> FirewallResourceWithStreamingResponse: + def with_streaming_response(self) -> DNSFirewallResourceWithStreamingResponse: """ An alternative to `.with_raw_response` that doesn't eagerly read the response body. For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response """ - return FirewallResourceWithStreamingResponse(self) + return DNSFirewallResourceWithStreamingResponse(self) def create( self, @@ -99,7 +103,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallCreateResponse]: + ) -> Optional[DNSFirewallCreateResponse]: """ Create a DNS Firewall cluster @@ -156,16 +160,16 @@ def create( "ratelimit": ratelimit, "retries": retries, }, - firewall_create_params.FirewallCreateParams, + dns_firewall_create_params.DNSFirewallCreateParams, ), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallCreateResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallCreateResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallCreateResponse]], ResultWrapper[FirewallCreateResponse]), + cast_to=cast(Type[Optional[DNSFirewallCreateResponse]], ResultWrapper[DNSFirewallCreateResponse]), ) def list( @@ -180,7 +184,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncV4PagePaginationArray[FirewallListResponse]: + ) -> SyncV4PagePaginationArray[DNSFirewallListResponse]: """ List DNS Firewall clusters for an account @@ -203,7 +207,7 @@ 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}/dns_firewall", - page=SyncV4PagePaginationArray[FirewallListResponse], + page=SyncV4PagePaginationArray[DNSFirewallListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -214,10 +218,10 @@ def list( "page": page, "per_page": per_page, }, - firewall_list_params.FirewallListParams, + dns_firewall_list_params.DNSFirewallListParams, ), ), - model=FirewallListResponse, + model=DNSFirewallListResponse, ) def delete( @@ -231,7 +235,7 @@ def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallDeleteResponse]: + ) -> Optional[DNSFirewallDeleteResponse]: """ Delete a DNS Firewall cluster @@ -259,9 +263,9 @@ def delete( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallDeleteResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallDeleteResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallDeleteResponse]], ResultWrapper[FirewallDeleteResponse]), + cast_to=cast(Type[Optional[DNSFirewallDeleteResponse]], ResultWrapper[DNSFirewallDeleteResponse]), ) def edit( @@ -285,7 +289,7 @@ def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallEditResponse]: + ) -> Optional[DNSFirewallEditResponse]: """ Modify the configuration of a DNS Firewall cluster @@ -346,16 +350,16 @@ def edit( "retries": retries, "upstream_ips": upstream_ips, }, - firewall_edit_params.FirewallEditParams, + dns_firewall_edit_params.DNSFirewallEditParams, ), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallEditResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallEditResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallEditResponse]], ResultWrapper[FirewallEditResponse]), + cast_to=cast(Type[Optional[DNSFirewallEditResponse]], ResultWrapper[DNSFirewallEditResponse]), ) def get( @@ -369,7 +373,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallGetResponse]: + ) -> Optional[DNSFirewallGetResponse]: """ Show a single DNS Firewall cluster for an account @@ -397,13 +401,13 @@ def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallGetResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallGetResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallGetResponse]], ResultWrapper[FirewallGetResponse]), + cast_to=cast(Type[Optional[DNSFirewallGetResponse]], ResultWrapper[DNSFirewallGetResponse]), ) -class AsyncFirewallResource(AsyncAPIResource): +class AsyncDNSFirewallResource(AsyncAPIResource): @cached_property def analytics(self) -> AsyncAnalyticsResource: return AsyncAnalyticsResource(self._client) @@ -413,23 +417,23 @@ def reverse_dns(self) -> AsyncReverseDNSResource: return AsyncReverseDNSResource(self._client) @cached_property - def with_raw_response(self) -> AsyncFirewallResourceWithRawResponse: + def with_raw_response(self) -> AsyncDNSFirewallResourceWithRawResponse: """ This property can be used as a prefix for any HTTP method call to return the the raw response object instead of the parsed content. For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers """ - return AsyncFirewallResourceWithRawResponse(self) + return AsyncDNSFirewallResourceWithRawResponse(self) @cached_property - def with_streaming_response(self) -> AsyncFirewallResourceWithStreamingResponse: + def with_streaming_response(self) -> AsyncDNSFirewallResourceWithStreamingResponse: """ An alternative to `.with_raw_response` that doesn't eagerly read the response body. For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response """ - return AsyncFirewallResourceWithStreamingResponse(self) + return AsyncDNSFirewallResourceWithStreamingResponse(self) async def create( self, @@ -451,7 +455,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallCreateResponse]: + ) -> Optional[DNSFirewallCreateResponse]: """ Create a DNS Firewall cluster @@ -508,16 +512,16 @@ async def create( "ratelimit": ratelimit, "retries": retries, }, - firewall_create_params.FirewallCreateParams, + dns_firewall_create_params.DNSFirewallCreateParams, ), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallCreateResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallCreateResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallCreateResponse]], ResultWrapper[FirewallCreateResponse]), + cast_to=cast(Type[Optional[DNSFirewallCreateResponse]], ResultWrapper[DNSFirewallCreateResponse]), ) def list( @@ -532,7 +536,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[FirewallListResponse, AsyncV4PagePaginationArray[FirewallListResponse]]: + ) -> AsyncPaginator[DNSFirewallListResponse, AsyncV4PagePaginationArray[DNSFirewallListResponse]]: """ List DNS Firewall clusters for an account @@ -555,7 +559,7 @@ 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}/dns_firewall", - page=AsyncV4PagePaginationArray[FirewallListResponse], + page=AsyncV4PagePaginationArray[DNSFirewallListResponse], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, @@ -566,10 +570,10 @@ def list( "page": page, "per_page": per_page, }, - firewall_list_params.FirewallListParams, + dns_firewall_list_params.DNSFirewallListParams, ), ), - model=FirewallListResponse, + model=DNSFirewallListResponse, ) async def delete( @@ -583,7 +587,7 @@ async def delete( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallDeleteResponse]: + ) -> Optional[DNSFirewallDeleteResponse]: """ Delete a DNS Firewall cluster @@ -611,9 +615,9 @@ async def delete( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallDeleteResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallDeleteResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallDeleteResponse]], ResultWrapper[FirewallDeleteResponse]), + cast_to=cast(Type[Optional[DNSFirewallDeleteResponse]], ResultWrapper[DNSFirewallDeleteResponse]), ) async def edit( @@ -637,7 +641,7 @@ async def edit( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallEditResponse]: + ) -> Optional[DNSFirewallEditResponse]: """ Modify the configuration of a DNS Firewall cluster @@ -698,16 +702,16 @@ async def edit( "retries": retries, "upstream_ips": upstream_ips, }, - firewall_edit_params.FirewallEditParams, + dns_firewall_edit_params.DNSFirewallEditParams, ), options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallEditResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallEditResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallEditResponse]], ResultWrapper[FirewallEditResponse]), + cast_to=cast(Type[Optional[DNSFirewallEditResponse]], ResultWrapper[DNSFirewallEditResponse]), ) async def get( @@ -721,7 +725,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[FirewallGetResponse]: + ) -> Optional[DNSFirewallGetResponse]: """ Show a single DNS Firewall cluster for an account @@ -749,123 +753,123 @@ async def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[FirewallGetResponse]]._unwrapper, + post_parser=ResultWrapper[Optional[DNSFirewallGetResponse]]._unwrapper, ), - cast_to=cast(Type[Optional[FirewallGetResponse]], ResultWrapper[FirewallGetResponse]), + cast_to=cast(Type[Optional[DNSFirewallGetResponse]], ResultWrapper[DNSFirewallGetResponse]), ) -class FirewallResourceWithRawResponse: - def __init__(self, firewall: FirewallResource) -> None: - self._firewall = firewall +class DNSFirewallResourceWithRawResponse: + def __init__(self, dns_firewall: DNSFirewallResource) -> None: + self._dns_firewall = dns_firewall self.create = to_raw_response_wrapper( - firewall.create, + dns_firewall.create, ) self.list = to_raw_response_wrapper( - firewall.list, + dns_firewall.list, ) self.delete = to_raw_response_wrapper( - firewall.delete, + dns_firewall.delete, ) self.edit = to_raw_response_wrapper( - firewall.edit, + dns_firewall.edit, ) self.get = to_raw_response_wrapper( - firewall.get, + dns_firewall.get, ) @cached_property def analytics(self) -> AnalyticsResourceWithRawResponse: - return AnalyticsResourceWithRawResponse(self._firewall.analytics) + return AnalyticsResourceWithRawResponse(self._dns_firewall.analytics) @cached_property def reverse_dns(self) -> ReverseDNSResourceWithRawResponse: - return ReverseDNSResourceWithRawResponse(self._firewall.reverse_dns) + return ReverseDNSResourceWithRawResponse(self._dns_firewall.reverse_dns) -class AsyncFirewallResourceWithRawResponse: - def __init__(self, firewall: AsyncFirewallResource) -> None: - self._firewall = firewall +class AsyncDNSFirewallResourceWithRawResponse: + def __init__(self, dns_firewall: AsyncDNSFirewallResource) -> None: + self._dns_firewall = dns_firewall self.create = async_to_raw_response_wrapper( - firewall.create, + dns_firewall.create, ) self.list = async_to_raw_response_wrapper( - firewall.list, + dns_firewall.list, ) self.delete = async_to_raw_response_wrapper( - firewall.delete, + dns_firewall.delete, ) self.edit = async_to_raw_response_wrapper( - firewall.edit, + dns_firewall.edit, ) self.get = async_to_raw_response_wrapper( - firewall.get, + dns_firewall.get, ) @cached_property def analytics(self) -> AsyncAnalyticsResourceWithRawResponse: - return AsyncAnalyticsResourceWithRawResponse(self._firewall.analytics) + return AsyncAnalyticsResourceWithRawResponse(self._dns_firewall.analytics) @cached_property def reverse_dns(self) -> AsyncReverseDNSResourceWithRawResponse: - return AsyncReverseDNSResourceWithRawResponse(self._firewall.reverse_dns) + return AsyncReverseDNSResourceWithRawResponse(self._dns_firewall.reverse_dns) -class FirewallResourceWithStreamingResponse: - def __init__(self, firewall: FirewallResource) -> None: - self._firewall = firewall +class DNSFirewallResourceWithStreamingResponse: + def __init__(self, dns_firewall: DNSFirewallResource) -> None: + self._dns_firewall = dns_firewall self.create = to_streamed_response_wrapper( - firewall.create, + dns_firewall.create, ) self.list = to_streamed_response_wrapper( - firewall.list, + dns_firewall.list, ) self.delete = to_streamed_response_wrapper( - firewall.delete, + dns_firewall.delete, ) self.edit = to_streamed_response_wrapper( - firewall.edit, + dns_firewall.edit, ) self.get = to_streamed_response_wrapper( - firewall.get, + dns_firewall.get, ) @cached_property def analytics(self) -> AnalyticsResourceWithStreamingResponse: - return AnalyticsResourceWithStreamingResponse(self._firewall.analytics) + return AnalyticsResourceWithStreamingResponse(self._dns_firewall.analytics) @cached_property def reverse_dns(self) -> ReverseDNSResourceWithStreamingResponse: - return ReverseDNSResourceWithStreamingResponse(self._firewall.reverse_dns) + return ReverseDNSResourceWithStreamingResponse(self._dns_firewall.reverse_dns) -class AsyncFirewallResourceWithStreamingResponse: - def __init__(self, firewall: AsyncFirewallResource) -> None: - self._firewall = firewall +class AsyncDNSFirewallResourceWithStreamingResponse: + def __init__(self, dns_firewall: AsyncDNSFirewallResource) -> None: + self._dns_firewall = dns_firewall self.create = async_to_streamed_response_wrapper( - firewall.create, + dns_firewall.create, ) self.list = async_to_streamed_response_wrapper( - firewall.list, + dns_firewall.list, ) self.delete = async_to_streamed_response_wrapper( - firewall.delete, + dns_firewall.delete, ) self.edit = async_to_streamed_response_wrapper( - firewall.edit, + dns_firewall.edit, ) self.get = async_to_streamed_response_wrapper( - firewall.get, + dns_firewall.get, ) @cached_property def analytics(self) -> AsyncAnalyticsResourceWithStreamingResponse: - return AsyncAnalyticsResourceWithStreamingResponse(self._firewall.analytics) + return AsyncAnalyticsResourceWithStreamingResponse(self._dns_firewall.analytics) @cached_property def reverse_dns(self) -> AsyncReverseDNSResourceWithStreamingResponse: - return AsyncReverseDNSResourceWithStreamingResponse(self._firewall.reverse_dns) + return AsyncReverseDNSResourceWithStreamingResponse(self._dns_firewall.reverse_dns) diff --git a/src/cloudflare/resources/dns/firewall/reverse_dns.py b/src/cloudflare/resources/dns_firewall/reverse_dns.py similarity index 95% rename from src/cloudflare/resources/dns/firewall/reverse_dns.py rename to src/cloudflare/resources/dns_firewall/reverse_dns.py index 8038c0d9c87..a14aedff4c2 100644 --- a/src/cloudflare/resources/dns/firewall/reverse_dns.py +++ b/src/cloudflare/resources/dns_firewall/reverse_dns.py @@ -6,24 +6,24 @@ 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 ...._base_client import make_request_options -from ....types.dns.firewall import reverse_dns_edit_params -from ....types.dns.firewall.reverse_dns_get_response import ReverseDNSGetResponse -from ....types.dns.firewall.reverse_dns_edit_response import ReverseDNSEditResponse +from ..._wrappers import ResultWrapper +from ..._base_client import make_request_options +from ...types.dns_firewall import reverse_dns_edit_params +from ...types.dns_firewall.reverse_dns_get_response import ReverseDNSGetResponse +from ...types.dns_firewall.reverse_dns_edit_response import ReverseDNSEditResponse __all__ = ["ReverseDNSResource", "AsyncReverseDNSResource"] diff --git a/src/cloudflare/types/dns/__init__.py b/src/cloudflare/types/dns/__init__.py index c0dd363c808..79736543eaf 100644 --- a/src/cloudflare/types/dns/__init__.py +++ b/src/cloudflare/types/dns/__init__.py @@ -19,12 +19,10 @@ from .svcb_record import SVCBRecord as SVCBRecord from .tlsa_record import TLSARecord as TLSARecord from .cname_record import CNAMERecord as CNAMERecord -from .firewall_ips import FirewallIPs as FirewallIPs from .https_record import HTTPSRecord as HTTPSRecord from .naptr_record import NAPTRRecord as NAPTRRecord from .record_param import RecordParam as RecordParam from .sshfp_record import SSHFPRecord as SSHFPRecord -from .upstream_ips import UpstreamIPs as UpstreamIPs from .dnskey_record import DNSKEYRecord as DNSKEYRecord from .smimea_record import SMIMEARecord as SMIMEARecord from .a_record_param import ARecordParam as ARecordParam @@ -38,7 +36,6 @@ from .txt_record_param import TXTRecordParam as TXTRecordParam from .uri_record_param import URIRecordParam as URIRecordParam from .aaaa_record_param import AAAARecordParam as AAAARecordParam -from .attack_mitigation import AttackMitigation as AttackMitigation from .cert_record_param import CERTRecordParam as CERTRecordParam from .svcb_record_param import SVCBRecordParam as SVCBRecordParam from .tlsa_record_param import TLSARecordParam as TLSARecordParam @@ -56,8 +53,6 @@ from .record_get_response import RecordGetResponse as RecordGetResponse from .setting_edit_params import SettingEditParams as SettingEditParams from .smimea_record_param import SMIMEARecordParam as SMIMEARecordParam -from .firewall_edit_params import FirewallEditParams as FirewallEditParams -from .firewall_list_params import FirewallListParams as FirewallListParams from .record_create_params import RecordCreateParams as RecordCreateParams from .record_edit_response import RecordEditResponse as RecordEditResponse from .record_import_params import RecordImportParams as RecordImportParams @@ -65,20 +60,13 @@ from .record_scan_response import RecordScanResponse as RecordScanResponse from .record_update_params import RecordUpdateParams as RecordUpdateParams from .setting_get_response import SettingGetResponse as SettingGetResponse -from .firewall_get_response import FirewallGetResponse as FirewallGetResponse from .record_batch_response import RecordBatchResponse as RecordBatchResponse from .record_process_timing import RecordProcessTiming as RecordProcessTiming from .setting_edit_response import SettingEditResponse as SettingEditResponse from .dnssec_delete_response import DNSSECDeleteResponse as DNSSECDeleteResponse -from .firewall_create_params import FirewallCreateParams as FirewallCreateParams -from .firewall_edit_response import FirewallEditResponse as FirewallEditResponse -from .firewall_list_response import FirewallListResponse as FirewallListResponse from .record_create_response import RecordCreateResponse as RecordCreateResponse from .record_delete_response import RecordDeleteResponse as RecordDeleteResponse from .record_export_response import RecordExportResponse as RecordExportResponse from .record_import_response import RecordImportResponse as RecordImportResponse from .record_update_response import RecordUpdateResponse as RecordUpdateResponse -from .attack_mitigation_param import AttackMitigationParam as AttackMitigationParam -from .firewall_create_response import FirewallCreateResponse as FirewallCreateResponse -from .firewall_delete_response import FirewallDeleteResponse as FirewallDeleteResponse from .dns_analytics_nominal_metric import DNSAnalyticsNominalMetric as DNSAnalyticsNominalMetric diff --git a/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py b/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py index ece9fe71b05..2109754dad4 100644 --- a/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py +++ b/src/cloudflare/types/dns/analytics/reports/bytime_get_params.py @@ -7,7 +7,7 @@ from typing_extensions import Required, Annotated, TypedDict from ....._utils import PropertyInfo -from ...firewall.delta import Delta +from ....dns_firewall.delta import Delta __all__ = ["BytimeGetParams"] diff --git a/src/cloudflare/types/dns/dns_analytics_query.py b/src/cloudflare/types/dns/dns_analytics_query.py index a34fcd322bb..6d1bebc2309 100644 --- a/src/cloudflare/types/dns/dns_analytics_query.py +++ b/src/cloudflare/types/dns/dns_analytics_query.py @@ -4,7 +4,7 @@ from datetime import datetime from ..._models import BaseModel -from .firewall.delta import Delta +from ..dns_firewall.delta import Delta __all__ = ["DNSAnalyticsQuery"] diff --git a/src/cloudflare/types/dns/firewall/__init__.py b/src/cloudflare/types/dns/firewall/__init__.py deleted file mode 100644 index b8a9d42fe75..00000000000 --- a/src/cloudflare/types/dns/firewall/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from __future__ import annotations - -from .delta import Delta as Delta -from .reverse_dns_edit_params import ReverseDNSEditParams as ReverseDNSEditParams -from .reverse_dns_get_response import ReverseDNSGetResponse as ReverseDNSGetResponse -from .reverse_dns_edit_response import ReverseDNSEditResponse as ReverseDNSEditResponse diff --git a/src/cloudflare/types/dns_firewall/__init__.py b/src/cloudflare/types/dns_firewall/__init__.py new file mode 100644 index 00000000000..bb3626eed1b --- /dev/null +++ b/src/cloudflare/types/dns_firewall/__init__.py @@ -0,0 +1,20 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from __future__ import annotations + +from .delta import Delta as Delta +from .firewall_ips import FirewallIPs as FirewallIPs +from .upstream_ips import UpstreamIPs as UpstreamIPs +from .attack_mitigation import AttackMitigation as AttackMitigation +from .attack_mitigation_param import AttackMitigationParam as AttackMitigationParam +from .reverse_dns_edit_params import ReverseDNSEditParams as ReverseDNSEditParams +from .dns_firewall_edit_params import DNSFirewallEditParams as DNSFirewallEditParams +from .dns_firewall_list_params import DNSFirewallListParams as DNSFirewallListParams +from .reverse_dns_get_response import ReverseDNSGetResponse as ReverseDNSGetResponse +from .dns_firewall_get_response import DNSFirewallGetResponse as DNSFirewallGetResponse +from .reverse_dns_edit_response import ReverseDNSEditResponse as ReverseDNSEditResponse +from .dns_firewall_create_params import DNSFirewallCreateParams as DNSFirewallCreateParams +from .dns_firewall_edit_response import DNSFirewallEditResponse as DNSFirewallEditResponse +from .dns_firewall_list_response import DNSFirewallListResponse as DNSFirewallListResponse +from .dns_firewall_create_response import DNSFirewallCreateResponse as DNSFirewallCreateResponse +from .dns_firewall_delete_response import DNSFirewallDeleteResponse as DNSFirewallDeleteResponse diff --git a/src/cloudflare/types/dns/firewall/analytics/__init__.py b/src/cloudflare/types/dns_firewall/analytics/__init__.py similarity index 100% rename from src/cloudflare/types/dns/firewall/analytics/__init__.py rename to src/cloudflare/types/dns_firewall/analytics/__init__.py diff --git a/src/cloudflare/types/dns/firewall/analytics/report_get_params.py b/src/cloudflare/types/dns_firewall/analytics/report_get_params.py similarity index 96% rename from src/cloudflare/types/dns/firewall/analytics/report_get_params.py rename to src/cloudflare/types/dns_firewall/analytics/report_get_params.py index 5697245f32d..dae21a5ed5a 100644 --- a/src/cloudflare/types/dns/firewall/analytics/report_get_params.py +++ b/src/cloudflare/types/dns_firewall/analytics/report_get_params.py @@ -6,7 +6,7 @@ from datetime import datetime from typing_extensions import Required, Annotated, TypedDict -from ....._utils import PropertyInfo +from ...._utils import PropertyInfo __all__ = ["ReportGetParams"] diff --git a/src/cloudflare/types/dns/firewall/analytics/reports/__init__.py b/src/cloudflare/types/dns_firewall/analytics/reports/__init__.py similarity index 100% rename from src/cloudflare/types/dns/firewall/analytics/reports/__init__.py rename to src/cloudflare/types/dns_firewall/analytics/reports/__init__.py diff --git a/src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py b/src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py similarity index 97% rename from src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py rename to src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py index 34773f8974a..873cfc27cdb 100644 --- a/src/cloudflare/types/dns/firewall/analytics/reports/bytime_get_params.py +++ b/src/cloudflare/types/dns_firewall/analytics/reports/bytime_get_params.py @@ -7,7 +7,7 @@ from typing_extensions import Required, Annotated, TypedDict from ...delta import Delta -from ......_utils import PropertyInfo +from ....._utils import PropertyInfo __all__ = ["BytimeGetParams"] diff --git a/src/cloudflare/types/dns/attack_mitigation.py b/src/cloudflare/types/dns_firewall/attack_mitigation.py similarity index 100% rename from src/cloudflare/types/dns/attack_mitigation.py rename to src/cloudflare/types/dns_firewall/attack_mitigation.py diff --git a/src/cloudflare/types/dns/attack_mitigation_param.py b/src/cloudflare/types/dns_firewall/attack_mitigation_param.py similarity index 100% rename from src/cloudflare/types/dns/attack_mitigation_param.py rename to src/cloudflare/types/dns_firewall/attack_mitigation_param.py diff --git a/src/cloudflare/types/dns/firewall/delta.py b/src/cloudflare/types/dns_firewall/delta.py similarity index 100% rename from src/cloudflare/types/dns/firewall/delta.py rename to src/cloudflare/types/dns_firewall/delta.py diff --git a/src/cloudflare/types/dns/firewall_create_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_create_params.py similarity index 95% rename from src/cloudflare/types/dns/firewall_create_params.py rename to src/cloudflare/types/dns_firewall/dns_firewall_create_params.py index 71f3c7ed44b..8a8c22bfc46 100644 --- a/src/cloudflare/types/dns/firewall_create_params.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_create_params.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation_param import AttackMitigationParam -__all__ = ["FirewallCreateParams"] +__all__ = ["DNSFirewallCreateParams"] -class FirewallCreateParams(TypedDict, total=False): +class DNSFirewallCreateParams(TypedDict, total=False): account_id: Required[str] """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_get_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_create_response.py similarity index 95% rename from src/cloudflare/types/dns/firewall_get_response.py rename to src/cloudflare/types/dns_firewall/dns_firewall_create_response.py index 51f176eb01d..9927a6daea5 100644 --- a/src/cloudflare/types/dns/firewall_get_response.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_create_response.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation import AttackMitigation -__all__ = ["FirewallGetResponse"] +__all__ = ["DNSFirewallCreateResponse"] -class FirewallGetResponse(BaseModel): +class DNSFirewallCreateResponse(BaseModel): id: str """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_delete_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py similarity index 70% rename from src/cloudflare/types/dns/firewall_delete_response.py rename to src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py index e885b33427c..3b73764adeb 100644 --- a/src/cloudflare/types/dns/firewall_delete_response.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_delete_response.py @@ -4,9 +4,9 @@ from ..._models import BaseModel -__all__ = ["FirewallDeleteResponse"] +__all__ = ["DNSFirewallDeleteResponse"] -class FirewallDeleteResponse(BaseModel): +class DNSFirewallDeleteResponse(BaseModel): id: Optional[str] = None """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_edit_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py similarity index 95% rename from src/cloudflare/types/dns/firewall_edit_params.py rename to src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py index 3df1cfe2722..92082388eb9 100644 --- a/src/cloudflare/types/dns/firewall_edit_params.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_edit_params.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation_param import AttackMitigationParam -__all__ = ["FirewallEditParams"] +__all__ = ["DNSFirewallEditParams"] -class FirewallEditParams(TypedDict, total=False): +class DNSFirewallEditParams(TypedDict, total=False): account_id: Required[str] """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_create_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py similarity index 96% rename from src/cloudflare/types/dns/firewall_create_response.py rename to src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py index 5130c38bc0b..fa48db399c6 100644 --- a/src/cloudflare/types/dns/firewall_create_response.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_edit_response.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation import AttackMitigation -__all__ = ["FirewallCreateResponse"] +__all__ = ["DNSFirewallEditResponse"] -class FirewallCreateResponse(BaseModel): +class DNSFirewallEditResponse(BaseModel): id: str """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_edit_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_get_response.py similarity index 96% rename from src/cloudflare/types/dns/firewall_edit_response.py rename to src/cloudflare/types/dns_firewall/dns_firewall_get_response.py index 74d5891522c..0d59b1f4742 100644 --- a/src/cloudflare/types/dns/firewall_edit_response.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_get_response.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation import AttackMitigation -__all__ = ["FirewallEditResponse"] +__all__ = ["DNSFirewallGetResponse"] -class FirewallEditResponse(BaseModel): +class DNSFirewallGetResponse(BaseModel): id: str """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_list_params.py b/src/cloudflare/types/dns_firewall/dns_firewall_list_params.py similarity index 79% rename from src/cloudflare/types/dns/firewall_list_params.py rename to src/cloudflare/types/dns_firewall/dns_firewall_list_params.py index 76a5067ac3e..400d11ad29f 100644 --- a/src/cloudflare/types/dns/firewall_list_params.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_list_params.py @@ -4,10 +4,10 @@ from typing_extensions import Required, TypedDict -__all__ = ["FirewallListParams"] +__all__ = ["DNSFirewallListParams"] -class FirewallListParams(TypedDict, total=False): +class DNSFirewallListParams(TypedDict, total=False): account_id: Required[str] """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_list_response.py b/src/cloudflare/types/dns_firewall/dns_firewall_list_response.py similarity index 96% rename from src/cloudflare/types/dns/firewall_list_response.py rename to src/cloudflare/types/dns_firewall/dns_firewall_list_response.py index 81f69bf7894..8c20e942eed 100644 --- a/src/cloudflare/types/dns/firewall_list_response.py +++ b/src/cloudflare/types/dns_firewall/dns_firewall_list_response.py @@ -8,10 +8,10 @@ from .upstream_ips import UpstreamIPs from .attack_mitigation import AttackMitigation -__all__ = ["FirewallListResponse"] +__all__ = ["DNSFirewallListResponse"] -class FirewallListResponse(BaseModel): +class DNSFirewallListResponse(BaseModel): id: str """Identifier""" diff --git a/src/cloudflare/types/dns/firewall_ips.py b/src/cloudflare/types/dns_firewall/firewall_ips.py similarity index 100% rename from src/cloudflare/types/dns/firewall_ips.py rename to src/cloudflare/types/dns_firewall/firewall_ips.py diff --git a/src/cloudflare/types/dns/firewall/reverse_dns_edit_params.py b/src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py similarity index 100% rename from src/cloudflare/types/dns/firewall/reverse_dns_edit_params.py rename to src/cloudflare/types/dns_firewall/reverse_dns_edit_params.py diff --git a/src/cloudflare/types/dns/firewall/reverse_dns_edit_response.py b/src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py similarity index 89% rename from src/cloudflare/types/dns/firewall/reverse_dns_edit_response.py rename to src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py index 4368ad5034d..2d62ac9f0dd 100644 --- a/src/cloudflare/types/dns/firewall/reverse_dns_edit_response.py +++ b/src/cloudflare/types/dns_firewall/reverse_dns_edit_response.py @@ -2,7 +2,7 @@ from typing import Dict -from ...._models import BaseModel +from ..._models import BaseModel __all__ = ["ReverseDNSEditResponse"] diff --git a/src/cloudflare/types/dns/firewall/reverse_dns_get_response.py b/src/cloudflare/types/dns_firewall/reverse_dns_get_response.py similarity index 89% rename from src/cloudflare/types/dns/firewall/reverse_dns_get_response.py rename to src/cloudflare/types/dns_firewall/reverse_dns_get_response.py index e0cc1ae5627..21478156b97 100644 --- a/src/cloudflare/types/dns/firewall/reverse_dns_get_response.py +++ b/src/cloudflare/types/dns_firewall/reverse_dns_get_response.py @@ -2,7 +2,7 @@ from typing import Dict -from ...._models import BaseModel +from ..._models import BaseModel __all__ = ["ReverseDNSGetResponse"] diff --git a/src/cloudflare/types/dns/upstream_ips.py b/src/cloudflare/types/dns_firewall/upstream_ips.py similarity index 100% rename from src/cloudflare/types/dns/upstream_ips.py rename to src/cloudflare/types/dns_firewall/upstream_ips.py diff --git a/tests/api_resources/dns/firewall/__init__.py b/tests/api_resources/dns_firewall/__init__.py similarity index 100% rename from tests/api_resources/dns/firewall/__init__.py rename to tests/api_resources/dns_firewall/__init__.py diff --git a/tests/api_resources/dns/firewall/analytics/__init__.py b/tests/api_resources/dns_firewall/analytics/__init__.py similarity index 100% rename from tests/api_resources/dns/firewall/analytics/__init__.py rename to tests/api_resources/dns_firewall/analytics/__init__.py diff --git a/tests/api_resources/dns/firewall/analytics/reports/__init__.py b/tests/api_resources/dns_firewall/analytics/reports/__init__.py similarity index 100% rename from tests/api_resources/dns/firewall/analytics/reports/__init__.py rename to tests/api_resources/dns_firewall/analytics/reports/__init__.py diff --git a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py b/tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py similarity index 88% rename from tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py rename to tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py index 8adc297b858..0a5af576874 100644 --- a/tests/api_resources/dns/firewall/analytics/reports/test_bytimes.py +++ b/tests/api_resources/dns_firewall/analytics/reports/test_bytimes.py @@ -20,7 +20,7 @@ class TestBytimes: @parametrize def test_method_get(self, client: Cloudflare) -> None: - bytime = client.dns.firewall.analytics.reports.bytimes.get( + bytime = client.dns_firewall.analytics.reports.bytimes.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None: @parametrize def test_method_get_with_all_params(self, client: Cloudflare) -> None: - bytime = client.dns.firewall.analytics.reports.bytimes.get( + bytime = client.dns_firewall.analytics.reports.bytimes.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", dimensions="queryType", @@ -44,7 +44,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None: @parametrize def test_raw_response_get(self, client: Cloudflare) -> None: - response = client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + response = client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -56,7 +56,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: @parametrize def test_streaming_response_get(self, client: Cloudflare) -> None: - with client.dns.firewall.analytics.reports.bytimes.with_streaming_response.get( + with client.dns_firewall.analytics.reports.bytimes.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -71,13 +71,13 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: @parametrize def test_path_params_get(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -88,7 +88,7 @@ class TestAsyncBytimes: @parametrize async def test_method_get(self, async_client: AsyncCloudflare) -> None: - bytime = await async_client.dns.firewall.analytics.reports.bytimes.get( + bytime = await async_client.dns_firewall.analytics.reports.bytimes.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -96,7 +96,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None: - bytime = await async_client.dns.firewall.analytics.reports.bytimes.get( + bytime = await async_client.dns_firewall.analytics.reports.bytimes.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", dimensions="queryType", @@ -112,7 +112,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) - @parametrize async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + response = await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -124,7 +124,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.analytics.reports.bytimes.with_streaming_response.get( + async with async_client.dns_firewall.analytics.reports.bytimes.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -139,13 +139,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No @parametrize async def test_path_params_get(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.analytics.reports.bytimes.with_raw_response.get( + await async_client.dns_firewall.analytics.reports.bytimes.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) diff --git a/tests/api_resources/dns/firewall/analytics/test_reports.py b/tests/api_resources/dns_firewall/analytics/test_reports.py similarity index 88% rename from tests/api_resources/dns/firewall/analytics/test_reports.py rename to tests/api_resources/dns_firewall/analytics/test_reports.py index ebdb5cad0c1..cc06eb81017 100644 --- a/tests/api_resources/dns/firewall/analytics/test_reports.py +++ b/tests/api_resources/dns_firewall/analytics/test_reports.py @@ -20,7 +20,7 @@ class TestReports: @parametrize def test_method_get(self, client: Cloudflare) -> None: - report = client.dns.firewall.analytics.reports.get( + report = client.dns_firewall.analytics.reports.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -28,7 +28,7 @@ def test_method_get(self, client: Cloudflare) -> None: @parametrize def test_method_get_with_all_params(self, client: Cloudflare) -> None: - report = client.dns.firewall.analytics.reports.get( + report = client.dns_firewall.analytics.reports.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", dimensions="queryType", @@ -43,7 +43,7 @@ def test_method_get_with_all_params(self, client: Cloudflare) -> None: @parametrize def test_raw_response_get(self, client: Cloudflare) -> None: - response = client.dns.firewall.analytics.reports.with_raw_response.get( + response = client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -55,7 +55,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: @parametrize def test_streaming_response_get(self, client: Cloudflare) -> None: - with client.dns.firewall.analytics.reports.with_streaming_response.get( + with client.dns_firewall.analytics.reports.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -70,13 +70,13 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: @parametrize def test_path_params_get(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.analytics.reports.with_raw_response.get( + client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.analytics.reports.with_raw_response.get( + client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -87,7 +87,7 @@ class TestAsyncReports: @parametrize async def test_method_get(self, async_client: AsyncCloudflare) -> None: - report = await async_client.dns.firewall.analytics.reports.get( + report = await async_client.dns_firewall.analytics.reports.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -95,7 +95,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) -> None: - report = await async_client.dns.firewall.analytics.reports.get( + report = await async_client.dns_firewall.analytics.reports.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", dimensions="queryType", @@ -110,7 +110,7 @@ async def test_method_get_with_all_params(self, async_client: AsyncCloudflare) - @parametrize async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.analytics.reports.with_raw_response.get( + response = await async_client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -122,7 +122,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.analytics.reports.with_streaming_response.get( + async with async_client.dns_firewall.analytics.reports.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -137,13 +137,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No @parametrize async def test_path_params_get(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.analytics.reports.with_raw_response.get( + await async_client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.analytics.reports.with_raw_response.get( + await async_client.dns_firewall.analytics.reports.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) diff --git a/tests/api_resources/dns/firewall/test_reverse_dns.py b/tests/api_resources/dns_firewall/test_reverse_dns.py similarity index 86% rename from tests/api_resources/dns/firewall/test_reverse_dns.py rename to tests/api_resources/dns_firewall/test_reverse_dns.py index 271152e3b03..8ddeaf9f7b0 100644 --- a/tests/api_resources/dns/firewall/test_reverse_dns.py +++ b/tests/api_resources/dns_firewall/test_reverse_dns.py @@ -9,7 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dns.firewall import ReverseDNSGetResponse, ReverseDNSEditResponse +from cloudflare.types.dns_firewall import ReverseDNSGetResponse, ReverseDNSEditResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -19,7 +19,7 @@ class TestReverseDNS: @parametrize def test_method_edit(self, client: Cloudflare) -> None: - reverse_dns = client.dns.firewall.reverse_dns.edit( + reverse_dns = client.dns_firewall.reverse_dns.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -27,7 +27,7 @@ def test_method_edit(self, client: Cloudflare) -> None: @parametrize def test_method_edit_with_all_params(self, client: Cloudflare) -> None: - reverse_dns = client.dns.firewall.reverse_dns.edit( + reverse_dns = client.dns_firewall.reverse_dns.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ptr={"foo": "string"}, @@ -36,7 +36,7 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: @parametrize def test_raw_response_edit(self, client: Cloudflare) -> None: - response = client.dns.firewall.reverse_dns.with_raw_response.edit( + response = client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -48,7 +48,7 @@ def test_raw_response_edit(self, client: Cloudflare) -> None: @parametrize def test_streaming_response_edit(self, client: Cloudflare) -> None: - with client.dns.firewall.reverse_dns.with_streaming_response.edit( + with client.dns_firewall.reverse_dns.with_streaming_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -63,20 +63,20 @@ def test_streaming_response_edit(self, client: Cloudflare) -> None: @parametrize def test_path_params_edit(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.reverse_dns.with_raw_response.edit( + client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.reverse_dns.with_raw_response.edit( + client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize def test_method_get(self, client: Cloudflare) -> None: - reverse_dns = client.dns.firewall.reverse_dns.get( + reverse_dns = client.dns_firewall.reverse_dns.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -84,7 +84,7 @@ def test_method_get(self, client: Cloudflare) -> None: @parametrize def test_raw_response_get(self, client: Cloudflare) -> None: - response = client.dns.firewall.reverse_dns.with_raw_response.get( + response = client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -96,7 +96,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: @parametrize def test_streaming_response_get(self, client: Cloudflare) -> None: - with client.dns.firewall.reverse_dns.with_streaming_response.get( + with client.dns_firewall.reverse_dns.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -111,13 +111,13 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: @parametrize def test_path_params_get(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.reverse_dns.with_raw_response.get( + client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.reverse_dns.with_raw_response.get( + client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -128,7 +128,7 @@ class TestAsyncReverseDNS: @parametrize async def test_method_edit(self, async_client: AsyncCloudflare) -> None: - reverse_dns = await async_client.dns.firewall.reverse_dns.edit( + reverse_dns = await async_client.dns_firewall.reverse_dns.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -136,7 +136,7 @@ async def test_method_edit(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None: - reverse_dns = await async_client.dns.firewall.reverse_dns.edit( + reverse_dns = await async_client.dns_firewall.reverse_dns.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ptr={"foo": "string"}, @@ -145,7 +145,7 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) @parametrize async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.reverse_dns.with_raw_response.edit( + response = await async_client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -157,7 +157,7 @@ async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.reverse_dns.with_streaming_response.edit( + async with async_client.dns_firewall.reverse_dns.with_streaming_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -172,20 +172,20 @@ async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> N @parametrize async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.reverse_dns.with_raw_response.edit( + await async_client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.reverse_dns.with_raw_response.edit( + await async_client.dns_firewall.reverse_dns.with_raw_response.edit( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize async def test_method_get(self, async_client: AsyncCloudflare) -> None: - reverse_dns = await async_client.dns.firewall.reverse_dns.get( + reverse_dns = await async_client.dns_firewall.reverse_dns.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -193,7 +193,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.reverse_dns.with_raw_response.get( + response = await async_client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @@ -205,7 +205,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.reverse_dns.with_streaming_response.get( + async with async_client.dns_firewall.reverse_dns.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: @@ -220,13 +220,13 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No @parametrize async def test_path_params_get(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.reverse_dns.with_raw_response.get( + await async_client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.reverse_dns.with_raw_response.get( + await async_client.dns_firewall.reverse_dns.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) diff --git a/tests/api_resources/dns/test_firewall.py b/tests/api_resources/test_dns_firewall.py similarity index 69% rename from tests/api_resources/dns/test_firewall.py rename to tests/api_resources/test_dns_firewall.py index bdd4c4ba001..9bd60c6a1a4 100644 --- a/tests/api_resources/dns/test_firewall.py +++ b/tests/api_resources/test_dns_firewall.py @@ -9,33 +9,33 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.dns import ( - FirewallGetResponse, - FirewallEditResponse, - FirewallListResponse, - FirewallCreateResponse, - FirewallDeleteResponse, -) from cloudflare.pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray +from cloudflare.types.dns_firewall import ( + DNSFirewallGetResponse, + DNSFirewallEditResponse, + DNSFirewallListResponse, + DNSFirewallCreateResponse, + DNSFirewallDeleteResponse, +) base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") -class TestFirewall: +class TestDNSFirewall: parametrize = pytest.mark.parametrize("client", [False, True], indirect=True, ids=["loose", "strict"]) @parametrize def test_method_create(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.create( + dns_firewall = client.dns_firewall.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], ) - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize def test_method_create_with_all_params(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.create( + dns_firewall = client.dns_firewall.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -51,11 +51,11 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: ratelimit=600, retries=2, ) - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize def test_raw_response_create(self, client: Cloudflare) -> None: - response = client.dns.firewall.with_raw_response.create( + response = client.dns_firewall.with_raw_response.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -63,12 +63,12 @@ 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" - firewall = response.parse() - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize def test_streaming_response_create(self, client: Cloudflare) -> None: - with client.dns.firewall.with_streaming_response.create( + with client.dns_firewall.with_streaming_response.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -76,15 +76,15 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize def test_path_params_create(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.with_raw_response.create( + client.dns_firewall.with_raw_response.create( account_id="", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -92,110 +92,110 @@ def test_path_params_create(self, client: Cloudflare) -> None: @parametrize def test_method_list(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.list( + dns_firewall = client.dns_firewall.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize def test_method_list_with_all_params(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.list( + dns_firewall = client.dns_firewall.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", page=1, per_page=1, ) - assert_matches_type(SyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize def test_raw_response_list(self, client: Cloudflare) -> None: - response = client.dns.firewall.with_raw_response.list( + response = client.dns_firewall.with_raw_response.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(SyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize def test_streaming_response_list(self, client: Cloudflare) -> None: - with client.dns.firewall.with_streaming_response.list( + with client.dns_firewall.with_streaming_response.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(SyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(SyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize def test_path_params_list(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.with_raw_response.list( + client.dns_firewall.with_raw_response.list( account_id="", ) @parametrize def test_method_delete(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.delete( + dns_firewall = client.dns_firewall.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) @parametrize def test_raw_response_delete(self, client: Cloudflare) -> None: - response = client.dns.firewall.with_raw_response.delete( + response = client.dns_firewall.with_raw_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) @parametrize def test_streaming_response_delete(self, client: Cloudflare) -> None: - with client.dns.firewall.with_streaming_response.delete( + with client.dns_firewall.with_streaming_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize def test_path_params_delete(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.with_raw_response.delete( + client.dns_firewall.with_raw_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.with_raw_response.delete( + client.dns_firewall.with_raw_response.delete( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize def test_method_edit(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.edit( + dns_firewall = client.dns_firewall.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize def test_method_edit_with_all_params(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.edit( + dns_firewall = client.dns_firewall.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", attack_mitigation={ @@ -212,112 +212,112 @@ def test_method_edit_with_all_params(self, client: Cloudflare) -> None: retries=2, upstream_ips=["192.0.2.1", "198.51.100.1", "string"], ) - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize def test_raw_response_edit(self, client: Cloudflare) -> None: - response = client.dns.firewall.with_raw_response.edit( + response = client.dns_firewall.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize def test_streaming_response_edit(self, client: Cloudflare) -> None: - with client.dns.firewall.with_streaming_response.edit( + with client.dns_firewall.with_streaming_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize def test_path_params_edit(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.with_raw_response.edit( + client.dns_firewall.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.with_raw_response.edit( + client.dns_firewall.with_raw_response.edit( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize def test_method_get(self, client: Cloudflare) -> None: - firewall = client.dns.firewall.get( + dns_firewall = client.dns_firewall.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) @parametrize def test_raw_response_get(self, client: Cloudflare) -> None: - response = client.dns.firewall.with_raw_response.get( + response = client.dns_firewall.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) @parametrize def test_streaming_response_get(self, client: Cloudflare) -> None: - with client.dns.firewall.with_streaming_response.get( + with client.dns_firewall.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = response.parse() - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + dns_firewall = response.parse() + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize def test_path_params_get(self, client: Cloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - client.dns.firewall.with_raw_response.get( + client.dns_firewall.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - client.dns.firewall.with_raw_response.get( + client.dns_firewall.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) -class TestAsyncFirewall: +class TestAsyncDNSFirewall: parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"]) @parametrize async def test_method_create(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.create( + dns_firewall = await async_client.dns_firewall.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], ) - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.create( + dns_firewall = await async_client.dns_firewall.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -333,11 +333,11 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare ratelimit=600, retries=2, ) - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.with_raw_response.create( + response = await async_client.dns_firewall.with_raw_response.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -345,12 +345,12 @@ 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" - firewall = await response.parse() - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) @parametrize async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.with_streaming_response.create( + async with async_client.dns_firewall.with_streaming_response.create( account_id="023e105f4ecef8ad9ca31a8372d0c353", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -358,15 +358,15 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallCreateResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallCreateResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize async def test_path_params_create(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.with_raw_response.create( + await async_client.dns_firewall.with_raw_response.create( account_id="", name="My Awesome DNS Firewall cluster", upstream_ips=["192.0.2.1", "198.51.100.1", "string"], @@ -374,110 +374,110 @@ async def test_path_params_create(self, async_client: AsyncCloudflare) -> None: @parametrize async def test_method_list(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.list( + dns_firewall = await async_client.dns_firewall.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize async def test_method_list_with_all_params(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.list( + dns_firewall = await async_client.dns_firewall.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", page=1, per_page=1, ) - assert_matches_type(AsyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.with_raw_response.list( + response = await async_client.dns_firewall.with_raw_response.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(AsyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) @parametrize async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.with_streaming_response.list( + async with async_client.dns_firewall.with_streaming_response.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(AsyncV4PagePaginationArray[FirewallListResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(AsyncV4PagePaginationArray[DNSFirewallListResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize async def test_path_params_list(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.with_raw_response.list( + await async_client.dns_firewall.with_raw_response.list( account_id="", ) @parametrize async def test_method_delete(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.delete( + dns_firewall = await async_client.dns_firewall.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) @parametrize async def test_raw_response_delete(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.with_raw_response.delete( + response = await async_client.dns_firewall.with_raw_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) @parametrize async def test_streaming_response_delete(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.with_streaming_response.delete( + async with async_client.dns_firewall.with_streaming_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallDeleteResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallDeleteResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize async def test_path_params_delete(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.with_raw_response.delete( + await async_client.dns_firewall.with_raw_response.delete( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.with_raw_response.delete( + await async_client.dns_firewall.with_raw_response.delete( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize async def test_method_edit(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.edit( + dns_firewall = await async_client.dns_firewall.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.edit( + dns_firewall = await async_client.dns_firewall.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", attack_mitigation={ @@ -494,92 +494,92 @@ async def test_method_edit_with_all_params(self, async_client: AsyncCloudflare) retries=2, upstream_ips=["192.0.2.1", "198.51.100.1", "string"], ) - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize async def test_raw_response_edit(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.with_raw_response.edit( + response = await async_client.dns_firewall.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) @parametrize async def test_streaming_response_edit(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.with_streaming_response.edit( + async with async_client.dns_firewall.with_streaming_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallEditResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallEditResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize async def test_path_params_edit(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.with_raw_response.edit( + await async_client.dns_firewall.with_raw_response.edit( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.with_raw_response.edit( + await async_client.dns_firewall.with_raw_response.edit( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) @parametrize async def test_method_get(self, async_client: AsyncCloudflare) -> None: - firewall = await async_client.dns.firewall.get( + dns_firewall = await async_client.dns_firewall.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) @parametrize async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: - response = await async_client.dns.firewall.with_raw_response.get( + response = await async_client.dns_firewall.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) @parametrize async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> None: - async with async_client.dns.firewall.with_streaming_response.get( + async with async_client.dns_firewall.with_streaming_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) as response: assert not response.is_closed assert response.http_request.headers.get("X-Stainless-Lang") == "python" - firewall = await response.parse() - assert_matches_type(Optional[FirewallGetResponse], firewall, path=["response"]) + dns_firewall = await response.parse() + assert_matches_type(Optional[DNSFirewallGetResponse], dns_firewall, path=["response"]) assert cast(Any, response.is_closed) is True @parametrize async def test_path_params_get(self, async_client: AsyncCloudflare) -> None: with pytest.raises(ValueError, match=r"Expected a non-empty value for `account_id` but received ''"): - await async_client.dns.firewall.with_raw_response.get( + await async_client.dns_firewall.with_raw_response.get( dns_firewall_id="023e105f4ecef8ad9ca31a8372d0c353", account_id="", ) with pytest.raises(ValueError, match=r"Expected a non-empty value for `dns_firewall_id` but received ''"): - await async_client.dns.firewall.with_raw_response.get( + await async_client.dns_firewall.with_raw_response.get( dns_firewall_id="", account_id="023e105f4ecef8ad9ca31a8372d0c353", )