Skip to content

fix(spec): define network zone asns/locations as arrays instead of allOf wrappers #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BinoyOza-okta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(spec): define network zone asns/locations as arrays instead of allOf wrappers #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/DynamicNetworkZone.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**asns** | [**DynamicNetworkZoneAllOfAsns**](DynamicNetworkZoneAllOfAsns.md) | | [optional]
**asns** | **List[str]** | An array of ASNs for a Network Zone | [optional]
**proxy_type** | **str** | The proxy type used for a Dynamic Network Zone | [optional]
**locations** | [**DynamicNetworkZoneAllOfLocations**](DynamicNetworkZoneAllOfLocations.md) | | [optional]
**locations** | [**List[NetworkZoneLocation]**](NetworkZoneLocation.md) | An array of geolocations for a Dynamic Network Zone | [optional]

## Example

Expand Down
28 changes: 0 additions & 28 deletions docs/DynamicNetworkZoneAllOfAsns.md
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions docs/DynamicNetworkZoneAllOfLocations.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docs/EnhancedDynamicNetworkZoneAllOfAsns.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ The list of ASNs associated with an Enhanced Dynamic Network Zone

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**include** | [**EnhancedDynamicNetworkZoneAllOfAsnsInclude**](EnhancedDynamicNetworkZoneAllOfAsnsInclude.md) | | [optional]
**exclude** | [**EnhancedDynamicNetworkZoneAllOfAsnsExclude**](EnhancedDynamicNetworkZoneAllOfAsnsExclude.md) | | [optional]
**include** | **List[str]** | An array of ASNs to include for an Enhanced Dynamic Network Zone | [optional]
**exclude** | **List[str]** | An array of ASNs to exclude for an Enhanced Dynamic Network Zone | [optional]

## Example

Expand Down
28 changes: 0 additions & 28 deletions docs/EnhancedDynamicNetworkZoneAllOfAsnsExclude.md
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions docs/EnhancedDynamicNetworkZoneAllOfAsnsInclude.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docs/EnhancedDynamicNetworkZoneAllOfLocations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ The list of geolocations to include or exclude for an Enhanced Dynamic Network Z

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**include** | [**EnhancedDynamicNetworkZoneAllOfLocationsInclude**](EnhancedDynamicNetworkZoneAllOfLocationsInclude.md) | | [optional]
**exclude** | [**EnhancedDynamicNetworkZoneAllOfLocationsExclude**](EnhancedDynamicNetworkZoneAllOfLocationsExclude.md) | | [optional]
**include** | [**List[NetworkZoneLocation]**](NetworkZoneLocation.md) | An array of geolocations to include for an Enhanced Dynamic Network Zone | [optional]
**exclude** | [**List[NetworkZoneLocation]**](NetworkZoneLocation.md) | An array of geolocations to exclude for an Enhanced Dynamic Network Zone | [optional]

## Example

Expand Down
28 changes: 0 additions & 28 deletions docs/EnhancedDynamicNetworkZoneAllOfLocationsExclude.md
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions docs/EnhancedDynamicNetworkZoneAllOfLocationsInclude.md
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions okta/DOC_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,8 +1184,6 @@ Class | Method | HTTP request | Description
- [DomainValidationStatus](docs/DomainValidationStatus.md)
- [Duration](docs/Duration.md)
- [DynamicNetworkZone](docs/DynamicNetworkZone.md)
- [DynamicNetworkZoneAllOfAsns](docs/DynamicNetworkZoneAllOfAsns.md)
- [DynamicNetworkZoneAllOfLocations](docs/DynamicNetworkZoneAllOfLocations.md)
- [ECKeyJWK](docs/ECKeyJWK.md)
- [EmailContent](docs/EmailContent.md)
- [EmailCustomization](docs/EmailCustomization.md)
Expand Down Expand Up @@ -1218,12 +1216,8 @@ Class | Method | HTTP request | Description
- [EndpointAuthMethod](docs/EndpointAuthMethod.md)
- [EnhancedDynamicNetworkZone](docs/EnhancedDynamicNetworkZone.md)
- [EnhancedDynamicNetworkZoneAllOfAsns](docs/EnhancedDynamicNetworkZoneAllOfAsns.md)
- [EnhancedDynamicNetworkZoneAllOfAsnsExclude](docs/EnhancedDynamicNetworkZoneAllOfAsnsExclude.md)
- [EnhancedDynamicNetworkZoneAllOfAsnsInclude](docs/EnhancedDynamicNetworkZoneAllOfAsnsInclude.md)
- [EnhancedDynamicNetworkZoneAllOfIpServiceCategories](docs/EnhancedDynamicNetworkZoneAllOfIpServiceCategories.md)
- [EnhancedDynamicNetworkZoneAllOfLocations](docs/EnhancedDynamicNetworkZoneAllOfLocations.md)
- [EnhancedDynamicNetworkZoneAllOfLocationsExclude](docs/EnhancedDynamicNetworkZoneAllOfLocationsExclude.md)
- [EnhancedDynamicNetworkZoneAllOfLocationsInclude](docs/EnhancedDynamicNetworkZoneAllOfLocationsInclude.md)
- [EnrollmentActivationRequest](docs/EnrollmentActivationRequest.md)
- [EnrollmentActivationResponse](docs/EnrollmentActivationResponse.md)
- [EnrollmentInitializationRequest](docs/EnrollmentInitializationRequest.md)
Expand Down
6 changes: 0 additions & 6 deletions okta/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,6 @@
"DomainValidationStatus": "okta.models.domain_validation_status",
"Duration": "okta.models.duration",
"DynamicNetworkZone": "okta.models.dynamic_network_zone",
"DynamicNetworkZoneAllOfAsns": "okta.models.dynamic_network_zone_all_of_asns",
"DynamicNetworkZoneAllOfLocations": "okta.models.dynamic_network_zone_all_of_locations",
"ECKeyJWK": "okta.models.ec_key_jwk",
"EmailContent": "okta.models.email_content",
"EmailCustomization": "okta.models.email_customization",
Expand Down Expand Up @@ -674,12 +672,8 @@
"EndpointAuthMethod": "okta.models.endpoint_auth_method",
"EnhancedDynamicNetworkZone": "okta.models.enhanced_dynamic_network_zone",
"EnhancedDynamicNetworkZoneAllOfAsns": "okta.models.enhanced_dynamic_network_zone_all_of_asns",
"EnhancedDynamicNetworkZoneAllOfAsnsExclude": "okta.models.enhanced_dynamic_network_zone_all_of_asns_exclude",
"EnhancedDynamicNetworkZoneAllOfAsnsInclude": "okta.models.enhanced_dynamic_network_zone_all_of_asns_include",
"EnhancedDynamicNetworkZoneAllOfIpServiceCategories": "okta.models.enhanced_dynamic_network_zone_all_of_ip_service_categories",
"EnhancedDynamicNetworkZoneAllOfLocations": "okta.models.enhanced_dynamic_network_zone_all_of_locations",
"EnhancedDynamicNetworkZoneAllOfLocationsExclude": "okta.models.enhanced_dynamic_network_zone_all_of_locations_exclude",
"EnhancedDynamicNetworkZoneAllOfLocationsInclude": "okta.models.enhanced_dynamic_network_zone_all_of_locations_include",
"EnrollmentActivationRequest": "okta.models.enrollment_activation_request",
"EnrollmentActivationResponse": "okta.models.enrollment_activation_response",
"EnrollmentInitializationRequest": "okta.models.enrollment_initialization_request",
Expand Down
6 changes: 0 additions & 6 deletions okta/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,8 +841,6 @@
"DomainValidationStatus": "okta.models.domain_validation_status",
"Duration": "okta.models.duration",
"DynamicNetworkZone": "okta.models.dynamic_network_zone",
"DynamicNetworkZoneAllOfAsns": "okta.models.dynamic_network_zone_all_of_asns",
"DynamicNetworkZoneAllOfLocations": "okta.models.dynamic_network_zone_all_of_locations",
"ECKeyJWK": "okta.models.ec_key_jwk",
"EmailContent": "okta.models.email_content",
"EmailCustomization": "okta.models.email_customization",
Expand Down Expand Up @@ -876,12 +874,8 @@
"EndpointAuthMethod": "okta.models.endpoint_auth_method",
"EnhancedDynamicNetworkZone": "okta.models.enhanced_dynamic_network_zone",
"EnhancedDynamicNetworkZoneAllOfAsns": "okta.models.enhanced_dynamic_network_zone_all_of_asns",
"EnhancedDynamicNetworkZoneAllOfAsnsExclude": "okta.models.enhanced_dynamic_network_zone_all_of_asns_exclude",
"EnhancedDynamicNetworkZoneAllOfAsnsInclude": "okta.models.enhanced_dynamic_network_zone_all_of_asns_include",
"EnhancedDynamicNetworkZoneAllOfIpServiceCategories": "okta.models.enhanced_dynamic_network_zone_all_of_ip_service_categories",
"EnhancedDynamicNetworkZoneAllOfLocations": "okta.models.enhanced_dynamic_network_zone_all_of_locations",
"EnhancedDynamicNetworkZoneAllOfLocationsExclude": "okta.models.enhanced_dynamic_network_zone_all_of_locations_exclude",
"EnhancedDynamicNetworkZoneAllOfLocationsInclude": "okta.models.enhanced_dynamic_network_zone_all_of_locations_include",
"EnrollmentActivationRequest": "okta.models.enrollment_activation_request",
"EnrollmentActivationResponse": "okta.models.enrollment_activation_response",
"EnrollmentInitializationRequest": "okta.models.enrollment_initialization_request",
Expand Down
43 changes: 19 additions & 24 deletions okta/models/dynamic_network_zone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,27 @@
from pydantic import ConfigDict, Field, StrictStr, field_validator
from typing_extensions import Self

from okta.models.dynamic_network_zone_all_of_asns import DynamicNetworkZoneAllOfAsns
from okta.models.dynamic_network_zone_all_of_locations import (
DynamicNetworkZoneAllOfLocations,
)
from okta.models.links_self_and_lifecycle import LinksSelfAndLifecycle
from okta.models.network_zone import NetworkZone
from okta.models.network_zone_location import NetworkZoneLocation


class DynamicNetworkZone(NetworkZone):
"""
DynamicNetworkZone
""" # noqa: E501

asns: Optional[DynamicNetworkZoneAllOfAsns] = None
asns: Optional[List[StrictStr]] = Field(
default=None, description="An array of ASNs for a Network Zone"
)
proxy_type: Optional[StrictStr] = Field(
default=None,
description="The proxy type used for a Dynamic Network Zone",
alias="proxyType",
)
locations: Optional[DynamicNetworkZoneAllOfLocations] = None
locations: Optional[List[NetworkZoneLocation]] = Field(
default=None, description="An array of geolocations for a Dynamic Network Zone"
)
__properties: ClassVar[List[str]] = [
"created",
"id",
Expand Down Expand Up @@ -122,19 +123,17 @@ def to_dict(self) -> Dict[str, Any]:
else:
_dict["_links"] = self.links

# override the default output from pydantic by calling `to_dict()` of asns
if self.asns:
if not isinstance(self.asns, dict):
_dict["asns"] = self.asns.to_dict()
else:
_dict["asns"] = self.asns

# override the default output from pydantic by calling `to_dict()` of locations
# override the default output from pydantic by calling `to_dict()` of each item in locations (list)
_items = []
if self.locations:
if not isinstance(self.locations, dict):
_dict["locations"] = self.locations.to_dict()
else:
_dict["locations"] = self.locations
for _item in self.locations:
if _item:
_items.append(_item.to_dict())
_dict["locations"] = _items
# set to None if locations (nullable) is None
# and model_fields_set contains the field
if self.locations is None and "locations" in self.model_fields_set:
_dict["locations"] = None

return _dict

Expand Down Expand Up @@ -162,14 +161,10 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
if obj.get("_links") is not None
else None
),
"asns": (
DynamicNetworkZoneAllOfAsns.from_dict(obj["asns"])
if obj.get("asns") is not None
else None
),
"asns": obj.get("asns"),
"proxyType": obj.get("proxyType"),
"locations": (
DynamicNetworkZoneAllOfLocations.from_dict(obj["locations"])
[NetworkZoneLocation.from_dict(_item) for _item in obj["locations"]]
if obj.get("locations") is not None
else None
),
Expand Down
Loading
Loading