diff --git a/api.md b/api.md index b9401c406b9..1fabebe550f 100644 --- a/api.md +++ b/api.md @@ -5047,7 +5047,10 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.access.applications import UserPolicyCheckListResponse +from cloudflare.types.zero_trust.access.applications import ( + UserPolicyCheckGeo, + UserPolicyCheckListResponse, +) ``` Methods: @@ -5285,11 +5288,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust import ( - NetworkPath, - Percentiles, - UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11, -) +from cloudflare.types.zero_trust import DeviceExperienceMonitor, NetworkPath, Percentiles ``` ### Colos @@ -5665,10 +5664,10 @@ from cloudflare.types.zero_trust.gateway import ( CustomCertificateSettings, ExtendedEmailMatching, FipsSettings, + GatewayConfigurationSettings, NotificationSettings, ProtocolDetection, TLSSettings, - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e, ConfigurationUpdateResponse, ConfigurationEditResponse, ConfigurationGetResponse, @@ -5723,12 +5722,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.gateway import ( - Location, - LocationNetwork, - UnnamedSchemaRef1b37523fdb0ae5806cd8e062492aab66, - LocationDeleteResponse, -) +from cloudflare.types.zero_trust.gateway import Location, LocationNetwork, LocationDeleteResponse ``` Methods: @@ -5744,10 +5738,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.gateway import ( - LoggingSetting, - UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b, -) +from cloudflare.types.zero_trust.gateway import LoggingSetting ``` Methods: @@ -5763,7 +5754,6 @@ Types: from cloudflare.types.zero_trust.gateway import ( GatewayIPs, ProxyEndpoint, - UnnamedSchemaRef4753ee81779d0e57189420079abab61e, ProxyEndpointDeleteResponse, ) ``` @@ -5807,11 +5797,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.networks import ( - Route, - Teamnet, - UnnamedSchemaRefC125d35cbb7f93aab989cd19bd764ed6, -) +from cloudflare.types.zero_trust.networks import NetworkRoute, Route, Teamnet ``` Methods: @@ -5982,8 +5968,8 @@ Types: ```python from cloudflare.types.url_scanner import ( - UnnamedSchemaRef3750739f772bbdf0bb00d6634ccc0631, - UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6, + URLScannerDomain, + URLScannerTask, ScanCreateResponse, ScanGetResponse, ScanHarResponse, diff --git a/src/cloudflare/resources/zero_trust/gateway/configurations.py b/src/cloudflare/resources/zero_trust/gateway/configurations.py index 93273f3845c..bd1672c0f6c 100644 --- a/src/cloudflare/resources/zero_trust/gateway/configurations.py +++ b/src/cloudflare/resources/zero_trust/gateway/configurations.py @@ -27,7 +27,7 @@ ConfigurationGetResponse, ConfigurationEditResponse, ConfigurationUpdateResponse, - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam, + GatewayConfigurationSettingsParam, configuration_edit_params, configuration_update_params, ) @@ -48,7 +48,7 @@ def update( self, *, account_id: str, - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam | NotGiven = NOT_GIVEN, + settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -89,7 +89,7 @@ def edit( self, *, account_id: str, - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam | NotGiven = NOT_GIVEN, + settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -182,7 +182,7 @@ async def update( self, *, account_id: str, - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam | NotGiven = NOT_GIVEN, + settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -225,7 +225,7 @@ async def edit( self, *, account_id: str, - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam | NotGiven = NOT_GIVEN, + settings: GatewayConfigurationSettingsParam | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, diff --git a/src/cloudflare/resources/zero_trust/gateway/logging.py b/src/cloudflare/resources/zero_trust/gateway/logging.py index e64fdcc6852..43e15a7dd7b 100644 --- a/src/cloudflare/resources/zero_trust/gateway/logging.py +++ b/src/cloudflare/resources/zero_trust/gateway/logging.py @@ -23,11 +23,7 @@ from ...._base_client import ( make_request_options, ) -from ....types.zero_trust.gateway import ( - LoggingSetting, - UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam, - logging_update_params, -) +from ....types.zero_trust.gateway import LoggingSetting, logging_update_params __all__ = ["Logging", "AsyncLogging"] @@ -46,7 +42,7 @@ def update( *, account_id: str, redact_pii: bool | NotGiven = NOT_GIVEN, - settings_by_rule_type: UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam | NotGiven = NOT_GIVEN, + settings_by_rule_type: logging_update_params.SettingsByRuleType | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, @@ -144,7 +140,7 @@ async def update( *, account_id: str, redact_pii: bool | NotGiven = NOT_GIVEN, - settings_by_rule_type: UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam | NotGiven = NOT_GIVEN, + settings_by_rule_type: logging_update_params.SettingsByRuleType | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. # The extra values given here take precedence over values defined on the client or passed to this method. extra_headers: Headers | None = None, diff --git a/src/cloudflare/types/url_scanner/__init__.py b/src/cloudflare/types/url_scanner/__init__.py index 2a81253003b..cb5bc10280d 100644 --- a/src/cloudflare/types/url_scanner/__init__.py +++ b/src/cloudflare/types/url_scanner/__init__.py @@ -5,8 +5,6 @@ from .scan_get_response import ScanGetResponse as ScanGetResponse from .scan_har_response import ScanHarResponse as ScanHarResponse from .scan_create_params import ScanCreateParams as ScanCreateParams +from .url_scanner_domain import URLScannerDomain as URLScannerDomain from .scan_create_response import ScanCreateResponse as ScanCreateResponse from .scan_screenshot_params import ScanScreenshotParams as ScanScreenshotParams -from .unnamed_schema_ref_6d7a78acccfc753a8e931b1c4e72b6a6 import ( - UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6 as UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6, -) diff --git a/src/cloudflare/types/url_scanner/scan_get_response.py b/src/cloudflare/types/url_scanner/scan_get_response.py index 6afa38ffaa2..1cb217d5a63 100644 --- a/src/cloudflare/types/url_scanner/scan_get_response.py +++ b/src/cloudflare/types/url_scanner/scan_get_response.py @@ -7,7 +7,7 @@ from ..._models import BaseModel from ..radar.http import Browser -from .unnamed_schema_ref_6d7a78acccfc753a8e931b1c4e72b6a6 import UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6 +from .url_scanner_domain import URLScannerDomain __all__ = [ "ScanGetResponse", @@ -78,7 +78,7 @@ class ScanMetaProcessorsCategoriesRisk(BaseModel): class ScanMetaProcessorsCategories(BaseModel): - content: List[UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6] + content: List[URLScannerDomain] risks: List[ScanMetaProcessorsCategoriesRisk] @@ -401,19 +401,19 @@ class ScanASNs(BaseModel): class ScanDomainsExampleComCategoriesInherited(BaseModel): - content: Optional[List[UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6]] = None + content: Optional[List[URLScannerDomain]] = None from_: Optional[str] = FieldInfo(alias="from", default=None) - risks: Optional[List[UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6]] = None + risks: Optional[List[URLScannerDomain]] = None class ScanDomainsExampleComCategories(BaseModel): inherited: ScanDomainsExampleComCategoriesInherited - content: Optional[List[UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6]] = None + content: Optional[List[URLScannerDomain]] = None - risks: Optional[List[UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6]] = None + risks: Optional[List[URLScannerDomain]] = None class ScanDomainsExampleComDNS(BaseModel): diff --git a/src/cloudflare/types/url_scanner/unnamed_schema_ref_6d7a78acccfc753a8e931b1c4e72b6a6.py b/src/cloudflare/types/url_scanner/url_scanner_domain.py similarity index 63% rename from src/cloudflare/types/url_scanner/unnamed_schema_ref_6d7a78acccfc753a8e931b1c4e72b6a6.py rename to src/cloudflare/types/url_scanner/url_scanner_domain.py index 4f4be3b92aa..d9f0f7479ab 100644 --- a/src/cloudflare/types/url_scanner/unnamed_schema_ref_6d7a78acccfc753a8e931b1c4e72b6a6.py +++ b/src/cloudflare/types/url_scanner/url_scanner_domain.py @@ -4,10 +4,10 @@ from ..._models import BaseModel -__all__ = ["UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6"] +__all__ = ["URLScannerDomain"] -class UnnamedSchemaRef6d7a78acccfc753a8e931b1c4e72b6a6(BaseModel): +class URLScannerDomain(BaseModel): id: int name: str diff --git a/src/cloudflare/types/zero_trust/__init__.py b/src/cloudflare/types/zero_trust/__init__.py index 8e7c366537b..39c91259401 100644 --- a/src/cloudflare/types/zero_trust/__init__.py +++ b/src/cloudflare/types/zero_trust/__init__.py @@ -28,6 +28,7 @@ from .gateway_list_response import GatewayListResponse as GatewayListResponse from .identity_provider_type import IdentityProviderType as IdentityProviderType from .gateway_create_response import GatewayCreateResponse as GatewayCreateResponse +from .device_experience_monitor import DeviceExperienceMonitor as DeviceExperienceMonitor from .generic_oauth_config_param import GenericOAuthConfigParam as GenericOAuthConfigParam from .organization_create_params import OrganizationCreateParams as OrganizationCreateParams from .organization_update_params import OrganizationUpdateParams as OrganizationUpdateParams @@ -40,6 +41,3 @@ from .identity_provider_delete_response import IdentityProviderDeleteResponse as IdentityProviderDeleteResponse from .connectivity_setting_edit_response import ConnectivitySettingEditResponse as ConnectivitySettingEditResponse from .organization_revoke_users_response import OrganizationRevokeUsersResponse as OrganizationRevokeUsersResponse -from .unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11 import ( - UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11 as UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11, -) diff --git a/src/cloudflare/types/zero_trust/access/applications/__init__.py b/src/cloudflare/types/zero_trust/access/applications/__init__.py index cf138daeb24..6abb930af01 100644 --- a/src/cloudflare/types/zero_trust/access/applications/__init__.py +++ b/src/cloudflare/types/zero_trust/access/applications/__init__.py @@ -12,5 +12,6 @@ from .approval_group_param import ApprovalGroupParam as ApprovalGroupParam from .policy_create_params import PolicyCreateParams as PolicyCreateParams from .policy_update_params import PolicyUpdateParams as PolicyUpdateParams +from .user_policy_check_geo import UserPolicyCheckGeo as UserPolicyCheckGeo from .policy_delete_response import PolicyDeleteResponse as PolicyDeleteResponse from .user_policy_check_list_response import UserPolicyCheckListResponse as UserPolicyCheckListResponse diff --git a/src/cloudflare/types/zero_trust/access/applications/user_policy_check_geo.py b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_geo.py new file mode 100644 index 00000000000..b99d468ab06 --- /dev/null +++ b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_geo.py @@ -0,0 +1,11 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional + +from ....._models import BaseModel + +__all__ = ["UserPolicyCheckGeo"] + + +class UserPolicyCheckGeo(BaseModel): + country: Optional[str] = None diff --git a/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py index 7e0bd187b85..3622477b98e 100644 --- a/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py +++ b/src/cloudflare/types/zero_trust/access/applications/user_policy_check_list_response.py @@ -3,8 +3,9 @@ from typing import List, Optional from ....._models import BaseModel +from .user_policy_check_geo import UserPolicyCheckGeo -__all__ = ["UserPolicyCheckListResponse", "AppState", "UserIdentity", "UserIdentityGeo"] +__all__ = ["UserPolicyCheckListResponse", "AppState", "UserIdentity"] class AppState(BaseModel): @@ -22,10 +23,6 @@ class AppState(BaseModel): status: Optional[str] = None -class UserIdentityGeo(BaseModel): - country: Optional[str] = None - - class UserIdentity(BaseModel): id: Optional[str] = None @@ -35,7 +32,7 @@ class UserIdentity(BaseModel): email: Optional[str] = None - geo: Optional[UserIdentityGeo] = None + geo: Optional[UserPolicyCheckGeo] = None iat: Optional[int] = None diff --git a/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py b/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py index 523b0f0fc48..dec6c0542a4 100644 --- a/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py +++ b/src/cloudflare/types/zero_trust/access/users/active_session_get_response.py @@ -5,16 +5,9 @@ from pydantic import Field as FieldInfo from ....._models import BaseModel +from ..applications import UserPolicyCheckGeo -__all__ = [ - "ActiveSessionGetResponse", - "DeviceSessions", - "DevicePosture", - "DevicePostureCheck", - "Geo", - "IDP", - "MTLSAuth", -] +__all__ = ["ActiveSessionGetResponse", "DeviceSessions", "DevicePosture", "DevicePostureCheck", "IDP", "MTLSAuth"] class DeviceSessions(BaseModel): @@ -47,10 +40,6 @@ class DevicePosture(BaseModel): type: Optional[str] = None -class Geo(BaseModel): - country: Optional[str] = None - - class IDP(BaseModel): id: Optional[str] = None @@ -84,7 +73,7 @@ class ActiveSessionGetResponse(BaseModel): email: Optional[str] = None - geo: Optional[Geo] = None + geo: Optional[UserPolicyCheckGeo] = None iat: Optional[float] = None diff --git a/src/cloudflare/types/zero_trust/access/users/identity.py b/src/cloudflare/types/zero_trust/access/users/identity.py index 51617d2d7fc..1581cc62dcf 100644 --- a/src/cloudflare/types/zero_trust/access/users/identity.py +++ b/src/cloudflare/types/zero_trust/access/users/identity.py @@ -5,8 +5,9 @@ from pydantic import Field as FieldInfo from ....._models import BaseModel +from ..applications import UserPolicyCheckGeo -__all__ = ["Identity", "DeviceSessions", "DevicePosture", "DevicePostureCheck", "Geo", "IDP", "MTLSAuth"] +__all__ = ["Identity", "DeviceSessions", "DevicePosture", "DevicePostureCheck", "IDP", "MTLSAuth"] class DeviceSessions(BaseModel): @@ -39,10 +40,6 @@ class DevicePosture(BaseModel): type: Optional[str] = None -class Geo(BaseModel): - country: Optional[str] = None - - class IDP(BaseModel): id: Optional[str] = None @@ -76,7 +73,7 @@ class Identity(BaseModel): email: Optional[str] = None - geo: Optional[Geo] = None + geo: Optional[UserPolicyCheckGeo] = None iat: Optional[float] = None diff --git a/src/cloudflare/types/zero_trust/unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11.py b/src/cloudflare/types/zero_trust/device_experience_monitor.py similarity index 63% rename from src/cloudflare/types/zero_trust/unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11.py rename to src/cloudflare/types/zero_trust/device_experience_monitor.py index 2c524b6966b..ca07797fd0a 100644 --- a/src/cloudflare/types/zero_trust/unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11.py +++ b/src/cloudflare/types/zero_trust/device_experience_monitor.py @@ -2,10 +2,10 @@ from ..._models import BaseModel -__all__ = ["UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11"] +__all__ = ["DeviceExperienceMonitor"] -class UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11(BaseModel): +class DeviceExperienceMonitor(BaseModel): id: str default: bool diff --git a/src/cloudflare/types/zero_trust/dex/http_details.py b/src/cloudflare/types/zero_trust/dex/http_details.py index 0bdd6214652..2d447557992 100644 --- a/src/cloudflare/types/zero_trust/dex/http_details.py +++ b/src/cloudflare/types/zero_trust/dex/http_details.py @@ -7,7 +7,7 @@ from ...._models import BaseModel from .http_tests import TestStatOverTime -from ..unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11 import UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11 +from ..device_experience_monitor import DeviceExperienceMonitor __all__ = [ "HTTPDetails", @@ -135,6 +135,6 @@ class HTTPDetails(BaseModel): name: Optional[str] = None """The name of the HTTP synthetic application test""" - target_policies: Optional[List[UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11]] = None + target_policies: Optional[List[DeviceExperienceMonitor]] = None targeted: Optional[bool] = None diff --git a/src/cloudflare/types/zero_trust/dex/tests/tests.py b/src/cloudflare/types/zero_trust/dex/tests/tests.py index 154665ac872..208a0f31c31 100644 --- a/src/cloudflare/types/zero_trust/dex/tests/tests.py +++ b/src/cloudflare/types/zero_trust/dex/tests/tests.py @@ -7,7 +7,7 @@ from ....._models import BaseModel from ..aggregate_time_period import AggregateTimePeriod -from ...unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11 import UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11 +from ...device_experience_monitor import DeviceExperienceMonitor __all__ = [ "Tests", @@ -238,7 +238,7 @@ class Test(BaseModel): method: Optional[str] = None """for HTTP, the method to use when running the test""" - target_policies: Optional[List[UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11]] = None + target_policies: Optional[List[DeviceExperienceMonitor]] = None targeted: Optional[bool] = None diff --git a/src/cloudflare/types/zero_trust/dex/traceroute.py b/src/cloudflare/types/zero_trust/dex/traceroute.py index 15dfc3204d7..ea500057fa5 100644 --- a/src/cloudflare/types/zero_trust/dex/traceroute.py +++ b/src/cloudflare/types/zero_trust/dex/traceroute.py @@ -7,7 +7,7 @@ from ...._models import BaseModel from .http_tests import TestStatOverTime -from ..unnamed_schema_ref_bf9e2abcf1b78a6cab8e6e29e2228a11 import UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11 +from ..device_experience_monitor import DeviceExperienceMonitor __all__ = [ "Traceroute", @@ -140,7 +140,7 @@ class Traceroute(BaseModel): name: str """The name of the Traceroute synthetic application test""" - target_policies: Optional[List[UnnamedSchemaRefBf9e2abcf1b78a6cab8e6e29e2228a11]] = None + target_policies: Optional[List[DeviceExperienceMonitor]] = None targeted: Optional[bool] = None diff --git a/src/cloudflare/types/zero_trust/gateway/__init__.py b/src/cloudflare/types/zero_trust/gateway/__init__.py index 5acd7e95023..a73bc088381 100644 --- a/src/cloudflare/types/zero_trust/gateway/__init__.py +++ b/src/cloudflare/types/zero_trust/gateway/__init__.py @@ -70,19 +70,9 @@ from .extended_email_matching_param import ExtendedEmailMatchingParam as ExtendedEmailMatchingParam from .dns_resolver_settings_v4_param import DNSResolverSettingsV4Param as DNSResolverSettingsV4Param from .dns_resolver_settings_v6_param import DNSResolverSettingsV6Param as DNSResolverSettingsV6Param +from .gateway_configuration_settings import GatewayConfigurationSettings as GatewayConfigurationSettings from .proxy_endpoint_delete_response import ProxyEndpointDeleteResponse as ProxyEndpointDeleteResponse from .audit_ssh_setting_update_params import AuditSSHSettingUpdateParams as AuditSSHSettingUpdateParams from .browser_isolation_settings_param import BrowserIsolationSettingsParam as BrowserIsolationSettingsParam from .custom_certificate_settings_param import CustomCertificateSettingsParam as CustomCertificateSettingsParam -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e import ( - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e as UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e, -) -from .unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b import ( - UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b as UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b, -) -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param import ( - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam as UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam, -) -from .unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b_param import ( - UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam as UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam, -) +from .gateway_configuration_settings_param import GatewayConfigurationSettingsParam as GatewayConfigurationSettingsParam diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py b/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py index 47f2cfc4494..9adb3f5ae01 100644 --- a/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py +++ b/src/cloudflare/types/zero_trust/gateway/configuration_edit_params.py @@ -4,9 +4,7 @@ from typing_extensions import Required, TypedDict -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param import ( - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam, -) +from .gateway_configuration_settings_param import GatewayConfigurationSettingsParam __all__ = ["ConfigurationEditParams"] @@ -14,5 +12,5 @@ class ConfigurationEditParams(TypedDict, total=False): account_id: Required[str] - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam + settings: GatewayConfigurationSettingsParam """account settings.""" diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py index 0b61b6ed6fa..e7659cf264e 100644 --- a/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py +++ b/src/cloudflare/types/zero_trust/gateway/configuration_edit_response.py @@ -4,7 +4,7 @@ from datetime import datetime from ...._models import BaseModel -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e import UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e +from .gateway_configuration_settings import GatewayConfigurationSettings __all__ = ["ConfigurationEditResponse"] @@ -12,7 +12,7 @@ class ConfigurationEditResponse(BaseModel): created_at: Optional[datetime] = None - settings: Optional[UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e] = None + settings: Optional[GatewayConfigurationSettings] = None """account settings.""" updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py index e803d29e971..ab5d764c721 100644 --- a/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py +++ b/src/cloudflare/types/zero_trust/gateway/configuration_get_response.py @@ -4,7 +4,7 @@ from datetime import datetime from ...._models import BaseModel -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e import UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e +from .gateway_configuration_settings import GatewayConfigurationSettings __all__ = ["ConfigurationGetResponse"] @@ -12,7 +12,7 @@ class ConfigurationGetResponse(BaseModel): created_at: Optional[datetime] = None - settings: Optional[UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e] = None + settings: Optional[GatewayConfigurationSettings] = None """account settings.""" updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py b/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py index 8c4d1da174a..7fcc1d00377 100644 --- a/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py +++ b/src/cloudflare/types/zero_trust/gateway/configuration_update_params.py @@ -4,9 +4,7 @@ from typing_extensions import Required, TypedDict -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param import ( - UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam, -) +from .gateway_configuration_settings_param import GatewayConfigurationSettingsParam __all__ = ["ConfigurationUpdateParams"] @@ -14,5 +12,5 @@ class ConfigurationUpdateParams(TypedDict, total=False): account_id: Required[str] - settings: UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam + settings: GatewayConfigurationSettingsParam """account settings.""" diff --git a/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py b/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py index bf9cbc1fc11..f88c116ea7e 100644 --- a/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py +++ b/src/cloudflare/types/zero_trust/gateway/configuration_update_response.py @@ -4,7 +4,7 @@ from datetime import datetime from ...._models import BaseModel -from .unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e import UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e +from .gateway_configuration_settings import GatewayConfigurationSettings __all__ = ["ConfigurationUpdateResponse"] @@ -12,7 +12,7 @@ class ConfigurationUpdateResponse(BaseModel): created_at: Optional[datetime] = None - settings: Optional[UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e] = None + settings: Optional[GatewayConfigurationSettings] = None """account settings.""" updated_at: Optional[datetime] = None diff --git a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e.py b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py similarity index 92% rename from src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e.py rename to src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py index 90b7133492c..13705c996f6 100644 --- a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e.py +++ b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings.py @@ -14,10 +14,10 @@ from .browser_isolation_settings import BrowserIsolationSettings from .custom_certificate_settings import CustomCertificateSettings -__all__ = ["UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e"] +__all__ = ["GatewayConfigurationSettings"] -class UnnamedSchemaRef055aaf3918bf29f81c09d394a864182e(BaseModel): +class GatewayConfigurationSettings(BaseModel): activity_log: Optional[ActivityLogSettings] = None """Activity log settings.""" diff --git a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param.py b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py similarity index 91% rename from src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param.py rename to src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py index 0085ae9a8a1..8b0b1443581 100644 --- a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_055aaf3918bf29f81c09d394a864182e_param.py +++ b/src/cloudflare/types/zero_trust/gateway/gateway_configuration_settings_param.py @@ -15,10 +15,10 @@ from .browser_isolation_settings_param import BrowserIsolationSettingsParam from .custom_certificate_settings_param import CustomCertificateSettingsParam -__all__ = ["UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam"] +__all__ = ["GatewayConfigurationSettingsParam"] -class UnnamedSchemaRef055aaf3918bf29f81c09d394a864182eParam(TypedDict, total=False): +class GatewayConfigurationSettingsParam(TypedDict, total=False): activity_log: ActivityLogSettingsParam """Activity log settings.""" diff --git a/src/cloudflare/types/zero_trust/gateway/logging_setting.py b/src/cloudflare/types/zero_trust/gateway/logging_setting.py index 955a13aef75..7fd32c437a6 100644 --- a/src/cloudflare/types/zero_trust/gateway/logging_setting.py +++ b/src/cloudflare/types/zero_trust/gateway/logging_setting.py @@ -3,9 +3,19 @@ from typing import Optional from ...._models import BaseModel -from .unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b import UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b -__all__ = ["LoggingSetting"] +__all__ = ["LoggingSetting", "SettingsByRuleType"] + + +class SettingsByRuleType(BaseModel): + dns: Optional[object] = None + """Logging settings for DNS firewall.""" + + http: Optional[object] = None + """Logging settings for HTTP/HTTPS firewall.""" + + l4: Optional[object] = None + """Logging settings for Network firewall.""" class LoggingSetting(BaseModel): @@ -15,5 +25,5 @@ class LoggingSetting(BaseModel): are: source IP, user email, user ID, device ID, URL, referrer, user agent). """ - settings_by_rule_type: Optional[UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b] = None + settings_by_rule_type: Optional[SettingsByRuleType] = None """Logging settings by rule type.""" diff --git a/src/cloudflare/types/zero_trust/gateway/logging_update_params.py b/src/cloudflare/types/zero_trust/gateway/logging_update_params.py index 3e8185860d6..de1cb4dfeb6 100644 --- a/src/cloudflare/types/zero_trust/gateway/logging_update_params.py +++ b/src/cloudflare/types/zero_trust/gateway/logging_update_params.py @@ -4,11 +4,7 @@ from typing_extensions import Required, TypedDict -from .unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b_param import ( - UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam, -) - -__all__ = ["LoggingUpdateParams"] +__all__ = ["LoggingUpdateParams", "SettingsByRuleType"] class LoggingUpdateParams(TypedDict, total=False): @@ -20,5 +16,16 @@ class LoggingUpdateParams(TypedDict, total=False): are: source IP, user email, user ID, device ID, URL, referrer, user agent). """ - settings_by_rule_type: UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam + settings_by_rule_type: SettingsByRuleType """Logging settings by rule type.""" + + +class SettingsByRuleType(TypedDict, total=False): + dns: object + """Logging settings for DNS firewall.""" + + http: object + """Logging settings for HTTP/HTTPS firewall.""" + + l4: object + """Logging settings for Network firewall.""" diff --git a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b.py b/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b.py deleted file mode 100644 index cabc5f597ca..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b.py +++ /dev/null @@ -1,18 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import Optional - -from ...._models import BaseModel - -__all__ = ["UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b"] - - -class UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7b(BaseModel): - dns: Optional[object] = None - """Logging settings for DNS firewall.""" - - http: Optional[object] = None - """Logging settings for HTTP/HTTPS firewall.""" - - l4: Optional[object] = None - """Logging settings for Network firewall.""" diff --git a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b_param.py b/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b_param.py deleted file mode 100644 index 89e65eb906e..00000000000 --- a/src/cloudflare/types/zero_trust/gateway/unnamed_schema_ref_e86eeb84b7e922c35cfb0031a6309f7b_param.py +++ /dev/null @@ -1,18 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from __future__ import annotations - -from typing_extensions import TypedDict - -__all__ = ["UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam"] - - -class UnnamedSchemaRefE86eeb84b7e922c35cfb0031a6309f7bParam(TypedDict, total=False): - dns: object - """Logging settings for DNS firewall.""" - - http: object - """Logging settings for HTTP/HTTPS firewall.""" - - l4: object - """Logging settings for Network firewall.""" diff --git a/tests/api_resources/zero_trust/gateway/test_logging.py b/tests/api_resources/zero_trust/gateway/test_logging.py index 0472b550c3e..ff74fdec080 100644 --- a/tests/api_resources/zero_trust/gateway/test_logging.py +++ b/tests/api_resources/zero_trust/gateway/test_logging.py @@ -9,9 +9,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type -from cloudflare.types.zero_trust.gateway import ( - LoggingSetting, -) +from cloudflare.types.zero_trust.gateway import LoggingSetting base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")