diff --git a/sdk/nginx/azure-mgmt-nginx/_meta.json b/sdk/nginx/azure-mgmt-nginx/_meta.json
index fb681322e18f..cf7e241b8417 100644
--- a/sdk/nginx/azure-mgmt-nginx/_meta.json
+++ b/sdk/nginx/azure-mgmt-nginx/_meta.json
@@ -1,11 +1,11 @@
{
- "commit": "cf5ad1932d00c7d15497705ad6b71171d3d68b1e",
+ "commit": "581ae0f7d30b8a0c1221d5ea2181d0fb27570443",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
- "autorest": "3.9.7",
+ "autorest": "3.10.2",
"use": [
- "@autorest/python@6.7.1",
- "@autorest/modelerfour@4.26.2"
+ "@autorest/python@6.27.4",
+ "@autorest/modelerfour@4.27.0"
],
- "autorest_command": "autorest specification/nginx/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --tag=package-2024-01-01-preview --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
+ "autorest_command": "autorest specification/nginx/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
"readme": "specification/nginx/resource-manager/readme.md"
}
\ No newline at end of file
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/__init__.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/__init__.py
index 19d279801601..5e32e9567fbe 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/__init__.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/__init__.py
@@ -5,15 +5,21 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._nginx_management_client import NginxManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._nginx_management_client import NginxManagementClient # type: ignore
from ._version import VERSION
__version__ = VERSION
try:
from ._patch import __all__ as _patch_all
- from ._patch import * # pylint: disable=unused-wildcard-import
+ from ._patch import *
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk
@@ -21,6 +27,6 @@
__all__ = [
"NginxManagementClient",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_configuration.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_configuration.py
index 21c7bd4ee8b8..56f0a070f8e5 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_configuration.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_configuration.py
@@ -8,18 +8,16 @@
from typing import Any, TYPE_CHECKING
-from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
from ._version import VERSION
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class NginxManagementClientConfiguration: # pylint: disable=too-many-instance-attributes
"""Configuration for NginxManagementClient.
Note that all parameters used to create this instance are saved as instance
@@ -27,16 +25,15 @@ class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
- :param subscription_id: The ID of the target subscription. Required.
+ :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
- :keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
+ :keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
"""
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(NginxManagementClientConfiguration, self).__init__(**kwargs)
- api_version: str = kwargs.pop("api_version", "2024-01-01-preview")
+ api_version: str = kwargs.pop("api_version", "2024-11-01-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "mgmt-nginx/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
- self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+ self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
if self.credential and not self.authentication_policy:
self.authentication_policy = ARMChallengeAuthenticationPolicy(
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_nginx_management_client.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_nginx_management_client.py
index f4beeccad832..bad67fdda2bf 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_nginx_management_client.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_nginx_management_client.py
@@ -8,23 +8,33 @@
from copy import deepcopy
from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from . import models as _models
from ._configuration import NginxManagementClientConfiguration
from ._serialization import Deserializer, Serializer
-from .operations import CertificatesOperations, ConfigurationsOperations, DeploymentsOperations, Operations
+from .operations import (
+ ApiKeysOperations,
+ CertificatesOperations,
+ ConfigurationsOperations,
+ DeploymentsOperations,
+ Operations,
+)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class NginxManagementClient: # pylint: disable=client-accepts-api-version-keyword
+class NginxManagementClient:
"""NginxManagementClient.
+ :ivar api_keys: ApiKeysOperations operations
+ :vartype api_keys: azure.mgmt.nginx.operations.ApiKeysOperations
:ivar certificates: CertificatesOperations operations
:vartype certificates: azure.mgmt.nginx.operations.CertificatesOperations
:ivar configurations: ConfigurationsOperations operations
@@ -35,11 +45,11 @@ class NginxManagementClient: # pylint: disable=client-accepts-api-version-keywo
:vartype operations: azure.mgmt.nginx.operations.Operations
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
- :param subscription_id: The ID of the target subscription. Required.
+ :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
- :keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
+ :keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -56,18 +66,37 @@ def __init__(
self._config = NginxManagementClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
+ self.api_keys = ApiKeysOperations(self._client, self._config, self._serialize, self._deserialize)
self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize)
self.configurations = ConfigurationsOperations(self._client, self._config, self._serialize, self._deserialize)
self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
- def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
+ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
"""Runs the network request through the client's chained policies.
>>> from azure.core.rest import HttpRequest
@@ -87,12 +116,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
- return self._client.send_request(request_copy, **kwargs)
+ return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
def close(self) -> None:
self._client.close()
- def __enter__(self) -> "NginxManagementClient":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_patch.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_patch.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_serialization.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_serialization.py
index 4bae2292227b..b24ab2885450 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_serialization.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_serialization.py
@@ -1,3 +1,4 @@
+# pylint: disable=too-many-lines
# --------------------------------------------------------------------------
#
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -24,7 +25,6 @@
#
# --------------------------------------------------------------------------
-# pylint: skip-file
# pyright: reportUnnecessaryTypeIgnoreComment=false
from base64 import b64decode, b64encode
@@ -52,7 +52,6 @@
MutableMapping,
Type,
List,
- Mapping,
)
try:
@@ -63,8 +62,8 @@
import isodate # type: ignore
-from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback
-from azure.core.serialization import NULL as AzureCoreNull
+from azure.core.exceptions import DeserializationError, SerializationError
+from azure.core.serialization import NULL as CoreNull
_BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
@@ -91,6 +90,8 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type:
:param data: Input, could be bytes or stream (will be decoded with UTF8) or text
:type data: str or bytes or IO
:param str content_type: The content type.
+ :return: The deserialized data.
+ :rtype: object
"""
if hasattr(data, "read"):
# Assume a stream
@@ -112,7 +113,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type:
try:
return json.loads(data_as_str)
except ValueError as err:
- raise DeserializationError("JSON is invalid: {}".format(err), err)
+ raise DeserializationError("JSON is invalid: {}".format(err), err) from err
elif "xml" in (content_type or []):
try:
@@ -124,7 +125,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type:
pass
return ET.fromstring(data_as_str) # nosec
- except ET.ParseError:
+ except ET.ParseError as err:
# It might be because the server has an issue, and returned JSON with
# content-type XML....
# So let's try a JSON load, and if it's still broken
@@ -143,7 +144,9 @@ def _json_attemp(data):
# The function hack is because Py2.7 messes up with exception
# context otherwise.
_LOGGER.critical("Wasn't XML not JSON, failing")
- raise_with_traceback(DeserializationError, "XML is invalid")
+ raise DeserializationError("XML is invalid") from err
+ elif content_type.startswith("text/"):
+ return data_as_str
raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
@classmethod
@@ -153,6 +156,11 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]],
Use bytes and headers to NOT use any requests/aiohttp or whatever
specific implementation.
Headers will tested for "content-type"
+
+ :param bytes body_bytes: The body of the response.
+ :param dict headers: The headers of the response.
+ :returns: The deserialized data.
+ :rtype: object
"""
# Try to use content-type from headers if available
content_type = None
@@ -170,13 +178,6 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]],
return None
-try:
- basestring # type: ignore
- unicode_str = unicode # type: ignore
-except NameError:
- basestring = str
- unicode_str = str
-
_LOGGER = logging.getLogger(__name__)
try:
@@ -189,15 +190,30 @@ class UTC(datetime.tzinfo):
"""Time Zone info for handling UTC"""
def utcoffset(self, dt):
- """UTF offset for UTC is 0."""
+ """UTF offset for UTC is 0.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The offset
+ :rtype: datetime.timedelta
+ """
return datetime.timedelta(0)
def tzname(self, dt):
- """Timestamp representation."""
+ """Timestamp representation.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The timestamp representation
+ :rtype: str
+ """
return "Z"
def dst(self, dt):
- """No daylight saving for UTC."""
+ """No daylight saving for UTC.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The daylight saving time
+ :rtype: datetime.timedelta
+ """
return datetime.timedelta(hours=1)
@@ -211,7 +227,7 @@ class _FixedOffset(datetime.tzinfo): # type: ignore
:param datetime.timedelta offset: offset in timedelta format
"""
- def __init__(self, offset):
+ def __init__(self, offset) -> None:
self.__offset = offset
def utcoffset(self, dt):
@@ -240,24 +256,26 @@ def __getinitargs__(self):
_FLATTEN = re.compile(r"(? None:
- self.additional_properties: Dict[str, Any] = {}
- for k in kwargs:
+ self.additional_properties: Optional[Dict[str, Any]] = {}
+ for k in kwargs: # pylint: disable=consider-using-dict-items
if k not in self._attribute_map:
_LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
elif k in self._validation and self._validation[k].get("readonly", False):
@@ -305,13 +330,23 @@ def __init__(self, **kwargs: Any) -> None:
setattr(self, k, kwargs[k])
def __eq__(self, other: Any) -> bool:
- """Compare objects by comparing all attributes."""
+ """Compare objects by comparing all attributes.
+
+ :param object other: The object to compare
+ :returns: True if objects are equal
+ :rtype: bool
+ """
if isinstance(other, self.__class__):
return self.__dict__ == other.__dict__
return False
def __ne__(self, other: Any) -> bool:
- """Compare objects by comparing all attributes."""
+ """Compare objects by comparing all attributes.
+
+ :param object other: The object to compare
+ :returns: True if objects are not equal
+ :rtype: bool
+ """
return not self.__eq__(other)
def __str__(self) -> str:
@@ -331,7 +366,11 @@ def is_xml_model(cls) -> bool:
@classmethod
def _create_xml_node(cls):
- """Create XML node."""
+ """Create XML node.
+
+ :returns: The XML node
+ :rtype: xml.etree.ElementTree.Element
+ """
try:
xml_map = cls._xml_map # type: ignore
except AttributeError:
@@ -340,7 +379,7 @@ def _create_xml_node(cls):
return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None))
def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON:
- """Return the JSON that would be sent to azure from this model.
+ """Return the JSON that would be sent to server from this model.
This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`.
@@ -351,7 +390,9 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON:
:rtype: dict
"""
serializer = Serializer(self._infer_class_models())
- return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs)
+ return serializer._serialize( # type: ignore # pylint: disable=protected-access
+ self, keep_readonly=keep_readonly, **kwargs
+ )
def as_dict(
self,
@@ -385,12 +426,15 @@ def my_key_transformer(key, attr_desc, value):
If you want XML serialization, you can pass the kwargs is_xml=True.
+ :param bool keep_readonly: If you want to serialize the readonly attributes
:param function key_transformer: A key transformer function.
:returns: A dict JSON compatible object
:rtype: dict
"""
serializer = Serializer(self._infer_class_models())
- return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs)
+ return serializer._serialize( # type: ignore # pylint: disable=protected-access
+ self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs
+ )
@classmethod
def _infer_class_models(cls):
@@ -400,7 +444,7 @@ def _infer_class_models(cls):
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
if cls.__name__ not in client_models:
raise ValueError("Not Autorest generated code")
- except Exception:
+ except Exception: # pylint: disable=broad-exception-caught
# Assume it's not Autorest generated (tests?). Add ourselves as dependencies.
client_models = {cls.__name__: cls}
return client_models
@@ -413,9 +457,10 @@ def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = N
:param str content_type: JSON by default, set application/xml if XML.
:returns: An instance of this model
:raises: DeserializationError if something went wrong
+ :rtype: ModelType
"""
deserializer = Deserializer(cls._infer_class_models())
- return deserializer(cls.__name__, data, content_type=content_type)
+ return deserializer(cls.__name__, data, content_type=content_type) # type: ignore
@classmethod
def from_dict(
@@ -431,9 +476,11 @@ def from_dict(
and last_rest_key_case_insensitive_extractor)
:param dict data: A dict using RestAPI structure
+ :param function key_extractors: A key extractor function.
:param str content_type: JSON by default, set application/xml if XML.
:returns: An instance of this model
:raises: DeserializationError if something went wrong
+ :rtype: ModelType
"""
deserializer = Deserializer(cls._infer_class_models())
deserializer.key_extractors = ( # type: ignore
@@ -445,7 +492,7 @@ def from_dict(
if key_extractors is None
else key_extractors
)
- return deserializer(cls.__name__, data, content_type=content_type)
+ return deserializer(cls.__name__, data, content_type=content_type) # type: ignore
@classmethod
def _flatten_subtype(cls, key, objects):
@@ -453,21 +500,25 @@ def _flatten_subtype(cls, key, objects):
return {}
result = dict(cls._subtype_map[key])
for valuetype in cls._subtype_map[key].values():
- result.update(objects[valuetype]._flatten_subtype(key, objects))
+ result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access
return result
@classmethod
def _classify(cls, response, objects):
"""Check the class _subtype_map for any child classes.
We want to ignore any inherited _subtype_maps.
- Remove the polymorphic key from the initial data.
+
+ :param dict response: The initial data
+ :param dict objects: The class objects
+ :returns: The class to be used
+ :rtype: class
"""
for subtype_key in cls.__dict__.get("_subtype_map", {}).keys():
subtype_value = None
if not isinstance(response, ET.Element):
rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1]
- subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None)
+ subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None)
else:
subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response)
if subtype_value:
@@ -506,11 +557,13 @@ def _decode_attribute_map_key(key):
inside the received data.
:param str key: A key string from the generated code
+ :returns: The decoded key
+ :rtype: str
"""
return key.replace("\\.", ".")
-class Serializer(object):
+class Serializer: # pylint: disable=too-many-public-methods
"""Request object model serializer."""
basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
@@ -545,7 +598,7 @@ class Serializer(object):
"multiple": lambda x, y: x % y != 0,
}
- def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
+ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
self.serialize_type = {
"iso-8601": Serializer.serialize_iso,
"rfc-1123": Serializer.serialize_rfc,
@@ -561,17 +614,20 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
"[]": self.serialize_iter,
"{}": self.serialize_dict,
}
- self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
+ self.dependencies: Dict[str, type] = dict(classes) if classes else {}
self.key_transformer = full_restapi_key_transformer
self.client_side_validation = True
- def _serialize(self, target_obj, data_type=None, **kwargs):
+ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals
+ self, target_obj, data_type=None, **kwargs
+ ):
"""Serialize data into a string according to type.
- :param target_obj: The data to be serialized.
+ :param object target_obj: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str, dict
:raises: SerializationError if serialization fails.
+ :returns: The serialized data.
"""
key_transformer = kwargs.get("key_transformer", self.key_transformer)
keep_readonly = kwargs.get("keep_readonly", False)
@@ -597,12 +653,14 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
serialized = {}
if is_xml_model_serialization:
- serialized = target_obj._create_xml_node()
+ serialized = target_obj._create_xml_node() # pylint: disable=protected-access
try:
- attributes = target_obj._attribute_map
+ attributes = target_obj._attribute_map # pylint: disable=protected-access
for attr, attr_desc in attributes.items():
attr_name = attr
- if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False):
+ if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access
+ attr_name, {}
+ ).get("readonly", False):
continue
if attr_name == "additional_properties" and attr_desc["key"] == "":
@@ -638,7 +696,8 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
if isinstance(new_attr, list):
serialized.extend(new_attr) # type: ignore
elif isinstance(new_attr, ET.Element):
- # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces.
+ # If the down XML has no XML/Name,
+ # we MUST replace the tag with the local tag. But keeping the namespaces.
if "name" not in getattr(orig_attr, "_xml_map", {}):
splitted_tag = new_attr.tag.split("}")
if len(splitted_tag) == 2: # Namespace
@@ -649,7 +708,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
else: # That's a basic type
# Integrate namespace if necessary
local_node = _create_xml_node(xml_name, xml_prefix, xml_ns)
- local_node.text = unicode_str(new_attr)
+ local_node.text = str(new_attr)
serialized.append(local_node) # type: ignore
else: # JSON
for k in reversed(keys): # type: ignore
@@ -668,18 +727,18 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
except (AttributeError, KeyError, TypeError) as err:
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
- raise_with_traceback(SerializationError, msg, err)
- else:
- return serialized
+ raise SerializationError(msg) from err
+ return serialized
def body(self, data, data_type, **kwargs):
"""Serialize data intended for a request body.
- :param data: The data to be serialized.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: dict
:raises: SerializationError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized request body
"""
# Just in case this is a dict
@@ -708,18 +767,20 @@ def body(self, data, data_type, **kwargs):
attribute_key_case_insensitive_extractor,
last_rest_key_case_insensitive_extractor,
]
- data = deserializer._deserialize(data_type, data)
+ data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access
except DeserializationError as err:
- raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err)
+ raise SerializationError("Unable to build a model: " + str(err)) from err
return self._serialize(data, data_type, **kwargs)
def url(self, name, data, data_type, **kwargs):
"""Serialize data intended for a URL path.
- :param data: The data to be serialized.
+ :param str name: The name of the URL path parameter.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str
+ :returns: The serialized URL path
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
"""
@@ -730,30 +791,30 @@ def url(self, name, data, data_type, **kwargs):
if kwargs.get("skip_quote") is True:
output = str(output)
+ output = output.replace("{", quote("{")).replace("}", quote("}"))
else:
output = quote(str(output), safe="")
- except SerializationError:
- raise TypeError("{} must be type {}.".format(name, data_type))
- else:
- return output
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return output
def query(self, name, data, data_type, **kwargs):
"""Serialize data intended for a URL query.
- :param data: The data to be serialized.
+ :param str name: The name of the query parameter.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
- :keyword bool skip_quote: Whether to skip quote the serialized result.
- Defaults to False.
- :rtype: str
+ :rtype: str, list
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized query parameter
"""
try:
# Treat the list aside, since we don't want to encode the div separator
if data_type.startswith("["):
internal_data_type = data_type[1:-1]
do_quote = not kwargs.get("skip_quote", False)
- return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
+ return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)
# Not a list, regular serialization
output = self.serialize_data(data, data_type, **kwargs)
@@ -763,19 +824,20 @@ def query(self, name, data, data_type, **kwargs):
output = str(output)
else:
output = quote(str(output), safe="")
- except SerializationError:
- raise TypeError("{} must be type {}.".format(name, data_type))
- else:
- return str(output)
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
def header(self, name, data, data_type, **kwargs):
"""Serialize data intended for a request header.
- :param data: The data to be serialized.
+ :param str name: The name of the header.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized header
"""
try:
if data_type in ["[str]"]:
@@ -784,32 +846,31 @@ def header(self, name, data, data_type, **kwargs):
output = self.serialize_data(data, data_type, **kwargs)
if data_type == "bool":
output = json.dumps(output)
- except SerializationError:
- raise TypeError("{} must be type {}.".format(name, data_type))
- else:
- return str(output)
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
def serialize_data(self, data, data_type, **kwargs):
"""Serialize generic data according to supplied data type.
- :param data: The data to be serialized.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
- :param bool required: Whether it's essential that the data not be
- empty or None
:raises: AttributeError if required data is None.
:raises: ValueError if data is None
:raises: SerializationError if serialization fails.
+ :returns: The serialized data.
+ :rtype: str, int, float, bool, dict, list
"""
if data is None:
raise ValueError("No value for given attribute")
try:
- if data is AzureCoreNull:
+ if data is CoreNull:
return None
if data_type in self.basic_types.values():
return self.serialize_basic(data, data_type, **kwargs)
- elif data_type in self.serialize_type:
+ if data_type in self.serialize_type:
return self.serialize_type[data_type](data, **kwargs)
# If dependencies is empty, try with current data class
@@ -824,12 +885,11 @@ def serialize_data(self, data, data_type, **kwargs):
except (ValueError, TypeError) as err:
msg = "Unable to serialize value: {!r} as type: {!r}."
- raise_with_traceback(SerializationError, msg.format(data, data_type), err)
- else:
- return self._serialize(data, **kwargs)
+ raise SerializationError(msg.format(data, data_type)) from err
+ return self._serialize(data, **kwargs)
@classmethod
- def _get_custom_serializers(cls, data_type, **kwargs):
+ def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements
custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type)
if custom_serializer:
return custom_serializer
@@ -845,23 +905,26 @@ def serialize_basic(cls, data, data_type, **kwargs):
- basic_types_serializers dict[str, callable] : If set, use the callable as serializer
- is_xml bool : If set, use xml_basic_types_serializers
- :param data: Object to be serialized.
+ :param obj data: Object to be serialized.
:param str data_type: Type of object in the iterable.
+ :rtype: str, int, float, bool
+ :return: serialized object
"""
custom_serializer = cls._get_custom_serializers(data_type, **kwargs)
if custom_serializer:
return custom_serializer(data)
if data_type == "str":
return cls.serialize_unicode(data)
- return eval(data_type)(data) # nosec
+ return eval(data_type)(data) # nosec # pylint: disable=eval-used
@classmethod
def serialize_unicode(cls, data):
"""Special handling for serializing unicode strings in Py2.
Encode to UTF-8 if unicode, otherwise handle as a str.
- :param data: Object to be serialized.
+ :param str data: Object to be serialized.
:rtype: str
+ :return: serialized object
"""
try: # If I received an enum, return its value
return data.value
@@ -875,8 +938,7 @@ def serialize_unicode(cls, data):
return data
except NameError:
return str(data)
- else:
- return str(data)
+ return str(data)
def serialize_iter(self, data, iter_type, div=None, **kwargs):
"""Serialize iterable.
@@ -886,15 +948,13 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
serialization_ctxt['type'] should be same as data_type.
- is_xml bool : If set, serialize as XML
- :param list attr: Object to be serialized.
+ :param list data: Object to be serialized.
:param str iter_type: Type of object in the iterable.
- :param bool required: Whether the objects in the iterable must
- not be None or empty.
:param str div: If set, this str will be used to combine the elements
in the iterable into a combined string. Default is 'None'.
- :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
Defaults to False.
:rtype: list, str
+ :return: serialized iterable
"""
if isinstance(data, str):
raise SerializationError("Refuse str type as a valid iter type.")
@@ -949,9 +1009,8 @@ def serialize_dict(self, attr, dict_type, **kwargs):
:param dict attr: Object to be serialized.
:param str dict_type: Type of object in the dictionary.
- :param bool required: Whether the objects in the dictionary must
- not be None or empty.
:rtype: dict
+ :return: serialized dictionary
"""
serialization_ctxt = kwargs.get("serialization_ctxt", {})
serialized = {}
@@ -975,7 +1034,7 @@ def serialize_dict(self, attr, dict_type, **kwargs):
return serialized
- def serialize_object(self, attr, **kwargs):
+ def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements
"""Serialize a generic object.
This will be handled as a dictionary. If object passed in is not
a basic type (str, int, float, dict, list) it will simply be
@@ -983,6 +1042,7 @@ def serialize_object(self, attr, **kwargs):
:param dict attr: Object to be serialized.
:rtype: dict or str
+ :return: serialized object
"""
if attr is None:
return None
@@ -993,7 +1053,7 @@ def serialize_object(self, attr, **kwargs):
return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs)
if obj_type is _long_type:
return self.serialize_long(attr)
- if obj_type is unicode_str:
+ if obj_type is str:
return self.serialize_unicode(attr)
if obj_type is datetime.datetime:
return self.serialize_iso(attr)
@@ -1007,7 +1067,7 @@ def serialize_object(self, attr, **kwargs):
return self.serialize_decimal(attr)
# If it's a model or I know this dependency, serialize as a Model
- elif obj_type in self.dependencies.values() or isinstance(attr, Model):
+ if obj_type in self.dependencies.values() or isinstance(attr, Model):
return self._serialize(attr)
if obj_type == dict:
@@ -1038,56 +1098,61 @@ def serialize_enum(attr, enum_obj=None):
try:
enum_obj(result) # type: ignore
return result
- except ValueError:
+ except ValueError as exc:
for enum_value in enum_obj: # type: ignore
if enum_value.value.lower() == str(attr).lower():
return enum_value.value
error = "{!r} is not valid value for enum {!r}"
- raise SerializationError(error.format(attr, enum_obj))
+ raise SerializationError(error.format(attr, enum_obj)) from exc
@staticmethod
- def serialize_bytearray(attr, **kwargs):
+ def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize bytearray into base-64 string.
- :param attr: Object to be serialized.
+ :param str attr: Object to be serialized.
:rtype: str
+ :return: serialized base64
"""
return b64encode(attr).decode()
@staticmethod
- def serialize_base64(attr, **kwargs):
+ def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize str into base-64 string.
- :param attr: Object to be serialized.
+ :param str attr: Object to be serialized.
:rtype: str
+ :return: serialized base64
"""
encoded = b64encode(attr).decode("ascii")
return encoded.strip("=").replace("+", "-").replace("/", "_")
@staticmethod
- def serialize_decimal(attr, **kwargs):
+ def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Decimal object to float.
- :param attr: Object to be serialized.
+ :param decimal attr: Object to be serialized.
:rtype: float
+ :return: serialized decimal
"""
return float(attr)
@staticmethod
- def serialize_long(attr, **kwargs):
+ def serialize_long(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize long (Py2) or int (Py3).
- :param attr: Object to be serialized.
+ :param int attr: Object to be serialized.
:rtype: int/long
+ :return: serialized long
"""
return _long_type(attr)
@staticmethod
- def serialize_date(attr, **kwargs):
+ def serialize_date(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Date object into ISO-8601 formatted string.
:param Date attr: Object to be serialized.
:rtype: str
+ :return: serialized date
"""
if isinstance(attr, str):
attr = isodate.parse_date(attr)
@@ -1095,11 +1160,12 @@ def serialize_date(attr, **kwargs):
return t
@staticmethod
- def serialize_time(attr, **kwargs):
+ def serialize_time(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Time object into ISO-8601 formatted string.
:param datetime.time attr: Object to be serialized.
:rtype: str
+ :return: serialized time
"""
if isinstance(attr, str):
attr = isodate.parse_time(attr)
@@ -1109,30 +1175,32 @@ def serialize_time(attr, **kwargs):
return t
@staticmethod
- def serialize_duration(attr, **kwargs):
+ def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize TimeDelta object into ISO-8601 formatted string.
:param TimeDelta attr: Object to be serialized.
:rtype: str
+ :return: serialized duration
"""
if isinstance(attr, str):
attr = isodate.parse_duration(attr)
return isodate.duration_isoformat(attr)
@staticmethod
- def serialize_rfc(attr, **kwargs):
+ def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into RFC-1123 formatted string.
:param Datetime attr: Object to be serialized.
:rtype: str
:raises: TypeError if format invalid.
+ :return: serialized rfc
"""
try:
if not attr.tzinfo:
_LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
utc = attr.utctimetuple()
- except AttributeError:
- raise TypeError("RFC1123 object must be valid Datetime object.")
+ except AttributeError as exc:
+ raise TypeError("RFC1123 object must be valid Datetime object.") from exc
return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format(
Serializer.days[utc.tm_wday],
@@ -1145,12 +1213,13 @@ def serialize_rfc(attr, **kwargs):
)
@staticmethod
- def serialize_iso(attr, **kwargs):
+ def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into ISO-8601 formatted string.
:param Datetime attr: Object to be serialized.
:rtype: str
:raises: SerializationError if format invalid.
+ :return: serialized iso
"""
if isinstance(attr, str):
attr = isodate.parse_datetime(attr)
@@ -1170,19 +1239,20 @@ def serialize_iso(attr, **kwargs):
return date + microseconds + "Z"
except (ValueError, OverflowError) as err:
msg = "Unable to serialize datetime object."
- raise_with_traceback(SerializationError, msg, err)
+ raise SerializationError(msg) from err
except AttributeError as err:
msg = "ISO-8601 object must be valid Datetime object."
- raise_with_traceback(TypeError, msg, err)
+ raise TypeError(msg) from err
@staticmethod
- def serialize_unix(attr, **kwargs):
+ def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into IntTime format.
This is represented as seconds.
:param Datetime attr: Object to be serialized.
:rtype: int
:raises: SerializationError if format invalid
+ :return: serialied unix
"""
if isinstance(attr, int):
return attr
@@ -1190,11 +1260,11 @@ def serialize_unix(attr, **kwargs):
if not attr.tzinfo:
_LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
return int(calendar.timegm(attr.utctimetuple()))
- except AttributeError:
- raise TypeError("Unix time object must be valid Datetime object.")
+ except AttributeError as exc:
+ raise TypeError("Unix time object must be valid Datetime object.") from exc
-def rest_key_extractor(attr, attr_desc, data):
+def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
key = attr_desc["key"]
working_data = data
@@ -1209,14 +1279,15 @@ def rest_key_extractor(attr, attr_desc, data):
if working_data is None:
# If at any point while following flatten JSON path see None, it means
# that all properties under are None as well
- # https://github.com/Azure/msrest-for-python/issues/197
return None
key = ".".join(dict_keys[1:])
return working_data.get(key)
-def rest_key_case_insensitive_extractor(attr, attr_desc, data):
+def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements
+ attr, attr_desc, data
+):
key = attr_desc["key"]
working_data = data
@@ -1230,7 +1301,6 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data):
if working_data is None:
# If at any point while following flatten JSON path see None, it means
# that all properties under are None as well
- # https://github.com/Azure/msrest-for-python/issues/197
return None
key = ".".join(dict_keys[1:])
@@ -1238,17 +1308,29 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data):
return attribute_key_case_insensitive_extractor(key, None, working_data)
-def last_rest_key_extractor(attr, attr_desc, data):
- """Extract the attribute in "data" based on the last part of the JSON path key."""
+def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
+ """Extract the attribute in "data" based on the last part of the JSON path key.
+
+ :param str attr: The attribute to extract
+ :param dict attr_desc: The attribute description
+ :param dict data: The data to extract from
+ :rtype: object
+ :returns: The extracted attribute
+ """
key = attr_desc["key"]
dict_keys = _FLATTEN.split(key)
return attribute_key_extractor(dict_keys[-1], None, data)
-def last_rest_key_case_insensitive_extractor(attr, attr_desc, data):
+def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
"""Extract the attribute in "data" based on the last part of the JSON path key.
This is the case insensitive version of "last_rest_key_extractor"
+ :param str attr: The attribute to extract
+ :param dict attr_desc: The attribute description
+ :param dict data: The data to extract from
+ :rtype: object
+ :returns: The extracted attribute
"""
key = attr_desc["key"]
dict_keys = _FLATTEN.split(key)
@@ -1285,7 +1367,7 @@ def _extract_name_from_internal_type(internal_type):
return xml_name
-def xml_key_extractor(attr, attr_desc, data):
+def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements
if isinstance(data, dict):
return None
@@ -1337,22 +1419,21 @@ def xml_key_extractor(attr, attr_desc, data):
if is_iter_type:
if is_wrapped:
return None # is_wrapped no node, we want None
- else:
- return [] # not wrapped, assume empty list
+ return [] # not wrapped, assume empty list
return None # Assume it's not there, maybe an optional node.
# If is_iter_type and not wrapped, return all found children
if is_iter_type:
if not is_wrapped:
return children
- else: # Iter and wrapped, should have found one node only (the wrap one)
- if len(children) != 1:
- raise DeserializationError(
- "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(
- xml_name
- )
+ # Iter and wrapped, should have found one node only (the wrap one)
+ if len(children) != 1:
+ raise DeserializationError(
+ "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( # pylint: disable=line-too-long
+ xml_name
)
- return list(children[0]) # Might be empty list and that's ok.
+ )
+ return list(children[0]) # Might be empty list and that's ok.
# Here it's not a itertype, we should have found one element only or empty
if len(children) > 1:
@@ -1360,7 +1441,7 @@ def xml_key_extractor(attr, attr_desc, data):
return children[0]
-class Deserializer(object):
+class Deserializer:
"""Response object model deserializer.
:param dict classes: Class type dictionary for deserializing complex types.
@@ -1369,9 +1450,9 @@ class Deserializer(object):
basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
- valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
+ valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
- def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
+ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
self.deserialize_type = {
"iso-8601": Deserializer.deserialize_iso,
"rfc-1123": Deserializer.deserialize_rfc,
@@ -1391,7 +1472,7 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None):
"duration": (isodate.Duration, datetime.timedelta),
"iso-8601": (datetime.datetime),
}
- self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
+ self.dependencies: Dict[str, type] = dict(classes) if classes else {}
self.key_extractors = [rest_key_extractor, xml_key_extractor]
# Additional properties only works if the "rest_key_extractor" is used to
# extract the keys. Making it to work whatever the key extractor is too much
@@ -1409,11 +1490,12 @@ def __call__(self, target_obj, response_data, content_type=None):
:param str content_type: Swagger "produces" if available.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
data = self._unpack_content(response_data, content_type)
return self._deserialize(target_obj, data)
- def _deserialize(self, target_obj, data):
+ def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements
"""Call the deserializer on a model.
Data needs to be already deserialized as JSON or XML ElementTree
@@ -1422,12 +1504,13 @@ def _deserialize(self, target_obj, data):
:param object data: Object to deserialize.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
# This is already a model, go recursive just in case
if hasattr(data, "_attribute_map"):
constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")]
try:
- for attr, mapconfig in data._attribute_map.items():
+ for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access
if attr in constants:
continue
value = getattr(data, attr)
@@ -1444,15 +1527,15 @@ def _deserialize(self, target_obj, data):
response, class_name = self._classify_target(target_obj, data)
- if isinstance(response, basestring):
+ if isinstance(response, str):
return self.deserialize_data(data, response)
- elif isinstance(response, type) and issubclass(response, Enum):
+ if isinstance(response, type) and issubclass(response, Enum):
return self.deserialize_enum(data, response)
- if data is None:
+ if data is None or data is CoreNull:
return data
try:
- attributes = response._attribute_map # type: ignore
+ attributes = response._attribute_map # type: ignore # pylint: disable=protected-access
d_attrs = {}
for attr, attr_desc in attributes.items():
# Check empty string. If it's not empty, someone has a real "additionalProperties"...
@@ -1481,10 +1564,9 @@ def _deserialize(self, target_obj, data):
d_attrs[attr] = value
except (AttributeError, TypeError, KeyError) as err:
msg = "Unable to deserialize to object: " + class_name # type: ignore
- raise_with_traceback(DeserializationError, msg, err)
- else:
- additional_properties = self._build_additional_properties(attributes, data)
- return self._instantiate_model(response, d_attrs, additional_properties)
+ raise DeserializationError(msg) from err
+ additional_properties = self._build_additional_properties(attributes, data)
+ return self._instantiate_model(response, d_attrs, additional_properties)
def _build_additional_properties(self, attribute_map, data):
if not self.additional_properties_detection:
@@ -1511,18 +1593,20 @@ def _classify_target(self, target, data):
:param str target: The target object type to deserialize to.
:param str/dict data: The response data to deserialize.
+ :return: The classified target object and its class name.
+ :rtype: tuple
"""
if target is None:
return None, None
- if isinstance(target, basestring):
+ if isinstance(target, str):
try:
target = self.dependencies[target]
except KeyError:
return target, target
try:
- target = target._classify(data, self.dependencies)
+ target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access
except AttributeError:
pass # Target is not a Model, no classify
return target, target.__class__.__name__ # type: ignore
@@ -1537,10 +1621,12 @@ def failsafe_deserialize(self, target_obj, data, content_type=None):
:param str target_obj: The target object type to deserialize to.
:param str/dict data: The response data to deserialize.
:param str content_type: Swagger "produces" if available.
+ :return: Deserialized object.
+ :rtype: object
"""
try:
return self(target_obj, data, content_type=content_type)
- except:
+ except: # pylint: disable=bare-except
_LOGGER.debug(
"Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
)
@@ -1558,10 +1644,12 @@ def _unpack_content(raw_data, content_type=None):
If raw_data is something else, bypass all logic and return it directly.
- :param raw_data: Data to be processed.
- :param content_type: How to parse if raw_data is a string/bytes.
+ :param obj raw_data: Data to be processed.
+ :param str content_type: How to parse if raw_data is a string/bytes.
:raises JSONDecodeError: If JSON is requested and parsing is impossible.
:raises UnicodeDecodeError: If bytes is not UTF8
+ :rtype: object
+ :return: Unpacked content.
"""
# Assume this is enough to detect a Pipeline Response without importing it
context = getattr(raw_data, "context", {})
@@ -1578,31 +1666,42 @@ def _unpack_content(raw_data, content_type=None):
if hasattr(raw_data, "_content_consumed"):
return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers)
- if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"):
+ if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"):
return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore
return raw_data
def _instantiate_model(self, response, attrs, additional_properties=None):
"""Instantiate a response model passing in deserialized args.
- :param response: The response model class.
- :param d_attrs: The deserialized response attributes.
+ :param Response response: The response model class.
+ :param dict attrs: The deserialized response attributes.
+ :param dict additional_properties: Additional properties to be set.
+ :rtype: Response
+ :return: The instantiated response model.
"""
if callable(response):
subtype = getattr(response, "_subtype_map", {})
try:
- readonly = [k for k, v in response._validation.items() if v.get("readonly")]
- const = [k for k, v in response._validation.items() if v.get("constant")]
+ readonly = [
+ k
+ for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore
+ if v.get("readonly")
+ ]
+ const = [
+ k
+ for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore
+ if v.get("constant")
+ ]
kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const}
response_obj = response(**kwargs)
for attr in readonly:
setattr(response_obj, attr, attrs.get(attr))
if additional_properties:
- response_obj.additional_properties = additional_properties
+ response_obj.additional_properties = additional_properties # type: ignore
return response_obj
except TypeError as err:
msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore
- raise DeserializationError(msg + str(err))
+ raise DeserializationError(msg + str(err)) from err
else:
try:
for attr, value in attrs.items():
@@ -1611,15 +1710,16 @@ def _instantiate_model(self, response, attrs, additional_properties=None):
except Exception as exp:
msg = "Unable to populate response model. "
msg += "Type: {}, Error: {}".format(type(response), exp)
- raise DeserializationError(msg)
+ raise DeserializationError(msg) from exp
- def deserialize_data(self, data, data_type):
+ def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements
"""Process data for deserialization according to data type.
:param str data: The response string to be deserialized.
:param str data_type: The type to deserialize to.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
if data is None:
return data
@@ -1633,7 +1733,11 @@ def deserialize_data(self, data, data_type):
if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())):
return data
- is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"]
+ is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment
+ "object",
+ "[]",
+ r"{}",
+ ]
if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text:
return None
data_val = self.deserialize_type[data_type](data)
@@ -1652,15 +1756,15 @@ def deserialize_data(self, data, data_type):
except (ValueError, TypeError, AttributeError) as err:
msg = "Unable to deserialize response data."
msg += " Data: {}, {}".format(data, data_type)
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return self._deserialize(obj_type, data)
+ raise DeserializationError(msg) from err
+ return self._deserialize(obj_type, data)
def deserialize_iter(self, attr, iter_type):
"""Deserialize an iterable.
:param list attr: Iterable to be deserialized.
:param str iter_type: The type of object in the iterable.
+ :return: Deserialized iterable.
:rtype: list
"""
if attr is None:
@@ -1677,6 +1781,7 @@ def deserialize_dict(self, attr, dict_type):
:param dict/list attr: Dictionary to be deserialized. Also accepts
a list of key, value pairs.
:param str dict_type: The object type of the items in the dictionary.
+ :return: Deserialized dictionary.
:rtype: dict
"""
if isinstance(attr, list):
@@ -1687,11 +1792,12 @@ def deserialize_dict(self, attr, dict_type):
attr = {el.tag: el.text for el in attr}
return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()}
- def deserialize_object(self, attr, **kwargs):
+ def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements
"""Deserialize a generic object.
This will be handled as a dictionary.
:param dict attr: Dictionary to be deserialized.
+ :return: Deserialized object.
:rtype: dict
:raises: TypeError if non-builtin datatype encountered.
"""
@@ -1700,7 +1806,7 @@ def deserialize_object(self, attr, **kwargs):
if isinstance(attr, ET.Element):
# Do no recurse on XML, just return the tree as-is
return attr
- if isinstance(attr, basestring):
+ if isinstance(attr, str):
return self.deserialize_basic(attr, "str")
obj_type = type(attr)
if obj_type in self.basic_types:
@@ -1726,11 +1832,10 @@ def deserialize_object(self, attr, **kwargs):
pass
return deserialized
- else:
- error = "Cannot deserialize generic object with type: "
- raise TypeError(error + str(obj_type))
+ error = "Cannot deserialize generic object with type: "
+ raise TypeError(error + str(obj_type))
- def deserialize_basic(self, attr, data_type):
+ def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements
"""Deserialize basic builtin data type from string.
Will attempt to convert to str, int, float and bool.
This function will also accept '1', '0', 'true' and 'false' as
@@ -1738,6 +1843,7 @@ def deserialize_basic(self, attr, data_type):
:param str attr: response string to be deserialized.
:param str data_type: deserialization data type.
+ :return: Deserialized basic type.
:rtype: str, int, float or bool
:raises: TypeError if string format is not valid.
"""
@@ -1749,24 +1855,23 @@ def deserialize_basic(self, attr, data_type):
if data_type == "str":
# None or '', node is empty string.
return ""
- else:
- # None or '', node with a strong type is None.
- # Don't try to model "empty bool" or "empty int"
- return None
+ # None or '', node with a strong type is None.
+ # Don't try to model "empty bool" or "empty int"
+ return None
if data_type == "bool":
if attr in [True, False, 1, 0]:
return bool(attr)
- elif isinstance(attr, basestring):
+ if isinstance(attr, str):
if attr.lower() in ["true", "1"]:
return True
- elif attr.lower() in ["false", "0"]:
+ if attr.lower() in ["false", "0"]:
return False
raise TypeError("Invalid boolean value: {}".format(attr))
if data_type == "str":
return self.deserialize_unicode(attr)
- return eval(data_type)(attr) # nosec
+ return eval(data_type)(attr) # nosec # pylint: disable=eval-used
@staticmethod
def deserialize_unicode(data):
@@ -1774,6 +1879,7 @@ def deserialize_unicode(data):
as a string.
:param str data: response string to be deserialized.
+ :return: Deserialized string.
:rtype: str or unicode
"""
# We might be here because we have an enum modeled as string,
@@ -1787,8 +1893,7 @@ def deserialize_unicode(data):
return data
except NameError:
return str(data)
- else:
- return str(data)
+ return str(data)
@staticmethod
def deserialize_enum(data, enum_obj):
@@ -1800,6 +1905,7 @@ def deserialize_enum(data, enum_obj):
:param str data: Response string to be deserialized. If this value is
None or invalid it will be returned as-is.
:param Enum enum_obj: Enum object to deserialize to.
+ :return: Deserialized enum object.
:rtype: Enum
"""
if isinstance(data, enum_obj) or data is None:
@@ -1808,12 +1914,11 @@ def deserialize_enum(data, enum_obj):
data = data.value
if isinstance(data, int):
# Workaround. We might consider remove it in the future.
- # https://github.com/Azure/azure-rest-api-specs/issues/141
try:
return list(enum_obj.__members__.values())[data]
- except IndexError:
+ except IndexError as exc:
error = "{!r} is not a valid index for enum {!r}"
- raise DeserializationError(error.format(data, enum_obj))
+ raise DeserializationError(error.format(data, enum_obj)) from exc
try:
return enum_obj(str(data))
except ValueError:
@@ -1829,6 +1934,7 @@ def deserialize_bytearray(attr):
"""Deserialize string into bytearray.
:param str attr: response string to be deserialized.
+ :return: Deserialized bytearray
:rtype: bytearray
:raises: TypeError if string format invalid.
"""
@@ -1841,6 +1947,7 @@ def deserialize_base64(attr):
"""Deserialize base64 encoded string into string.
:param str attr: response string to be deserialized.
+ :return: Deserialized base64 string
:rtype: bytearray
:raises: TypeError if string format invalid.
"""
@@ -1856,22 +1963,24 @@ def deserialize_decimal(attr):
"""Deserialize string into Decimal object.
:param str attr: response string to be deserialized.
- :rtype: Decimal
+ :return: Deserialized decimal
:raises: DeserializationError if string format invalid.
+ :rtype: decimal
"""
if isinstance(attr, ET.Element):
attr = attr.text
try:
- return decimal.Decimal(attr) # type: ignore
+ return decimal.Decimal(str(attr)) # type: ignore
except decimal.DecimalException as err:
msg = "Invalid decimal {}".format(attr)
- raise_with_traceback(DeserializationError, msg, err)
+ raise DeserializationError(msg) from err
@staticmethod
def deserialize_long(attr):
"""Deserialize string into long (Py2) or int (Py3).
:param str attr: response string to be deserialized.
+ :return: Deserialized int
:rtype: long or int
:raises: ValueError if string format invalid.
"""
@@ -1884,6 +1993,7 @@ def deserialize_duration(attr):
"""Deserialize ISO-8601 formatted string into TimeDelta object.
:param str attr: response string to be deserialized.
+ :return: Deserialized duration
:rtype: TimeDelta
:raises: DeserializationError if string format invalid.
"""
@@ -1893,15 +2003,15 @@ def deserialize_duration(attr):
duration = isodate.parse_duration(attr)
except (ValueError, OverflowError, AttributeError) as err:
msg = "Cannot deserialize duration object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return duration
+ raise DeserializationError(msg) from err
+ return duration
@staticmethod
def deserialize_date(attr):
"""Deserialize ISO-8601 formatted string into Date object.
:param str attr: response string to be deserialized.
+ :return: Deserialized date
:rtype: Date
:raises: DeserializationError if string format invalid.
"""
@@ -1910,13 +2020,14 @@ def deserialize_date(attr):
if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore
raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
# This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
- return isodate.parse_date(attr, defaultmonth=None, defaultday=None)
+ return isodate.parse_date(attr, defaultmonth=0, defaultday=0)
@staticmethod
def deserialize_time(attr):
"""Deserialize ISO-8601 formatted string into time object.
:param str attr: response string to be deserialized.
+ :return: Deserialized time
:rtype: datetime.time
:raises: DeserializationError if string format invalid.
"""
@@ -1931,6 +2042,7 @@ def deserialize_rfc(attr):
"""Deserialize RFC-1123 formatted string into Datetime object.
:param str attr: response string to be deserialized.
+ :return: Deserialized RFC datetime
:rtype: Datetime
:raises: DeserializationError if string format invalid.
"""
@@ -1945,15 +2057,15 @@ def deserialize_rfc(attr):
date_obj = date_obj.astimezone(tz=TZ_UTC)
except ValueError as err:
msg = "Cannot deserialize to rfc datetime object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return date_obj
+ raise DeserializationError(msg) from err
+ return date_obj
@staticmethod
def deserialize_iso(attr):
"""Deserialize ISO-8601 formatted string into Datetime object.
:param str attr: response string to be deserialized.
+ :return: Deserialized ISO datetime
:rtype: Datetime
:raises: DeserializationError if string format invalid.
"""
@@ -1982,9 +2094,8 @@ def deserialize_iso(attr):
raise OverflowError("Hit max or min date")
except (ValueError, OverflowError, AttributeError) as err:
msg = "Cannot deserialize datetime object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return date_obj
+ raise DeserializationError(msg) from err
+ return date_obj
@staticmethod
def deserialize_unix(attr):
@@ -1992,15 +2103,16 @@ def deserialize_unix(attr):
This is represented as seconds.
:param int attr: Object to be serialized.
+ :return: Deserialized datetime
:rtype: Datetime
:raises: DeserializationError if format invalid
"""
if isinstance(attr, ET.Element):
attr = int(attr.text) # type: ignore
try:
+ attr = int(attr)
date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
except ValueError as err:
msg = "Cannot deserialize to unix datetime object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return date_obj
+ raise DeserializationError(msg) from err
+ return date_obj
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_vendor.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
- data = request.content if not files else None
- request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
- if files:
- request.set_formdata_body(files)
- return request
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_version.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_version.py
index 48b05f9c489c..e5754a47ce68 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_version.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_version.py
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "3.1.0b1"
+VERSION = "1.0.0b1"
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/__init__.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/__init__.py
index 40b770c04545..d817f89f4a33 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/__init__.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/__init__.py
@@ -5,12 +5,18 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._nginx_management_client import NginxManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._nginx_management_client import NginxManagementClient # type: ignore
try:
from ._patch import __all__ as _patch_all
- from ._patch import * # pylint: disable=unused-wildcard-import
+ from ._patch import *
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk
@@ -18,6 +24,6 @@
__all__ = [
"NginxManagementClient",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_configuration.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_configuration.py
index 5998ccf78d8b..4f3d3d8449a9 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_configuration.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_configuration.py
@@ -8,18 +8,16 @@
from typing import Any, TYPE_CHECKING
-from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
from .._version import VERSION
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class NginxManagementClientConfiguration: # pylint: disable=too-many-instance-attributes
"""Configuration for NginxManagementClient.
Note that all parameters used to create this instance are saved as instance
@@ -27,16 +25,15 @@ class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
- :param subscription_id: The ID of the target subscription. Required.
+ :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
- :keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
+ :keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
"""
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(NginxManagementClientConfiguration, self).__init__(**kwargs)
- api_version: str = kwargs.pop("api_version", "2024-01-01-preview")
+ api_version: str = kwargs.pop("api_version", "2024-11-01-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +45,7 @@ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **k
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "mgmt-nginx/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
- self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs)
+ self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
if self.credential and not self.authentication_policy:
self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_nginx_management_client.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_nginx_management_client.py
index 37f2541cd626..059f95c1db19 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_nginx_management_client.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_nginx_management_client.py
@@ -8,23 +8,33 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from .. import models as _models
from .._serialization import Deserializer, Serializer
from ._configuration import NginxManagementClientConfiguration
-from .operations import CertificatesOperations, ConfigurationsOperations, DeploymentsOperations, Operations
+from .operations import (
+ ApiKeysOperations,
+ CertificatesOperations,
+ ConfigurationsOperations,
+ DeploymentsOperations,
+ Operations,
+)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class NginxManagementClient: # pylint: disable=client-accepts-api-version-keyword
+class NginxManagementClient:
"""NginxManagementClient.
+ :ivar api_keys: ApiKeysOperations operations
+ :vartype api_keys: azure.mgmt.nginx.aio.operations.ApiKeysOperations
:ivar certificates: CertificatesOperations operations
:vartype certificates: azure.mgmt.nginx.aio.operations.CertificatesOperations
:ivar configurations: ConfigurationsOperations operations
@@ -35,11 +45,11 @@ class NginxManagementClient: # pylint: disable=client-accepts-api-version-keywo
:vartype operations: azure.mgmt.nginx.aio.operations.Operations
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
- :param subscription_id: The ID of the target subscription. Required.
+ :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
- :keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
+ :keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
this default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -56,18 +66,39 @@ def __init__(
self._config = NginxManagementClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
+ self.api_keys = ApiKeysOperations(self._client, self._config, self._serialize, self._deserialize)
self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize)
self.configurations = ConfigurationsOperations(self._client, self._config, self._serialize, self._deserialize)
self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
- def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]:
+ def _send_request(
+ self, request: HttpRequest, *, stream: bool = False, **kwargs: Any
+ ) -> Awaitable[AsyncHttpResponse]:
"""Runs the network request through the client's chained policies.
>>> from azure.core.rest import HttpRequest
@@ -87,12 +118,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncH
request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
- return self._client.send_request(request_copy, **kwargs)
+ return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
async def close(self) -> None:
await self._client.close()
- async def __aenter__(self) -> "NginxManagementClient":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_patch.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_patch.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/__init__.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/__init__.py
index 28571fd86d09..bf1dfbd4df3e 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/__init__.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/__init__.py
@@ -5,21 +5,29 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._certificates_operations import CertificatesOperations
-from ._configurations_operations import ConfigurationsOperations
-from ._deployments_operations import DeploymentsOperations
-from ._operations import Operations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._api_keys_operations import ApiKeysOperations # type: ignore
+from ._certificates_operations import CertificatesOperations # type: ignore
+from ._configurations_operations import ConfigurationsOperations # type: ignore
+from ._deployments_operations import DeploymentsOperations # type: ignore
+from ._operations import Operations # type: ignore
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
+ "ApiKeysOperations",
"CertificatesOperations",
"ConfigurationsOperations",
"DeploymentsOperations",
"Operations",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_api_keys_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_api_keys_operations.py
new file mode 100644
index 000000000000..70d285bb6b1b
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_api_keys_operations.py
@@ -0,0 +1,429 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+ ClientAuthenticationError,
+ HttpResponseError,
+ ResourceExistsError,
+ ResourceNotFoundError,
+ ResourceNotModifiedError,
+ map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._api_keys_operations import (
+ build_create_or_update_request,
+ build_delete_request,
+ build_get_request,
+ build_list_request,
+)
+
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class ApiKeysOperations:
+ """
+ .. warning::
+ **DO NOT** instantiate this class directly.
+
+ Instead, you should access the following operations through
+ :class:`~azure.mgmt.nginx.aio.NginxManagementClient`'s
+ :attr:`api_keys` attribute.
+ """
+
+ models = _models
+
+ def __init__(self, *args, **kwargs) -> None:
+ input_args = list(args)
+ self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+
+ @overload
+ async def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[_models.NginxDeploymentApiKeyRequest] = None,
+ *,
+ content_type: str = "application/json",
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequest
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @overload
+ async def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[IO[bytes]] = None,
+ *,
+ content_type: str = "application/json",
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Default value is None.
+ :type body: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @distributed_trace_async
+ async def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[Union[_models.NginxDeploymentApiKeyRequest, IO[bytes]]] = None,
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Is either a NginxDeploymentApiKeyRequest type or a IO[bytes] type. Default value is
+ None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequest or IO[bytes]
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ cls: ClsType[_models.NginxDeploymentApiKeyResponse] = kwargs.pop("cls", None)
+
+ content_type = content_type or "application/json"
+ _json = None
+ _content = None
+ if isinstance(body, (IOBase, bytes)):
+ _content = body
+ else:
+ if body is not None:
+ _json = self._serialize.body(body, "NginxDeploymentApiKeyRequest")
+ else:
+ _json = None
+
+ _request = build_create_or_update_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ content_type=content_type,
+ json=_json,
+ content=_content,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200, 201]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ deserialized = self._deserialize("NginxDeploymentApiKeyResponse", pipeline_response.http_response)
+
+ if cls:
+ return cls(pipeline_response, deserialized, {}) # type: ignore
+
+ return deserialized # type: ignore
+
+ @distributed_trace_async
+ async def delete(self, resource_group_name: str, deployment_name: str, api_key_name: str, **kwargs: Any) -> None:
+ """Delete API key for Nginx deployment.
+
+ Delete API key for Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :return: None or the result of cls(response)
+ :rtype: None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[None] = kwargs.pop("cls", None)
+
+ _request = build_delete_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200, 204]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ if cls:
+ return cls(pipeline_response, None, {}) # type: ignore
+
+ @distributed_trace_async
+ async def get(
+ self, resource_group_name: str, deployment_name: str, api_key_name: str, **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Get the specified API Key of the given Nginx deployment.
+
+ Get the specified API Key of the given Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[_models.NginxDeploymentApiKeyResponse] = kwargs.pop("cls", None)
+
+ _request = build_get_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ deserialized = self._deserialize("NginxDeploymentApiKeyResponse", pipeline_response.http_response)
+
+ if cls:
+ return cls(pipeline_response, deserialized, {}) # type: ignore
+
+ return deserialized # type: ignore
+
+ @distributed_trace
+ def list(
+ self, resource_group_name: str, deployment_name: str, **kwargs: Any
+ ) -> AsyncIterable["_models.NginxDeploymentApiKeyResponse"]:
+ """List all API Keys of the given Nginx deployment.
+
+ List all API Keys of the given Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :return: An iterator like instance of either NginxDeploymentApiKeyResponse or the result of
+ cls(response)
+ :rtype:
+ ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse]
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[_models.NginxDeploymentApiKeyListResponse] = kwargs.pop("cls", None)
+
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ def prepare_request(next_link=None):
+ if not next_link:
+
+ _request = build_list_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ else:
+ # make call to next link with the client's api-version
+ _parsed_next_link = urllib.parse.urlparse(next_link)
+ _next_request_params = case_insensitive_dict(
+ {
+ key: [urllib.parse.quote(v) for v in value]
+ for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+ }
+ )
+ _next_request_params["api-version"] = self._config.api_version
+ _request = HttpRequest(
+ "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+ )
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
+
+ async def extract_data(pipeline_response):
+ deserialized = self._deserialize("NginxDeploymentApiKeyListResponse", pipeline_response)
+ list_of_elem = deserialized.value
+ if cls:
+ list_of_elem = cls(list_of_elem) # type: ignore
+ return deserialized.next_link or None, AsyncList(list_of_elem)
+
+ async def get_next(next_link=None):
+ _request = prepare_request(next_link)
+
+ _stream = False
+ pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ return pipeline_response
+
+ return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_certificates_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_certificates_operations.py
index 716f213dbc10..5314cc4dac6f 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_certificates_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_certificates_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -17,12 +17,13 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
@@ -30,7 +31,6 @@
from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._certificates_operations import (
build_create_or_update_request,
build_delete_request,
@@ -38,6 +38,10 @@
build_list_request,
)
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -76,12 +80,11 @@ async def get(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: NginxCertificate or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.NginxCertificate
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -95,53 +98,45 @@ async def get(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxCertificate] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = self._deserialize("NginxCertificate", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return deserialized # type: ignore
async def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[Union[_models.NginxCertificate, IO]] = None,
+ body: Optional[Union[_models.NginxCertificate, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxCertificate:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -154,7 +149,7 @@ async def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxCertificate] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -167,7 +162,7 @@ async def _create_or_update_initial(
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
@@ -176,42 +171,35 @@ async def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
-
@overload
async def begin_create_or_update(
self,
@@ -239,14 +227,6 @@ async def begin_create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -259,7 +239,7 @@ async def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -276,18 +256,10 @@ async def begin_create_or_update(
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
:param body: The certificate. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -300,7 +272,7 @@ async def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[Union[_models.NginxCertificate, IO]] = None,
+ body: Optional[Union[_models.NginxCertificate, IO[bytes]]] = None,
**kwargs: Any
) -> AsyncLROPoller[_models.NginxCertificate]:
"""Create or update the NGINX certificates for given NGINX deployment.
@@ -314,20 +286,9 @@ async def begin_create_or_update(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :param body: The certificate. Is either a NginxCertificate type or a IO type. Default value is
- None.
- :type body: ~azure.mgmt.nginx.models.NginxCertificate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: The certificate. Is either a NginxCertificate type or a IO[bytes] type. Default
+ value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxCertificate or IO[bytes]
:return: An instance of AsyncLROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -355,12 +316,13 @@ async def begin_create_or_update(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = self._deserialize("NginxCertificate", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -373,22 +335,20 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[_models.NginxCertificate].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return AsyncLROPoller[_models.NginxCertificate](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- async def _delete_initial( # pylint: disable=inconsistent-return-statements
+ async def _delete_initial(
self, resource_group_name: str, deployment_name: str, certificate_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -400,41 +360,42 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def begin_delete(
@@ -451,14 +412,6 @@ async def begin_delete(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -472,7 +425,7 @@ async def begin_delete(
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = await self._delete_initial( # type: ignore
+ raw_result = await self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
@@ -482,11 +435,12 @@ async def begin_delete(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
@@ -495,17 +449,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@distributed_trace
def list(
@@ -520,7 +470,6 @@ def list(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxCertificate or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxCertificate]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -531,7 +480,7 @@ def list(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxCertificateListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -542,17 +491,15 @@ def list(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -564,13 +511,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("NginxCertificateListResponse", pipeline_response)
@@ -580,25 +526,19 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates"
- }
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_configurations_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_configurations_operations.py
index 657846913dbd..d5422b33ca06 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_configurations_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_configurations_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -17,12 +17,13 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
@@ -30,7 +31,6 @@
from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._configurations_operations import (
build_analysis_request,
build_create_or_update_request,
@@ -39,6 +39,10 @@
build_list_request,
)
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -65,7 +69,7 @@ def __init__(self, *args, **kwargs) -> None:
@distributed_trace
def list(
self, resource_group_name: str, deployment_name: str, **kwargs: Any
- ) -> AsyncIterable["_models.NginxConfiguration"]:
+ ) -> AsyncIterable["_models.NginxConfigurationResponse"]:
"""List the NGINX configuration of given NGINX deployment.
List the NGINX configuration of given NGINX deployment.
@@ -75,9 +79,10 @@ def list(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :return: An iterator like instance of either NginxConfiguration or the result of cls(response)
- :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An iterator like instance of either NginxConfigurationResponse or the result of
+ cls(response)
+ :rtype:
+ ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
_headers = kwargs.pop("headers", {}) or {}
@@ -86,7 +91,7 @@ def list(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxConfigurationListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -97,17 +102,15 @@ def list(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -119,13 +122,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("NginxConfigurationListResponse", pipeline_response)
@@ -135,33 +137,27 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations"
- }
-
@distributed_trace_async
async def get(
self, resource_group_name: str, deployment_name: str, configuration_name: str, **kwargs: Any
- ) -> _models.NginxConfiguration:
+ ) -> _models.NginxConfigurationResponse:
"""Get the NGINX configuration of given NGINX deployment.
Get the NGINX configuration of given NGINX deployment.
@@ -174,12 +170,11 @@ async def get(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :return: NginxConfiguration or the result of cls(response)
- :rtype: ~azure.mgmt.nginx.models.NginxConfiguration
+ :return: NginxConfigurationResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxConfigurationResponse
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -191,55 +186,47 @@ async def get(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[_models.NginxConfigurationResponse] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = self._deserialize("NginxConfigurationResponse", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return deserialized # type: ignore
async def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.NginxConfiguration, IO]] = None,
+ body: Optional[Union[_models.NginxConfigurationRequest, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxConfiguration:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -252,7 +239,7 @@ async def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -261,11 +248,11 @@ async def _create_or_update_initial(
_content = body
else:
if body is not None:
- _json = self._serialize.body(body, "NginxConfiguration")
+ _json = self._serialize.body(body, "NginxConfigurationRequest")
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -274,53 +261,46 @@ async def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
-
@overload
async def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[_models.NginxConfiguration] = None,
+ body: Optional[_models.NginxConfigurationRequest] = None,
*,
content_type: str = "application/json",
**kwargs: Any
- ) -> AsyncLROPoller[_models.NginxConfiguration]:
+ ) -> AsyncLROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -334,21 +314,13 @@ async def begin_create_or_update(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration. Default value is None.
- :type body: ~azure.mgmt.nginx.models.NginxConfiguration
+ :type body: ~azure.mgmt.nginx.models.NginxConfigurationRequest
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of AsyncLROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An instance of AsyncLROPoller that returns either NginxConfigurationResponse or the
+ result of cls(response)
+ :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
@@ -358,11 +330,11 @@ async def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
- ) -> AsyncLROPoller[_models.NginxConfiguration]:
+ ) -> AsyncLROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -376,21 +348,13 @@ async def begin_create_or_update(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of AsyncLROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An instance of AsyncLROPoller that returns either NginxConfigurationResponse or the
+ result of cls(response)
+ :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
@@ -400,9 +364,9 @@ async def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.NginxConfiguration, IO]] = None,
+ body: Optional[Union[_models.NginxConfigurationRequest, IO[bytes]]] = None,
**kwargs: Any
- ) -> AsyncLROPoller[_models.NginxConfiguration]:
+ ) -> AsyncLROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -415,23 +379,12 @@ async def begin_create_or_update(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :param body: The NGINX configuration. Is either a NginxConfiguration type or a IO type. Default
- value is None.
- :type body: ~azure.mgmt.nginx.models.NginxConfiguration or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of AsyncLROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :param body: The NGINX configuration. Is either a NginxConfigurationRequest type or a IO[bytes]
+ type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxConfigurationRequest or IO[bytes]
+ :return: An instance of AsyncLROPoller that returns either NginxConfigurationResponse or the
+ result of cls(response)
+ :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
@@ -439,7 +392,7 @@ async def begin_create_or_update(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[_models.NginxConfigurationResponse] = kwargs.pop("cls", None)
polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
@@ -456,12 +409,13 @@ async def begin_create_or_update(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = self._deserialize("NginxConfigurationResponse", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -474,22 +428,20 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[_models.NginxConfigurationResponse].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return AsyncLROPoller[_models.NginxConfigurationResponse](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- async def _delete_initial( # pylint: disable=inconsistent-return-statements
+ async def _delete_initial(
self, resource_group_name: str, deployment_name: str, configuration_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -501,41 +453,42 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def begin_delete(
@@ -553,14 +506,6 @@ async def begin_delete(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -574,7 +519,7 @@ async def begin_delete(
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = await self._delete_initial( # type: ignore
+ raw_result = await self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -584,11 +529,12 @@ async def begin_delete(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
@@ -597,17 +543,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@overload
async def analysis(
@@ -637,7 +579,6 @@ async def analysis(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
@@ -649,7 +590,7 @@ async def analysis(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -667,11 +608,10 @@ async def analysis(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration to analyze. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
@@ -683,7 +623,7 @@ async def analysis(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.AnalysisCreate, IO]] = None,
+ body: Optional[Union[_models.AnalysisCreate, IO[bytes]]] = None,
**kwargs: Any
) -> _models.AnalysisResult:
"""Analyze an NGINX configuration without applying it to the NGINXaaS deployment.
@@ -698,18 +638,14 @@ async def analysis(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :param body: The NGINX configuration to analyze. Is either a AnalysisCreate type or a IO type.
- Default value is None.
- :type body: ~azure.mgmt.nginx.models.AnalysisCreate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param body: The NGINX configuration to analyze. Is either a AnalysisCreate type or a IO[bytes]
+ type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.AnalysisCreate or IO[bytes]
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -735,7 +671,7 @@ async def analysis(
else:
_json = None
- request = build_analysis_request(
+ _request = build_analysis_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -744,34 +680,26 @@ async def analysis(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.analysis.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("AnalysisResult", pipeline_response)
+ deserialized = self._deserialize("AnalysisResult", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- analysis.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze"
- }
+ return deserialized # type: ignore
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_deployments_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_deployments_operations.py
index 1007685a37f2..7936214168b3 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_deployments_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_deployments_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -17,12 +17,13 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
@@ -30,7 +31,6 @@
from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._deployments_operations import (
build_create_or_update_request,
build_delete_request,
@@ -40,6 +40,10 @@
build_update_request,
)
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -74,12 +78,11 @@ async def get(self, resource_group_name: str, deployment_name: str, **kwargs: An
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: NginxDeployment or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.NginxDeployment
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -93,51 +96,43 @@ async def get(self, resource_group_name: str, deployment_name: str, **kwargs: An
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return deserialized # type: ignore
async def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeployment, IO]] = None,
+ body: Optional[Union[_models.NginxDeployment, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxDeployment:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -150,7 +145,7 @@ async def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -163,7 +158,7 @@ async def _create_or_update_initial(
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
@@ -171,42 +166,35 @@ async def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
-
@overload
async def begin_create_or_update(
self,
@@ -231,14 +219,6 @@ async def begin_create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -250,7 +230,7 @@ async def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -265,18 +245,10 @@ async def begin_create_or_update(
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
:param body: Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -288,7 +260,7 @@ async def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeployment, IO]] = None,
+ body: Optional[Union[_models.NginxDeployment, IO[bytes]]] = None,
**kwargs: Any
) -> AsyncLROPoller[_models.NginxDeployment]:
"""Create or update the NGINX deployment.
@@ -300,19 +272,8 @@ async def begin_create_or_update(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :param body: Is either a NginxDeployment type or a IO type. Default value is None.
- :type body: ~azure.mgmt.nginx.models.NginxDeployment or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: Is either a NginxDeployment type or a IO[bytes] type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeployment or IO[bytes]
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -339,12 +300,13 @@ async def begin_create_or_update(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -357,26 +319,24 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[_models.NginxDeployment].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return AsyncLROPoller[_models.NginxDeployment](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
async def _update_initial(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO]] = None,
+ body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxDeployment:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -389,7 +349,7 @@ async def _update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -402,7 +362,7 @@ async def _update_initial(
else:
_json = None
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
@@ -410,42 +370,35 @@ async def _update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
-
@overload
async def begin_update(
self,
@@ -470,14 +423,6 @@ async def begin_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -489,7 +434,7 @@ async def begin_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -504,18 +449,10 @@ async def begin_update(
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
:param body: Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -527,7 +464,7 @@ async def begin_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO]] = None,
+ body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO[bytes]]] = None,
**kwargs: Any
) -> AsyncLROPoller[_models.NginxDeployment]:
"""Update the NGINX deployment.
@@ -539,20 +476,9 @@ async def begin_update(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :param body: Is either a NginxDeploymentUpdateParameters type or a IO type. Default value is
- None.
- :type body: ~azure.mgmt.nginx.models.NginxDeploymentUpdateParameters or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: Is either a NginxDeploymentUpdateParameters type or a IO[bytes] type. Default
+ value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentUpdateParameters or IO[bytes]
:return: An instance of AsyncLROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -579,12 +505,13 @@ async def begin_update(
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -594,22 +521,20 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[_models.NginxDeployment].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return AsyncLROPoller[_models.NginxDeployment](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- async def _delete_initial( # pylint: disable=inconsistent-return-statements
+ async def _delete_initial(
self, resource_group_name: str, deployment_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ ) -> AsyncIterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -621,40 +546,41 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def begin_delete(self, resource_group_name: str, deployment_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -667,14 +593,6 @@ async def begin_delete(self, resource_group_name: str, deployment_name: str, **k
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
- this operation to not poll, or pass in your own initialized polling object for a personal
- polling strategy.
- :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.AsyncLROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -688,7 +606,7 @@ async def begin_delete(self, resource_group_name: str, deployment_name: str, **k
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = await self._delete_initial( # type: ignore
+ raw_result = await self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
api_version=api_version,
@@ -697,11 +615,12 @@ async def begin_delete(self, resource_group_name: str, deployment_name: str, **k
params=_params,
**kwargs
)
+ await raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
@@ -710,17 +629,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return AsyncLROPoller.from_continuation_token(
+ return AsyncLROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.NginxDeployment"]:
@@ -728,7 +643,6 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.NginxDeployment"]:
List the NGINX deployments resources.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxDeployment or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxDeployment]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -739,7 +653,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.NginxDeployment"]:
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeploymentListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -750,15 +664,13 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.NginxDeployment"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -770,13 +682,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("NginxDeploymentListResponse", pipeline_response)
@@ -786,27 +697,23 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
- list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments"}
-
@distributed_trace
def list_by_resource_group(
self, resource_group_name: str, **kwargs: Any
@@ -818,7 +725,6 @@ def list_by_resource_group(
:param resource_group_name: The name of the resource group. The name is case insensitive.
Required.
:type resource_group_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxDeployment or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.NginxDeployment]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -829,7 +735,7 @@ def list_by_resource_group(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeploymentListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -840,16 +746,14 @@ def list_by_resource_group(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_by_resource_group_request(
+ _request = build_list_by_resource_group_request(
resource_group_name=resource_group_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list_by_resource_group.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -861,13 +765,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("NginxDeploymentListResponse", pipeline_response)
@@ -877,25 +780,19 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list_by_resource_group.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments"
- }
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_operations.py
index 26bbdbb22ab5..c945da5d2cef 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+import sys
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
import urllib.parse
@@ -19,16 +19,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._operations import build_list_request
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -54,11 +56,10 @@ def __init__(self, *args, **kwargs) -> None:
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]:
- """List all operations provided by Nginx.NginxPlus for the 2024-01-01-preview api version.
+ """List all operations provided by Nginx.NginxPlus for the 2024-11-01-preview api version.
- List all operations provided by Nginx.NginxPlus for the 2024-01-01-preview api version.
+ List all operations provided by Nginx.NginxPlus for the 2024-11-01-preview api version.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either OperationResult or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.nginx.models.OperationResult]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -69,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]:
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -80,14 +81,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -99,13 +98,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -115,23 +113,19 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Nginx.NginxPlus/operations"}
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/__init__.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/__init__.py
index 24963eddd148..159f89a3eaec 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/__init__.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/__init__.py
@@ -5,55 +5,84 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._models_py3 import AnalysisCreate
-from ._models_py3 import AnalysisCreateConfig
-from ._models_py3 import AnalysisDiagnostic
-from ._models_py3 import AnalysisResult
-from ._models_py3 import AnalysisResultData
-from ._models_py3 import AutoUpgradeProfile
-from ._models_py3 import ErrorAdditionalInfo
-from ._models_py3 import ErrorDetail
-from ._models_py3 import IdentityProperties
-from ._models_py3 import NginxCertificate
-from ._models_py3 import NginxCertificateErrorResponseBody
-from ._models_py3 import NginxCertificateListResponse
-from ._models_py3 import NginxCertificateProperties
-from ._models_py3 import NginxConfiguration
-from ._models_py3 import NginxConfigurationFile
-from ._models_py3 import NginxConfigurationListResponse
-from ._models_py3 import NginxConfigurationPackage
-from ._models_py3 import NginxConfigurationProperties
-from ._models_py3 import NginxDeployment
-from ._models_py3 import NginxDeploymentListResponse
-from ._models_py3 import NginxDeploymentProperties
-from ._models_py3 import NginxDeploymentScalingProperties
-from ._models_py3 import NginxDeploymentUpdateParameters
-from ._models_py3 import NginxDeploymentUpdateProperties
-from ._models_py3 import NginxDeploymentUserProfile
-from ._models_py3 import NginxFrontendIPConfiguration
-from ._models_py3 import NginxLogging
-from ._models_py3 import NginxNetworkInterfaceConfiguration
-from ._models_py3 import NginxNetworkProfile
-from ._models_py3 import NginxPrivateIPAddress
-from ._models_py3 import NginxPublicIPAddress
-from ._models_py3 import NginxStorageAccount
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import OperationResult
-from ._models_py3 import ResourceProviderDefaultErrorResponse
-from ._models_py3 import ResourceSku
-from ._models_py3 import ScaleProfile
-from ._models_py3 import ScaleProfileCapacity
-from ._models_py3 import SystemData
-from ._models_py3 import UserIdentityProperties
+from typing import TYPE_CHECKING
-from ._nginx_management_client_enums import CreatedByType
-from ._nginx_management_client_enums import IdentityType
-from ._nginx_management_client_enums import NginxPrivateIPAllocationMethod
-from ._nginx_management_client_enums import ProvisioningState
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import ( # type: ignore
+ AnalysisCreate,
+ AnalysisCreateConfig,
+ AnalysisDiagnostic,
+ AnalysisResult,
+ AnalysisResultData,
+ AutoUpgradeProfile,
+ DiagnosticItem,
+ ErrorAdditionalInfo,
+ ErrorDetail,
+ ErrorResponse,
+ IdentityProperties,
+ NginxCertificate,
+ NginxCertificateErrorResponseBody,
+ NginxCertificateListResponse,
+ NginxCertificateProperties,
+ NginxConfigurationFile,
+ NginxConfigurationListResponse,
+ NginxConfigurationPackage,
+ NginxConfigurationProtectedFileRequest,
+ NginxConfigurationProtectedFileResponse,
+ NginxConfigurationRequest,
+ NginxConfigurationRequestProperties,
+ NginxConfigurationResponse,
+ NginxConfigurationResponseProperties,
+ NginxDeployment,
+ NginxDeploymentApiKeyListResponse,
+ NginxDeploymentApiKeyRequest,
+ NginxDeploymentApiKeyRequestProperties,
+ NginxDeploymentApiKeyResponse,
+ NginxDeploymentApiKeyResponseProperties,
+ NginxDeploymentListResponse,
+ NginxDeploymentProperties,
+ NginxDeploymentPropertiesNginxAppProtect,
+ NginxDeploymentScalingProperties,
+ NginxDeploymentUpdateParameters,
+ NginxDeploymentUpdateProperties,
+ NginxDeploymentUpdatePropertiesNginxAppProtect,
+ NginxDeploymentUserProfile,
+ NginxFrontendIPConfiguration,
+ NginxLogging,
+ NginxNetworkInterfaceConfiguration,
+ NginxNetworkProfile,
+ NginxPrivateIPAddress,
+ NginxPublicIPAddress,
+ NginxStorageAccount,
+ OperationDisplay,
+ OperationListResult,
+ OperationResult,
+ ResourceSku,
+ ScaleProfile,
+ ScaleProfileCapacity,
+ SystemData,
+ UserIdentityProperties,
+ WebApplicationFirewallComponentVersions,
+ WebApplicationFirewallPackage,
+ WebApplicationFirewallSettings,
+ WebApplicationFirewallStatus,
+)
+
+from ._nginx_management_client_enums import ( # type: ignore
+ ActivationState,
+ CreatedByType,
+ IdentityType,
+ Level,
+ NginxPrivateIPAllocationMethod,
+ ProvisioningState,
+)
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
@@ -63,24 +92,37 @@
"AnalysisResult",
"AnalysisResultData",
"AutoUpgradeProfile",
+ "DiagnosticItem",
"ErrorAdditionalInfo",
"ErrorDetail",
+ "ErrorResponse",
"IdentityProperties",
"NginxCertificate",
"NginxCertificateErrorResponseBody",
"NginxCertificateListResponse",
"NginxCertificateProperties",
- "NginxConfiguration",
"NginxConfigurationFile",
"NginxConfigurationListResponse",
"NginxConfigurationPackage",
- "NginxConfigurationProperties",
+ "NginxConfigurationProtectedFileRequest",
+ "NginxConfigurationProtectedFileResponse",
+ "NginxConfigurationRequest",
+ "NginxConfigurationRequestProperties",
+ "NginxConfigurationResponse",
+ "NginxConfigurationResponseProperties",
"NginxDeployment",
+ "NginxDeploymentApiKeyListResponse",
+ "NginxDeploymentApiKeyRequest",
+ "NginxDeploymentApiKeyRequestProperties",
+ "NginxDeploymentApiKeyResponse",
+ "NginxDeploymentApiKeyResponseProperties",
"NginxDeploymentListResponse",
"NginxDeploymentProperties",
+ "NginxDeploymentPropertiesNginxAppProtect",
"NginxDeploymentScalingProperties",
"NginxDeploymentUpdateParameters",
"NginxDeploymentUpdateProperties",
+ "NginxDeploymentUpdatePropertiesNginxAppProtect",
"NginxDeploymentUserProfile",
"NginxFrontendIPConfiguration",
"NginxLogging",
@@ -92,16 +134,21 @@
"OperationDisplay",
"OperationListResult",
"OperationResult",
- "ResourceProviderDefaultErrorResponse",
"ResourceSku",
"ScaleProfile",
"ScaleProfileCapacity",
"SystemData",
"UserIdentityProperties",
+ "WebApplicationFirewallComponentVersions",
+ "WebApplicationFirewallPackage",
+ "WebApplicationFirewallSettings",
+ "WebApplicationFirewallStatus",
+ "ActivationState",
"CreatedByType",
"IdentityType",
+ "Level",
"NginxPrivateIPAllocationMethod",
"ProvisioningState",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_models_py3.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_models_py3.py
index ed39c7da7c60..d050ced9d383 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_models_py3.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_models_py3.py
@@ -1,5 +1,5 @@
-# coding=utf-8
# pylint: disable=too-many-lines
+# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
@@ -13,14 +13,13 @@
from .. import _serialization
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
class AnalysisCreate(_serialization.Model):
"""The request body for creating an analysis for an NGINX configuration.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar config: Required.
:vartype config: ~azure.mgmt.nginx.models.AnalysisCreateConfig
@@ -52,7 +51,7 @@ class AnalysisCreateConfig(_serialization.Model):
:ivar files:
:vartype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
:ivar protected_files:
- :vartype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :vartype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileRequest]
:ivar package:
:vartype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
"""
@@ -60,7 +59,7 @@ class AnalysisCreateConfig(_serialization.Model):
_attribute_map = {
"root_file": {"key": "rootFile", "type": "str"},
"files": {"key": "files", "type": "[NginxConfigurationFile]"},
- "protected_files": {"key": "protectedFiles", "type": "[NginxConfigurationFile]"},
+ "protected_files": {"key": "protectedFiles", "type": "[NginxConfigurationProtectedFileRequest]"},
"package": {"key": "package", "type": "NginxConfigurationPackage"},
}
@@ -69,7 +68,7 @@ def __init__(
*,
root_file: Optional[str] = None,
files: Optional[List["_models.NginxConfigurationFile"]] = None,
- protected_files: Optional[List["_models.NginxConfigurationFile"]] = None,
+ protected_files: Optional[List["_models.NginxConfigurationProtectedFileRequest"]] = None,
package: Optional["_models.NginxConfigurationPackage"] = None,
**kwargs: Any
) -> None:
@@ -80,7 +79,8 @@ def __init__(
:keyword files:
:paramtype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
:keyword protected_files:
- :paramtype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :paramtype protected_files:
+ list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileRequest]
:keyword package:
:paramtype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
"""
@@ -94,7 +94,7 @@ def __init__(
class AnalysisDiagnostic(_serialization.Model):
"""An error object found during the analysis of an NGINX configuration.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Unique identifier for the error.
:vartype id: str
@@ -172,7 +172,7 @@ def __init__(
class AnalysisResult(_serialization.Model):
"""The response body for an analysis request. Contains the status of the analysis and any errors.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar status: The status of the analysis. Required.
:vartype status: str
@@ -206,25 +206,37 @@ class AnalysisResultData(_serialization.Model):
:ivar errors:
:vartype errors: list[~azure.mgmt.nginx.models.AnalysisDiagnostic]
+ :ivar diagnostics:
+ :vartype diagnostics: list[~azure.mgmt.nginx.models.DiagnosticItem]
"""
_attribute_map = {
"errors": {"key": "errors", "type": "[AnalysisDiagnostic]"},
+ "diagnostics": {"key": "diagnostics", "type": "[DiagnosticItem]"},
}
- def __init__(self, *, errors: Optional[List["_models.AnalysisDiagnostic"]] = None, **kwargs: Any) -> None:
+ def __init__(
+ self,
+ *,
+ errors: Optional[List["_models.AnalysisDiagnostic"]] = None,
+ diagnostics: Optional[List["_models.DiagnosticItem"]] = None,
+ **kwargs: Any
+ ) -> None:
"""
:keyword errors:
:paramtype errors: list[~azure.mgmt.nginx.models.AnalysisDiagnostic]
+ :keyword diagnostics:
+ :paramtype diagnostics: list[~azure.mgmt.nginx.models.DiagnosticItem]
"""
super().__init__(**kwargs)
self.errors = errors
+ self.diagnostics = diagnostics
class AutoUpgradeProfile(_serialization.Model):
"""Autoupgrade settings of a deployment.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar upgrade_channel: Channel used for autoupgrade. Required.
:vartype upgrade_channel: str
@@ -247,6 +259,100 @@ def __init__(self, *, upgrade_channel: str, **kwargs: Any) -> None:
self.upgrade_channel = upgrade_channel
+class DiagnosticItem(_serialization.Model):
+ """A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics
+ with a level indicating the importance of the diagnostic with optional category.
+
+ All required parameters must be populated in order to send to server.
+
+ :ivar id: Unique identifier for the diagnostic.
+ :vartype id: str
+ :ivar directive: Required.
+ :vartype directive: str
+ :ivar description: Required.
+ :vartype description: str
+ :ivar file: The filepath of the most relevant config file. Required.
+ :vartype file: str
+ :ivar line: Required.
+ :vartype line: float
+ :ivar message: Required.
+ :vartype message: str
+ :ivar rule: Required.
+ :vartype rule: str
+ :ivar level: Warning or Info. Required. Known values are: "Info" and "Warning".
+ :vartype level: str or ~azure.mgmt.nginx.models.Level
+ :ivar category: Category of warning like Best-practices, Recommendation, Security etc.
+ :vartype category: str
+ """
+
+ _validation = {
+ "directive": {"required": True},
+ "description": {"required": True},
+ "file": {"required": True},
+ "line": {"required": True},
+ "message": {"required": True},
+ "rule": {"required": True},
+ "level": {"required": True},
+ }
+
+ _attribute_map = {
+ "id": {"key": "id", "type": "str"},
+ "directive": {"key": "directive", "type": "str"},
+ "description": {"key": "description", "type": "str"},
+ "file": {"key": "file", "type": "str"},
+ "line": {"key": "line", "type": "float"},
+ "message": {"key": "message", "type": "str"},
+ "rule": {"key": "rule", "type": "str"},
+ "level": {"key": "level", "type": "str"},
+ "category": {"key": "category", "type": "str"},
+ }
+
+ def __init__(
+ self,
+ *,
+ directive: str,
+ description: str,
+ file: str,
+ line: float,
+ message: str,
+ rule: str,
+ level: Union[str, "_models.Level"],
+ id: Optional[str] = None, # pylint: disable=redefined-builtin
+ category: Optional[str] = None,
+ **kwargs: Any
+ ) -> None:
+ """
+ :keyword id: Unique identifier for the diagnostic.
+ :paramtype id: str
+ :keyword directive: Required.
+ :paramtype directive: str
+ :keyword description: Required.
+ :paramtype description: str
+ :keyword file: The filepath of the most relevant config file. Required.
+ :paramtype file: str
+ :keyword line: Required.
+ :paramtype line: float
+ :keyword message: Required.
+ :paramtype message: str
+ :keyword rule: Required.
+ :paramtype rule: str
+ :keyword level: Warning or Info. Required. Known values are: "Info" and "Warning".
+ :paramtype level: str or ~azure.mgmt.nginx.models.Level
+ :keyword category: Category of warning like Best-practices, Recommendation, Security etc.
+ :paramtype category: str
+ """
+ super().__init__(**kwargs)
+ self.id = id
+ self.directive = directive
+ self.description = description
+ self.file = file
+ self.line = line
+ self.message = message
+ self.rule = rule
+ self.level = level
+ self.category = category
+
+
class ErrorAdditionalInfo(_serialization.Model):
"""The resource management error additional info.
@@ -318,6 +424,27 @@ def __init__(self, **kwargs: Any) -> None:
self.additional_info = None
+class ErrorResponse(_serialization.Model):
+ """Common error response for all Azure Resource Manager APIs to return error details for failed
+ operations. (This also follows the OData error response format.).
+
+ :ivar error: The error object.
+ :vartype error: ~azure.mgmt.nginx.models.ErrorDetail
+ """
+
+ _attribute_map = {
+ "error": {"key": "error", "type": "ErrorDetail"},
+ }
+
+ def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: Any) -> None:
+ """
+ :keyword error: The error object.
+ :paramtype error: ~azure.mgmt.nginx.models.ErrorDetail
+ """
+ super().__init__(**kwargs)
+ self.error = error
+
+
class IdentityProperties(_serialization.Model):
"""IdentityProperties.
@@ -554,63 +681,6 @@ def __init__(
self.certificate_error = certificate_error
-class NginxConfiguration(_serialization.Model):
- """NginxConfiguration.
-
- Variables are only populated by the server, and will be ignored when sending a request.
-
- :ivar id:
- :vartype id: str
- :ivar name:
- :vartype name: str
- :ivar type:
- :vartype type: str
- :ivar properties:
- :vartype properties: ~azure.mgmt.nginx.models.NginxConfigurationProperties
- :ivar location:
- :vartype location: str
- :ivar system_data: Metadata pertaining to creation and last modification of the resource.
- :vartype system_data: ~azure.mgmt.nginx.models.SystemData
- """
-
- _validation = {
- "id": {"readonly": True},
- "name": {"readonly": True},
- "type": {"readonly": True},
- "system_data": {"readonly": True},
- }
-
- _attribute_map = {
- "id": {"key": "id", "type": "str"},
- "name": {"key": "name", "type": "str"},
- "type": {"key": "type", "type": "str"},
- "properties": {"key": "properties", "type": "NginxConfigurationProperties"},
- "location": {"key": "location", "type": "str"},
- "system_data": {"key": "systemData", "type": "SystemData"},
- }
-
- def __init__(
- self,
- *,
- properties: Optional["_models.NginxConfigurationProperties"] = None,
- location: Optional[str] = None,
- **kwargs: Any
- ) -> None:
- """
- :keyword properties:
- :paramtype properties: ~azure.mgmt.nginx.models.NginxConfigurationProperties
- :keyword location:
- :paramtype location: str
- """
- super().__init__(**kwargs)
- self.id = None
- self.name = None
- self.type = None
- self.properties = properties
- self.location = location
- self.system_data = None
-
-
class NginxConfigurationFile(_serialization.Model):
"""NginxConfigurationFile.
@@ -641,26 +711,26 @@ class NginxConfigurationListResponse(_serialization.Model):
"""Response of a list operation.
:ivar value: Results of a list operation.
- :vartype value: list[~azure.mgmt.nginx.models.NginxConfiguration]
+ :vartype value: list[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:ivar next_link: Link to the next set of results, if any.
:vartype next_link: str
"""
_attribute_map = {
- "value": {"key": "value", "type": "[NginxConfiguration]"},
+ "value": {"key": "value", "type": "[NginxConfigurationResponse]"},
"next_link": {"key": "nextLink", "type": "str"},
}
def __init__(
self,
*,
- value: Optional[List["_models.NginxConfiguration"]] = None,
+ value: Optional[List["_models.NginxConfigurationResponse"]] = None,
next_link: Optional[str] = None,
**kwargs: Any
) -> None:
"""
:keyword value: Results of a list operation.
- :paramtype value: list[~azure.mgmt.nginx.models.NginxConfiguration]
+ :paramtype value: list[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:keyword next_link: Link to the next set of results, if any.
:paramtype next_link: str
"""
@@ -693,12 +763,237 @@ def __init__(
:paramtype protected_files: list[str]
"""
super().__init__(**kwargs)
- self.data = data
- self.protected_files = protected_files
+ self.data = data
+ self.protected_files = protected_files
+
+
+class NginxConfigurationProtectedFileRequest(_serialization.Model):
+ """NginxConfigurationProtectedFileRequest.
+
+ :ivar content: The content of the protected file. This value is a PUT only value. If you
+ perform a GET request on this value, it will be empty because it is a protected file.
+ :vartype content: str
+ :ivar virtual_path: The virtual path of the protected file.
+ :vartype virtual_path: str
+ :ivar content_hash: The hash of the content of the file. This value is used to determine if the
+ file has changed.
+ :vartype content_hash: str
+ """
+
+ _attribute_map = {
+ "content": {"key": "content", "type": "str"},
+ "virtual_path": {"key": "virtualPath", "type": "str"},
+ "content_hash": {"key": "contentHash", "type": "str"},
+ }
+
+ def __init__(
+ self,
+ *,
+ content: Optional[str] = None,
+ virtual_path: Optional[str] = None,
+ content_hash: Optional[str] = None,
+ **kwargs: Any
+ ) -> None:
+ """
+ :keyword content: The content of the protected file. This value is a PUT only value. If you
+ perform a GET request on this value, it will be empty because it is a protected file.
+ :paramtype content: str
+ :keyword virtual_path: The virtual path of the protected file.
+ :paramtype virtual_path: str
+ :keyword content_hash: The hash of the content of the file. This value is used to determine if
+ the file has changed.
+ :paramtype content_hash: str
+ """
+ super().__init__(**kwargs)
+ self.content = content
+ self.virtual_path = virtual_path
+ self.content_hash = content_hash
+
+
+class NginxConfigurationProtectedFileResponse(_serialization.Model):
+ """NginxConfigurationProtectedFileResponse.
+
+ :ivar virtual_path: The virtual path of the protected file.
+ :vartype virtual_path: str
+ :ivar content_hash: The hash of the content of the file. This value is used to determine if the
+ file has changed.
+ :vartype content_hash: str
+ """
+
+ _attribute_map = {
+ "virtual_path": {"key": "virtualPath", "type": "str"},
+ "content_hash": {"key": "contentHash", "type": "str"},
+ }
+
+ def __init__(
+ self, *, virtual_path: Optional[str] = None, content_hash: Optional[str] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword virtual_path: The virtual path of the protected file.
+ :paramtype virtual_path: str
+ :keyword content_hash: The hash of the content of the file. This value is used to determine if
+ the file has changed.
+ :paramtype content_hash: str
+ """
+ super().__init__(**kwargs)
+ self.virtual_path = virtual_path
+ self.content_hash = content_hash
+
+
+class NginxConfigurationRequest(_serialization.Model):
+ """NginxConfigurationRequest.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar id:
+ :vartype id: str
+ :ivar name:
+ :vartype name: str
+ :ivar type:
+ :vartype type: str
+ :ivar properties:
+ :vartype properties: ~azure.mgmt.nginx.models.NginxConfigurationRequestProperties
+ :ivar system_data: Metadata pertaining to creation and last modification of the resource.
+ :vartype system_data: ~azure.mgmt.nginx.models.SystemData
+ """
+
+ _validation = {
+ "id": {"readonly": True},
+ "name": {"readonly": True},
+ "type": {"readonly": True},
+ "system_data": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "id": {"key": "id", "type": "str"},
+ "name": {"key": "name", "type": "str"},
+ "type": {"key": "type", "type": "str"},
+ "properties": {"key": "properties", "type": "NginxConfigurationRequestProperties"},
+ "system_data": {"key": "systemData", "type": "SystemData"},
+ }
+
+ def __init__(
+ self, *, properties: Optional["_models.NginxConfigurationRequestProperties"] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword properties:
+ :paramtype properties: ~azure.mgmt.nginx.models.NginxConfigurationRequestProperties
+ """
+ super().__init__(**kwargs)
+ self.id = None
+ self.name = None
+ self.type = None
+ self.properties = properties
+ self.system_data = None
+
+
+class NginxConfigurationRequestProperties(_serialization.Model):
+ """NginxConfigurationRequestProperties.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar provisioning_state: Known values are: "Accepted", "Creating", "Updating", "Deleting",
+ "Succeeded", "Failed", "Canceled", "Deleted", and "NotSpecified".
+ :vartype provisioning_state: str or ~azure.mgmt.nginx.models.ProvisioningState
+ :ivar files:
+ :vartype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :ivar protected_files:
+ :vartype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileRequest]
+ :ivar package:
+ :vartype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
+ :ivar root_file:
+ :vartype root_file: str
+ """
+
+ _validation = {
+ "provisioning_state": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "provisioning_state": {"key": "provisioningState", "type": "str"},
+ "files": {"key": "files", "type": "[NginxConfigurationFile]"},
+ "protected_files": {"key": "protectedFiles", "type": "[NginxConfigurationProtectedFileRequest]"},
+ "package": {"key": "package", "type": "NginxConfigurationPackage"},
+ "root_file": {"key": "rootFile", "type": "str"},
+ }
+
+ def __init__(
+ self,
+ *,
+ files: Optional[List["_models.NginxConfigurationFile"]] = None,
+ protected_files: Optional[List["_models.NginxConfigurationProtectedFileRequest"]] = None,
+ package: Optional["_models.NginxConfigurationPackage"] = None,
+ root_file: Optional[str] = None,
+ **kwargs: Any
+ ) -> None:
+ """
+ :keyword files:
+ :paramtype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :keyword protected_files:
+ :paramtype protected_files:
+ list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileRequest]
+ :keyword package:
+ :paramtype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
+ :keyword root_file:
+ :paramtype root_file: str
+ """
+ super().__init__(**kwargs)
+ self.provisioning_state = None
+ self.files = files
+ self.protected_files = protected_files
+ self.package = package
+ self.root_file = root_file
+
+
+class NginxConfigurationResponse(_serialization.Model):
+ """NginxConfigurationResponse.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar id:
+ :vartype id: str
+ :ivar name:
+ :vartype name: str
+ :ivar type:
+ :vartype type: str
+ :ivar properties:
+ :vartype properties: ~azure.mgmt.nginx.models.NginxConfigurationResponseProperties
+ :ivar system_data: Metadata pertaining to creation and last modification of the resource.
+ :vartype system_data: ~azure.mgmt.nginx.models.SystemData
+ """
+
+ _validation = {
+ "id": {"readonly": True},
+ "name": {"readonly": True},
+ "type": {"readonly": True},
+ "system_data": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "id": {"key": "id", "type": "str"},
+ "name": {"key": "name", "type": "str"},
+ "type": {"key": "type", "type": "str"},
+ "properties": {"key": "properties", "type": "NginxConfigurationResponseProperties"},
+ "system_data": {"key": "systemData", "type": "SystemData"},
+ }
+
+ def __init__(
+ self, *, properties: Optional["_models.NginxConfigurationResponseProperties"] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword properties:
+ :paramtype properties: ~azure.mgmt.nginx.models.NginxConfigurationResponseProperties
+ """
+ super().__init__(**kwargs)
+ self.id = None
+ self.name = None
+ self.type = None
+ self.properties = properties
+ self.system_data = None
-class NginxConfigurationProperties(_serialization.Model):
- """NginxConfigurationProperties.
+class NginxConfigurationResponseProperties(_serialization.Model):
+ """NginxConfigurationResponseProperties.
Variables are only populated by the server, and will be ignored when sending a request.
@@ -708,7 +1003,8 @@ class NginxConfigurationProperties(_serialization.Model):
:ivar files:
:vartype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
:ivar protected_files:
- :vartype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :vartype protected_files:
+ list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileResponse]
:ivar package:
:vartype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
:ivar root_file:
@@ -722,7 +1018,7 @@ class NginxConfigurationProperties(_serialization.Model):
_attribute_map = {
"provisioning_state": {"key": "provisioningState", "type": "str"},
"files": {"key": "files", "type": "[NginxConfigurationFile]"},
- "protected_files": {"key": "protectedFiles", "type": "[NginxConfigurationFile]"},
+ "protected_files": {"key": "protectedFiles", "type": "[NginxConfigurationProtectedFileResponse]"},
"package": {"key": "package", "type": "NginxConfigurationPackage"},
"root_file": {"key": "rootFile", "type": "str"},
}
@@ -731,7 +1027,7 @@ def __init__(
self,
*,
files: Optional[List["_models.NginxConfigurationFile"]] = None,
- protected_files: Optional[List["_models.NginxConfigurationFile"]] = None,
+ protected_files: Optional[List["_models.NginxConfigurationProtectedFileResponse"]] = None,
package: Optional["_models.NginxConfigurationPackage"] = None,
root_file: Optional[str] = None,
**kwargs: Any
@@ -740,7 +1036,8 @@ def __init__(
:keyword files:
:paramtype files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
:keyword protected_files:
- :paramtype protected_files: list[~azure.mgmt.nginx.models.NginxConfigurationFile]
+ :paramtype protected_files:
+ list[~azure.mgmt.nginx.models.NginxConfigurationProtectedFileResponse]
:keyword package:
:paramtype package: ~azure.mgmt.nginx.models.NginxConfigurationPackage
:keyword root_file:
@@ -832,6 +1129,185 @@ def __init__(
self.system_data = None
+class NginxDeploymentApiKeyListResponse(_serialization.Model):
+ """NginxDeploymentApiKeyListResponse.
+
+ :ivar value:
+ :vartype value: list[~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse]
+ :ivar next_link:
+ :vartype next_link: str
+ """
+
+ _attribute_map = {
+ "value": {"key": "value", "type": "[NginxDeploymentApiKeyResponse]"},
+ "next_link": {"key": "nextLink", "type": "str"},
+ }
+
+ def __init__(
+ self,
+ *,
+ value: Optional[List["_models.NginxDeploymentApiKeyResponse"]] = None,
+ next_link: Optional[str] = None,
+ **kwargs: Any
+ ) -> None:
+ """
+ :keyword value:
+ :paramtype value: list[~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse]
+ :keyword next_link:
+ :paramtype next_link: str
+ """
+ super().__init__(**kwargs)
+ self.value = value
+ self.next_link = next_link
+
+
+class NginxDeploymentApiKeyRequest(_serialization.Model):
+ """NginxDeploymentApiKeyRequest.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar id:
+ :vartype id: str
+ :ivar name:
+ :vartype name: str
+ :ivar type:
+ :vartype type: str
+ :ivar properties:
+ :vartype properties: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequestProperties
+ """
+
+ _validation = {
+ "id": {"readonly": True},
+ "name": {"readonly": True},
+ "type": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "id": {"key": "id", "type": "str"},
+ "name": {"key": "name", "type": "str"},
+ "type": {"key": "type", "type": "str"},
+ "properties": {"key": "properties", "type": "NginxDeploymentApiKeyRequestProperties"},
+ }
+
+ def __init__(
+ self, *, properties: Optional["_models.NginxDeploymentApiKeyRequestProperties"] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword properties:
+ :paramtype properties: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequestProperties
+ """
+ super().__init__(**kwargs)
+ self.id = None
+ self.name = None
+ self.type = None
+ self.properties = properties
+
+
+class NginxDeploymentApiKeyRequestProperties(_serialization.Model):
+ """NginxDeploymentApiKeyRequestProperties.
+
+ :ivar secret_text: Secret text to be used as a Dataplane API Key. This is a write only property
+ that can never be read back, but the first three characters will be returned in the 'hint'
+ property.
+ :vartype secret_text: str
+ :ivar end_date_time: The time after which this Dataplane API Key is no longer valid.
+ :vartype end_date_time: ~datetime.datetime
+ """
+
+ _attribute_map = {
+ "secret_text": {"key": "secretText", "type": "str"},
+ "end_date_time": {"key": "endDateTime", "type": "iso-8601"},
+ }
+
+ def __init__(
+ self, *, secret_text: Optional[str] = None, end_date_time: Optional[datetime.datetime] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword secret_text: Secret text to be used as a Dataplane API Key. This is a write only
+ property that can never be read back, but the first three characters will be returned in the
+ 'hint' property.
+ :paramtype secret_text: str
+ :keyword end_date_time: The time after which this Dataplane API Key is no longer valid.
+ :paramtype end_date_time: ~datetime.datetime
+ """
+ super().__init__(**kwargs)
+ self.secret_text = secret_text
+ self.end_date_time = end_date_time
+
+
+class NginxDeploymentApiKeyResponse(_serialization.Model):
+ """NginxDeploymentApiKeyResponse.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar id:
+ :vartype id: str
+ :ivar name:
+ :vartype name: str
+ :ivar type:
+ :vartype type: str
+ :ivar properties:
+ :vartype properties: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponseProperties
+ """
+
+ _validation = {
+ "id": {"readonly": True},
+ "name": {"readonly": True},
+ "type": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "id": {"key": "id", "type": "str"},
+ "name": {"key": "name", "type": "str"},
+ "type": {"key": "type", "type": "str"},
+ "properties": {"key": "properties", "type": "NginxDeploymentApiKeyResponseProperties"},
+ }
+
+ def __init__(
+ self, *, properties: Optional["_models.NginxDeploymentApiKeyResponseProperties"] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword properties:
+ :paramtype properties: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponseProperties
+ """
+ super().__init__(**kwargs)
+ self.id = None
+ self.name = None
+ self.type = None
+ self.properties = properties
+
+
+class NginxDeploymentApiKeyResponseProperties(_serialization.Model):
+ """NginxDeploymentApiKeyResponseProperties.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar hint: The first three characters of the secret text to help identify it in use. This
+ property is read-only.
+ :vartype hint: str
+ :ivar end_date_time: The time after which this Dataplane API Key is no longer valid.
+ :vartype end_date_time: ~datetime.datetime
+ """
+
+ _validation = {
+ "hint": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "hint": {"key": "hint", "type": "str"},
+ "end_date_time": {"key": "endDateTime", "type": "iso-8601"},
+ }
+
+ def __init__(self, *, end_date_time: Optional[datetime.datetime] = None, **kwargs: Any) -> None:
+ """
+ :keyword end_date_time: The time after which this Dataplane API Key is no longer valid.
+ :paramtype end_date_time: ~datetime.datetime
+ """
+ super().__init__(**kwargs)
+ self.hint = None
+ self.end_date_time = end_date_time
+
+
class NginxDeploymentListResponse(_serialization.Model):
"""NginxDeploymentListResponse.
@@ -870,9 +1346,6 @@ class NginxDeploymentProperties(_serialization.Model):
:vartype provisioning_state: str or ~azure.mgmt.nginx.models.ProvisioningState
:ivar nginx_version:
:vartype nginx_version: str
- :ivar managed_resource_group: The managed resource group to deploy VNet injection related
- network resources.
- :vartype managed_resource_group: str
:ivar network_profile:
:vartype network_profile: ~azure.mgmt.nginx.models.NginxNetworkProfile
:ivar ip_address: The IP address of the deployment.
@@ -887,18 +1360,23 @@ class NginxDeploymentProperties(_serialization.Model):
:vartype auto_upgrade_profile: ~azure.mgmt.nginx.models.AutoUpgradeProfile
:ivar user_profile:
:vartype user_profile: ~azure.mgmt.nginx.models.NginxDeploymentUserProfile
+ :ivar nginx_app_protect: Settings for NGINX App Protect (NAP).
+ :vartype nginx_app_protect: ~azure.mgmt.nginx.models.NginxDeploymentPropertiesNginxAppProtect
+ :ivar dataplane_api_endpoint: Dataplane API endpoint for the caller to update the NGINX state
+ of the deployment.
+ :vartype dataplane_api_endpoint: str
"""
_validation = {
"provisioning_state": {"readonly": True},
"nginx_version": {"readonly": True},
"ip_address": {"readonly": True},
+ "dataplane_api_endpoint": {"readonly": True},
}
_attribute_map = {
"provisioning_state": {"key": "provisioningState", "type": "str"},
"nginx_version": {"key": "nginxVersion", "type": "str"},
- "managed_resource_group": {"key": "managedResourceGroup", "type": "str"},
"network_profile": {"key": "networkProfile", "type": "NginxNetworkProfile"},
"ip_address": {"key": "ipAddress", "type": "str"},
"enable_diagnostics_support": {"key": "enableDiagnosticsSupport", "type": "bool"},
@@ -906,24 +1384,23 @@ class NginxDeploymentProperties(_serialization.Model):
"scaling_properties": {"key": "scalingProperties", "type": "NginxDeploymentScalingProperties"},
"auto_upgrade_profile": {"key": "autoUpgradeProfile", "type": "AutoUpgradeProfile"},
"user_profile": {"key": "userProfile", "type": "NginxDeploymentUserProfile"},
+ "nginx_app_protect": {"key": "nginxAppProtect", "type": "NginxDeploymentPropertiesNginxAppProtect"},
+ "dataplane_api_endpoint": {"key": "dataplaneApiEndpoint", "type": "str"},
}
def __init__(
self,
*,
- managed_resource_group: Optional[str] = None,
network_profile: Optional["_models.NginxNetworkProfile"] = None,
enable_diagnostics_support: Optional[bool] = None,
logging: Optional["_models.NginxLogging"] = None,
scaling_properties: Optional["_models.NginxDeploymentScalingProperties"] = None,
auto_upgrade_profile: Optional["_models.AutoUpgradeProfile"] = None,
user_profile: Optional["_models.NginxDeploymentUserProfile"] = None,
+ nginx_app_protect: Optional["_models.NginxDeploymentPropertiesNginxAppProtect"] = None,
**kwargs: Any
) -> None:
"""
- :keyword managed_resource_group: The managed resource group to deploy VNet injection related
- network resources.
- :paramtype managed_resource_group: str
:keyword network_profile:
:paramtype network_profile: ~azure.mgmt.nginx.models.NginxNetworkProfile
:keyword enable_diagnostics_support:
@@ -936,11 +1413,12 @@ def __init__(
:paramtype auto_upgrade_profile: ~azure.mgmt.nginx.models.AutoUpgradeProfile
:keyword user_profile:
:paramtype user_profile: ~azure.mgmt.nginx.models.NginxDeploymentUserProfile
+ :keyword nginx_app_protect: Settings for NGINX App Protect (NAP).
+ :paramtype nginx_app_protect: ~azure.mgmt.nginx.models.NginxDeploymentPropertiesNginxAppProtect
"""
super().__init__(**kwargs)
self.provisioning_state = None
self.nginx_version = None
- self.managed_resource_group = managed_resource_group
self.network_profile = network_profile
self.ip_address = None
self.enable_diagnostics_support = enable_diagnostics_support
@@ -948,6 +1426,54 @@ def __init__(
self.scaling_properties = scaling_properties
self.auto_upgrade_profile = auto_upgrade_profile
self.user_profile = user_profile
+ self.nginx_app_protect = nginx_app_protect
+ self.dataplane_api_endpoint = None
+
+
+class NginxDeploymentPropertiesNginxAppProtect(_serialization.Model):
+ """Settings for NGINX App Protect (NAP).
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ All required parameters must be populated in order to send to server.
+
+ :ivar web_application_firewall_settings: Settings for the NGINX App Protect Web Application
+ Firewall (WAF). Required.
+ :vartype web_application_firewall_settings:
+ ~azure.mgmt.nginx.models.WebApplicationFirewallSettings
+ :ivar web_application_firewall_status: The status of the NGINX App Protect Web Application
+ Firewall.
+ :vartype web_application_firewall_status: ~azure.mgmt.nginx.models.WebApplicationFirewallStatus
+ """
+
+ _validation = {
+ "web_application_firewall_settings": {"required": True},
+ "web_application_firewall_status": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "web_application_firewall_settings": {
+ "key": "webApplicationFirewallSettings",
+ "type": "WebApplicationFirewallSettings",
+ },
+ "web_application_firewall_status": {
+ "key": "webApplicationFirewallStatus",
+ "type": "WebApplicationFirewallStatus",
+ },
+ }
+
+ def __init__(
+ self, *, web_application_firewall_settings: "_models.WebApplicationFirewallSettings", **kwargs: Any
+ ) -> None:
+ """
+ :keyword web_application_firewall_settings: Settings for the NGINX App Protect Web Application
+ Firewall (WAF). Required.
+ :paramtype web_application_firewall_settings:
+ ~azure.mgmt.nginx.models.WebApplicationFirewallSettings
+ """
+ super().__init__(**kwargs)
+ self.web_application_firewall_settings = web_application_firewall_settings
+ self.web_application_firewall_status = None
class NginxDeploymentScalingProperties(_serialization.Model):
@@ -1042,8 +1568,13 @@ class NginxDeploymentUpdateProperties(_serialization.Model):
:vartype scaling_properties: ~azure.mgmt.nginx.models.NginxDeploymentScalingProperties
:ivar user_profile:
:vartype user_profile: ~azure.mgmt.nginx.models.NginxDeploymentUserProfile
+ :ivar network_profile:
+ :vartype network_profile: ~azure.mgmt.nginx.models.NginxNetworkProfile
:ivar auto_upgrade_profile: Autoupgrade settings of a deployment.
:vartype auto_upgrade_profile: ~azure.mgmt.nginx.models.AutoUpgradeProfile
+ :ivar nginx_app_protect: Update settings for NGINX App Protect (NAP).
+ :vartype nginx_app_protect:
+ ~azure.mgmt.nginx.models.NginxDeploymentUpdatePropertiesNginxAppProtect
"""
_attribute_map = {
@@ -1051,7 +1582,9 @@ class NginxDeploymentUpdateProperties(_serialization.Model):
"logging": {"key": "logging", "type": "NginxLogging"},
"scaling_properties": {"key": "scalingProperties", "type": "NginxDeploymentScalingProperties"},
"user_profile": {"key": "userProfile", "type": "NginxDeploymentUserProfile"},
+ "network_profile": {"key": "networkProfile", "type": "NginxNetworkProfile"},
"auto_upgrade_profile": {"key": "autoUpgradeProfile", "type": "AutoUpgradeProfile"},
+ "nginx_app_protect": {"key": "nginxAppProtect", "type": "NginxDeploymentUpdatePropertiesNginxAppProtect"},
}
def __init__(
@@ -1061,7 +1594,9 @@ def __init__(
logging: Optional["_models.NginxLogging"] = None,
scaling_properties: Optional["_models.NginxDeploymentScalingProperties"] = None,
user_profile: Optional["_models.NginxDeploymentUserProfile"] = None,
+ network_profile: Optional["_models.NginxNetworkProfile"] = None,
auto_upgrade_profile: Optional["_models.AutoUpgradeProfile"] = None,
+ nginx_app_protect: Optional["_models.NginxDeploymentUpdatePropertiesNginxAppProtect"] = None,
**kwargs: Any
) -> None:
"""
@@ -1073,15 +1608,54 @@ def __init__(
:paramtype scaling_properties: ~azure.mgmt.nginx.models.NginxDeploymentScalingProperties
:keyword user_profile:
:paramtype user_profile: ~azure.mgmt.nginx.models.NginxDeploymentUserProfile
+ :keyword network_profile:
+ :paramtype network_profile: ~azure.mgmt.nginx.models.NginxNetworkProfile
:keyword auto_upgrade_profile: Autoupgrade settings of a deployment.
:paramtype auto_upgrade_profile: ~azure.mgmt.nginx.models.AutoUpgradeProfile
+ :keyword nginx_app_protect: Update settings for NGINX App Protect (NAP).
+ :paramtype nginx_app_protect:
+ ~azure.mgmt.nginx.models.NginxDeploymentUpdatePropertiesNginxAppProtect
"""
super().__init__(**kwargs)
self.enable_diagnostics_support = enable_diagnostics_support
self.logging = logging
self.scaling_properties = scaling_properties
self.user_profile = user_profile
+ self.network_profile = network_profile
self.auto_upgrade_profile = auto_upgrade_profile
+ self.nginx_app_protect = nginx_app_protect
+
+
+class NginxDeploymentUpdatePropertiesNginxAppProtect(_serialization.Model): # pylint: disable=name-too-long
+ """Update settings for NGINX App Protect (NAP).
+
+ :ivar web_application_firewall_settings: Settings for the NGINX App Protect Web Application
+ Firewall (WAF).
+ :vartype web_application_firewall_settings:
+ ~azure.mgmt.nginx.models.WebApplicationFirewallSettings
+ """
+
+ _attribute_map = {
+ "web_application_firewall_settings": {
+ "key": "webApplicationFirewallSettings",
+ "type": "WebApplicationFirewallSettings",
+ },
+ }
+
+ def __init__(
+ self,
+ *,
+ web_application_firewall_settings: Optional["_models.WebApplicationFirewallSettings"] = None,
+ **kwargs: Any
+ ) -> None:
+ """
+ :keyword web_application_firewall_settings: Settings for the NGINX App Protect Web Application
+ Firewall (WAF).
+ :paramtype web_application_firewall_settings:
+ ~azure.mgmt.nginx.models.WebApplicationFirewallSettings
+ """
+ super().__init__(**kwargs)
+ self.web_application_firewall_settings = web_application_firewall_settings
class NginxDeploymentUserProfile(_serialization.Model):
@@ -1421,30 +1995,10 @@ def __init__(
self.is_data_action = is_data_action
-class ResourceProviderDefaultErrorResponse(_serialization.Model):
- """ResourceProviderDefaultErrorResponse.
-
- :ivar error: The error detail.
- :vartype error: ~azure.mgmt.nginx.models.ErrorDetail
- """
-
- _attribute_map = {
- "error": {"key": "error", "type": "ErrorDetail"},
- }
-
- def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: Any) -> None:
- """
- :keyword error: The error detail.
- :paramtype error: ~azure.mgmt.nginx.models.ErrorDetail
- """
- super().__init__(**kwargs)
- self.error = error
-
-
class ResourceSku(_serialization.Model):
"""ResourceSku.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar name: Name of the SKU. Required.
:vartype name: str
@@ -1470,7 +2024,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
class ScaleProfile(_serialization.Model):
"""The autoscale profile.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar name: Required.
:vartype name: str
@@ -1503,7 +2057,7 @@ def __init__(self, *, name: str, capacity: "_models.ScaleProfileCapacity", **kwa
class ScaleProfileCapacity(_serialization.Model):
"""The capacity parameters of the profile.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar min: The minimum number of NCUs the deployment can be autoscaled to. Required.
:vartype min: int
@@ -1629,3 +2183,142 @@ def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)
self.principal_id = None
self.client_id = None
+
+
+class WebApplicationFirewallComponentVersions(_serialization.Model):
+ """Versions of the NGINX App Protect Web Application Firewall (WAF) components.
+
+ All required parameters must be populated in order to send to server.
+
+ :ivar waf_engine_version: The version of the NGINX App Protect Web Application Firewall (WAF)
+ engine. Required.
+ :vartype waf_engine_version: str
+ :ivar waf_nginx_version: The version of the NGINX App Protect Web Application Firewall (WAF)
+ module for NGINX. Required.
+ :vartype waf_nginx_version: str
+ """
+
+ _validation = {
+ "waf_engine_version": {"required": True},
+ "waf_nginx_version": {"required": True},
+ }
+
+ _attribute_map = {
+ "waf_engine_version": {"key": "wafEngineVersion", "type": "str"},
+ "waf_nginx_version": {"key": "wafNginxVersion", "type": "str"},
+ }
+
+ def __init__(self, *, waf_engine_version: str, waf_nginx_version: str, **kwargs: Any) -> None:
+ """
+ :keyword waf_engine_version: The version of the NGINX App Protect Web Application Firewall
+ (WAF) engine. Required.
+ :paramtype waf_engine_version: str
+ :keyword waf_nginx_version: The version of the NGINX App Protect Web Application Firewall (WAF)
+ module for NGINX. Required.
+ :paramtype waf_nginx_version: str
+ """
+ super().__init__(**kwargs)
+ self.waf_engine_version = waf_engine_version
+ self.waf_nginx_version = waf_nginx_version
+
+
+class WebApplicationFirewallPackage(_serialization.Model):
+ """NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision
+ date of the package.
+
+ All required parameters must be populated in order to send to server.
+
+ :ivar version: The version of the NGINX App Protect Web Application Firewall (WAF) package.
+ Required.
+ :vartype version: str
+ :ivar revision_datetime: The date and time of the package revision. Required.
+ :vartype revision_datetime: ~datetime.datetime
+ """
+
+ _validation = {
+ "version": {"required": True},
+ "revision_datetime": {"required": True},
+ }
+
+ _attribute_map = {
+ "version": {"key": "version", "type": "str"},
+ "revision_datetime": {"key": "revisionDatetime", "type": "iso-8601"},
+ }
+
+ def __init__(self, *, version: str, revision_datetime: datetime.datetime, **kwargs: Any) -> None:
+ """
+ :keyword version: The version of the NGINX App Protect Web Application Firewall (WAF) package.
+ Required.
+ :paramtype version: str
+ :keyword revision_datetime: The date and time of the package revision. Required.
+ :paramtype revision_datetime: ~datetime.datetime
+ """
+ super().__init__(**kwargs)
+ self.version = version
+ self.revision_datetime = revision_datetime
+
+
+class WebApplicationFirewallSettings(_serialization.Model):
+ """Settings for the NGINX App Protect Web Application Firewall (WAF).
+
+ :ivar activation_state: The activation state of the WAF. Use 'Enabled' to enable the WAF and
+ 'Disabled' to disable it. Known values are: "Enabled" and "Disabled".
+ :vartype activation_state: str or ~azure.mgmt.nginx.models.ActivationState
+ """
+
+ _attribute_map = {
+ "activation_state": {"key": "activationState", "type": "str"},
+ }
+
+ def __init__(
+ self, *, activation_state: Optional[Union[str, "_models.ActivationState"]] = None, **kwargs: Any
+ ) -> None:
+ """
+ :keyword activation_state: The activation state of the WAF. Use 'Enabled' to enable the WAF and
+ 'Disabled' to disable it. Known values are: "Enabled" and "Disabled".
+ :paramtype activation_state: str or ~azure.mgmt.nginx.models.ActivationState
+ """
+ super().__init__(**kwargs)
+ self.activation_state = activation_state
+
+
+class WebApplicationFirewallStatus(_serialization.Model):
+ """The status of the NGINX App Protect Web Application Firewall.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ :ivar attack_signatures_package: Package containing attack signatures for the NGINX App Protect
+ Web Application Firewall (WAF).
+ :vartype attack_signatures_package: ~azure.mgmt.nginx.models.WebApplicationFirewallPackage
+ :ivar bot_signatures_package: Package containing bot signatures for the NGINX App Protect Web
+ Application Firewall (WAF).
+ :vartype bot_signatures_package: ~azure.mgmt.nginx.models.WebApplicationFirewallPackage
+ :ivar threat_campaigns_package: Package containing threat campaigns for the NGINX App Protect
+ Web Application Firewall (WAF).
+ :vartype threat_campaigns_package: ~azure.mgmt.nginx.models.WebApplicationFirewallPackage
+ :ivar component_versions: Versions of the NGINX App Protect Web Application Firewall (WAF)
+ components.
+ :vartype component_versions: ~azure.mgmt.nginx.models.WebApplicationFirewallComponentVersions
+ """
+
+ _validation = {
+ "attack_signatures_package": {"readonly": True},
+ "bot_signatures_package": {"readonly": True},
+ "threat_campaigns_package": {"readonly": True},
+ "component_versions": {"readonly": True},
+ }
+
+ _attribute_map = {
+ "attack_signatures_package": {"key": "attackSignaturesPackage", "type": "WebApplicationFirewallPackage"},
+ "bot_signatures_package": {"key": "botSignaturesPackage", "type": "WebApplicationFirewallPackage"},
+ "threat_campaigns_package": {"key": "threatCampaignsPackage", "type": "WebApplicationFirewallPackage"},
+ "component_versions": {"key": "componentVersions", "type": "WebApplicationFirewallComponentVersions"},
+ }
+
+ def __init__(self, **kwargs: Any) -> None:
+ """ """
+ super().__init__(**kwargs)
+ self.attack_signatures_package = None
+ self.bot_signatures_package = None
+ self.threat_campaigns_package = None
+ self.component_versions = None
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_nginx_management_client_enums.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_nginx_management_client_enums.py
index 0b4211efeaa6..9d6b8d706b9f 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_nginx_management_client_enums.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/models/_nginx_management_client_enums.py
@@ -10,6 +10,13 @@
from azure.core import CaseInsensitiveEnumMeta
+class ActivationState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+ """The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it."""
+
+ ENABLED = "Enabled"
+ DISABLED = "Disabled"
+
+
class CreatedByType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""The type of identity that created the resource."""
@@ -28,6 +35,13 @@ class IdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
NONE = "None"
+class Level(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+ """Warning or Info."""
+
+ INFO = "Info"
+ WARNING = "Warning"
+
+
class NginxPrivateIPAllocationMethod(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""NginxPrivateIPAllocationMethod."""
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/__init__.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/__init__.py
index 28571fd86d09..bf1dfbd4df3e 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/__init__.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/__init__.py
@@ -5,21 +5,29 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._certificates_operations import CertificatesOperations
-from ._configurations_operations import ConfigurationsOperations
-from ._deployments_operations import DeploymentsOperations
-from ._operations import Operations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._api_keys_operations import ApiKeysOperations # type: ignore
+from ._certificates_operations import CertificatesOperations # type: ignore
+from ._configurations_operations import ConfigurationsOperations # type: ignore
+from ._deployments_operations import DeploymentsOperations # type: ignore
+from ._operations import Operations # type: ignore
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
+ "ApiKeysOperations",
"CertificatesOperations",
"ConfigurationsOperations",
"DeploymentsOperations",
"Operations",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_api_keys_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_api_keys_operations.py
new file mode 100644
index 000000000000..b4d2368903b6
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_api_keys_operations.py
@@ -0,0 +1,591 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+ ClientAuthenticationError,
+ HttpResponseError,
+ ResourceExistsError,
+ ResourceNotFoundError,
+ ResourceNotModifiedError,
+ map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from .._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_create_or_update_request(
+ resource_group_name: str, deployment_name: str, api_key_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ accept = _headers.pop("Accept", "application/json")
+
+ # Construct URL
+ _url = kwargs.pop(
+ "template_url",
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys/{apiKeyName}",
+ ) # pylint: disable=line-too-long
+ path_format_arguments = {
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
+ "resourceGroupName": _SERIALIZER.url(
+ "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+ ),
+ "deploymentName": _SERIALIZER.url(
+ "deployment_name",
+ deployment_name,
+ "str",
+ pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
+ ),
+ "apiKeyName": _SERIALIZER.url(
+ "api_key_name", api_key_name, "str", pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$"
+ ),
+ }
+
+ _url: str = _url.format(**path_format_arguments) # type: ignore
+
+ # Construct parameters
+ _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+ # Construct headers
+ if content_type is not None:
+ _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+ _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+ return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+ resource_group_name: str, deployment_name: str, api_key_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
+ accept = _headers.pop("Accept", "application/json")
+
+ # Construct URL
+ _url = kwargs.pop(
+ "template_url",
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys/{apiKeyName}",
+ ) # pylint: disable=line-too-long
+ path_format_arguments = {
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
+ "resourceGroupName": _SERIALIZER.url(
+ "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+ ),
+ "deploymentName": _SERIALIZER.url(
+ "deployment_name",
+ deployment_name,
+ "str",
+ pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
+ ),
+ "apiKeyName": _SERIALIZER.url(
+ "api_key_name", api_key_name, "str", pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$"
+ ),
+ }
+
+ _url: str = _url.format(**path_format_arguments) # type: ignore
+
+ # Construct parameters
+ _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+ # Construct headers
+ _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+ return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+ resource_group_name: str, deployment_name: str, api_key_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
+ accept = _headers.pop("Accept", "application/json")
+
+ # Construct URL
+ _url = kwargs.pop(
+ "template_url",
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys/{apiKeyName}",
+ ) # pylint: disable=line-too-long
+ path_format_arguments = {
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
+ "resourceGroupName": _SERIALIZER.url(
+ "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+ ),
+ "deploymentName": _SERIALIZER.url(
+ "deployment_name",
+ deployment_name,
+ "str",
+ pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
+ ),
+ "apiKeyName": _SERIALIZER.url(
+ "api_key_name", api_key_name, "str", pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$"
+ ),
+ }
+
+ _url: str = _url.format(**path_format_arguments) # type: ignore
+
+ # Construct parameters
+ _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+ # Construct headers
+ _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+ return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(
+ resource_group_name: str, deployment_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
+ accept = _headers.pop("Accept", "application/json")
+
+ # Construct URL
+ _url = kwargs.pop(
+ "template_url",
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys",
+ ) # pylint: disable=line-too-long
+ path_format_arguments = {
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
+ "resourceGroupName": _SERIALIZER.url(
+ "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+ ),
+ "deploymentName": _SERIALIZER.url(
+ "deployment_name",
+ deployment_name,
+ "str",
+ pattern=r"^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
+ ),
+ }
+
+ _url: str = _url.format(**path_format_arguments) # type: ignore
+
+ # Construct parameters
+ _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+ # Construct headers
+ _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+ return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class ApiKeysOperations:
+ """
+ .. warning::
+ **DO NOT** instantiate this class directly.
+
+ Instead, you should access the following operations through
+ :class:`~azure.mgmt.nginx.NginxManagementClient`'s
+ :attr:`api_keys` attribute.
+ """
+
+ models = _models
+
+ def __init__(self, *args, **kwargs):
+ input_args = list(args)
+ self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+
+ @overload
+ def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[_models.NginxDeploymentApiKeyRequest] = None,
+ *,
+ content_type: str = "application/json",
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequest
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @overload
+ def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[IO[bytes]] = None,
+ *,
+ content_type: str = "application/json",
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Default value is None.
+ :type body: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @distributed_trace
+ def create_or_update(
+ self,
+ resource_group_name: str,
+ deployment_name: str,
+ api_key_name: str,
+ body: Optional[Union[_models.NginxDeploymentApiKeyRequest, IO[bytes]]] = None,
+ **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ Create or update an API Key for the Nginx deployment in order to access the dataplane API
+ endpoint.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :param body: The API Key object containing fields (e.g. secret text, expiration date) to upsert
+ the key. Is either a NginxDeploymentApiKeyRequest type or a IO[bytes] type. Default value is
+ None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyRequest or IO[bytes]
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ cls: ClsType[_models.NginxDeploymentApiKeyResponse] = kwargs.pop("cls", None)
+
+ content_type = content_type or "application/json"
+ _json = None
+ _content = None
+ if isinstance(body, (IOBase, bytes)):
+ _content = body
+ else:
+ if body is not None:
+ _json = self._serialize.body(body, "NginxDeploymentApiKeyRequest")
+ else:
+ _json = None
+
+ _request = build_create_or_update_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ content_type=content_type,
+ json=_json,
+ content=_content,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200, 201]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ deserialized = self._deserialize("NginxDeploymentApiKeyResponse", pipeline_response.http_response)
+
+ if cls:
+ return cls(pipeline_response, deserialized, {}) # type: ignore
+
+ return deserialized # type: ignore
+
+ @distributed_trace
+ def delete( # pylint: disable=inconsistent-return-statements
+ self, resource_group_name: str, deployment_name: str, api_key_name: str, **kwargs: Any
+ ) -> None:
+ """Delete API key for Nginx deployment.
+
+ Delete API key for Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :return: None or the result of cls(response)
+ :rtype: None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[None] = kwargs.pop("cls", None)
+
+ _request = build_delete_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200, 204]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ if cls:
+ return cls(pipeline_response, None, {}) # type: ignore
+
+ @distributed_trace
+ def get(
+ self, resource_group_name: str, deployment_name: str, api_key_name: str, **kwargs: Any
+ ) -> _models.NginxDeploymentApiKeyResponse:
+ """Get the specified API Key of the given Nginx deployment.
+
+ Get the specified API Key of the given Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :param api_key_name: The resource name of the API key. Required.
+ :type api_key_name: str
+ :return: NginxDeploymentApiKeyResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[_models.NginxDeploymentApiKeyResponse] = kwargs.pop("cls", None)
+
+ _request = build_get_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ api_key_name=api_key_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ _stream = False
+ pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ deserialized = self._deserialize("NginxDeploymentApiKeyResponse", pipeline_response.http_response)
+
+ if cls:
+ return cls(pipeline_response, deserialized, {}) # type: ignore
+
+ return deserialized # type: ignore
+
+ @distributed_trace
+ def list(
+ self, resource_group_name: str, deployment_name: str, **kwargs: Any
+ ) -> Iterable["_models.NginxDeploymentApiKeyResponse"]:
+ """List all API Keys of the given Nginx deployment.
+
+ List all API Keys of the given Nginx deployment.
+
+ :param resource_group_name: The name of the resource group. The name is case insensitive.
+ Required.
+ :type resource_group_name: str
+ :param deployment_name: The name of targeted NGINX deployment. Required.
+ :type deployment_name: str
+ :return: An iterator like instance of either NginxDeploymentApiKeyResponse or the result of
+ cls(response)
+ :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxDeploymentApiKeyResponse]
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
+ cls: ClsType[_models.NginxDeploymentApiKeyListResponse] = kwargs.pop("cls", None)
+
+ error_map: MutableMapping = {
+ 401: ClientAuthenticationError,
+ 404: ResourceNotFoundError,
+ 409: ResourceExistsError,
+ 304: ResourceNotModifiedError,
+ }
+ error_map.update(kwargs.pop("error_map", {}) or {})
+
+ def prepare_request(next_link=None):
+ if not next_link:
+
+ _request = build_list_request(
+ resource_group_name=resource_group_name,
+ deployment_name=deployment_name,
+ subscription_id=self._config.subscription_id,
+ api_version=api_version,
+ headers=_headers,
+ params=_params,
+ )
+ _request.url = self._client.format_url(_request.url)
+
+ else:
+ # make call to next link with the client's api-version
+ _parsed_next_link = urllib.parse.urlparse(next_link)
+ _next_request_params = case_insensitive_dict(
+ {
+ key: [urllib.parse.quote(v) for v in value]
+ for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+ }
+ )
+ _next_request_params["api-version"] = self._config.api_version
+ _request = HttpRequest(
+ "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+ )
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
+
+ def extract_data(pipeline_response):
+ deserialized = self._deserialize("NginxDeploymentApiKeyListResponse", pipeline_response)
+ list_of_elem = deserialized.value
+ if cls:
+ list_of_elem = cls(list_of_elem) # type: ignore
+ return deserialized.next_link or None, iter(list_of_elem)
+
+ def get_next(next_link=None):
+ _request = prepare_request(next_link)
+
+ _stream = False
+ pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+ response = pipeline_response.http_response
+
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+ raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+ return pipeline_response
+
+ return ItemPaged(get_next, extract_data)
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_certificates_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_certificates_operations.py
index c9dc0626a855..8caee16fcec7 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_certificates_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_certificates_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.exceptions import (
@@ -16,13 +16,14 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -30,8 +31,11 @@
from .. import models as _models
from .._serialization import Serializer
-from .._vendor import _convert_request
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +49,7 @@ def build_get_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -54,7 +58,7 @@ def build_get_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -84,7 +88,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -94,7 +98,7 @@ def build_create_or_update_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -126,7 +130,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -135,7 +139,7 @@ def build_delete_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -165,7 +169,7 @@ def build_list_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -174,7 +178,7 @@ def build_list_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -231,12 +235,11 @@ def get(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: NginxCertificate or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.NginxCertificate
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -250,53 +253,45 @@ def get(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxCertificate] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = self._deserialize("NginxCertificate", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return deserialized # type: ignore
def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[Union[_models.NginxCertificate, IO]] = None,
+ body: Optional[Union[_models.NginxCertificate, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxCertificate:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -309,7 +304,7 @@ def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxCertificate] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -322,7 +317,7 @@ def _create_or_update_initial(
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
@@ -331,42 +326,35 @@ def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
-
@overload
def begin_create_or_update(
self,
@@ -394,14 +382,6 @@ def begin_create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -414,7 +394,7 @@ def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -431,18 +411,10 @@ def begin_create_or_update(
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
:param body: The certificate. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -455,7 +427,7 @@ def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
certificate_name: str,
- body: Optional[Union[_models.NginxCertificate, IO]] = None,
+ body: Optional[Union[_models.NginxCertificate, IO[bytes]]] = None,
**kwargs: Any
) -> LROPoller[_models.NginxCertificate]:
"""Create or update the NGINX certificates for given NGINX deployment.
@@ -469,20 +441,9 @@ def begin_create_or_update(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :param body: The certificate. Is either a NginxCertificate type or a IO type. Default value is
- None.
- :type body: ~azure.mgmt.nginx.models.NginxCertificate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: The certificate. Is either a NginxCertificate type or a IO[bytes] type. Default
+ value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxCertificate or IO[bytes]
:return: An instance of LROPoller that returns either NginxCertificate or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxCertificate]
@@ -510,12 +471,13 @@ def begin_create_or_update(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxCertificate", pipeline_response)
+ deserialized = self._deserialize("NginxCertificate", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -527,22 +489,20 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[_models.NginxCertificate].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return LROPoller[_models.NginxCertificate](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- def _delete_initial( # pylint: disable=inconsistent-return-statements
+ def _delete_initial(
self, resource_group_name: str, deployment_name: str, certificate_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -554,41 +514,42 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def begin_delete(
@@ -605,14 +566,6 @@ def begin_delete(
:type deployment_name: str
:param certificate_name: The name of certificate. Required.
:type certificate_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.LROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -626,7 +579,7 @@ def begin_delete(
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = self._delete_initial( # type: ignore
+ raw_result = self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
certificate_name=certificate_name,
@@ -636,11 +589,12 @@ def begin_delete(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs))
@@ -649,17 +603,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}"
- }
+ return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@distributed_trace
def list(
@@ -674,7 +624,6 @@ def list(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxCertificate or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxCertificate]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -685,7 +634,7 @@ def list(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxCertificateListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -696,17 +645,15 @@ def list(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -718,13 +665,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("NginxCertificateListResponse", pipeline_response)
@@ -734,25 +680,19 @@ def extract_data(pipeline_response):
return deserialized.next_link or None, iter(list_of_elem)
def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates"
- }
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_configurations_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_configurations_operations.py
index 4673f8c3c5af..6c10036b327c 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_configurations_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_configurations_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.exceptions import (
@@ -16,13 +16,14 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -30,8 +31,11 @@
from .. import models as _models
from .._serialization import Serializer
-from .._vendor import _convert_request
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +49,7 @@ def build_list_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -54,7 +58,7 @@ def build_list_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -83,7 +87,7 @@ def build_get_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -92,7 +96,7 @@ def build_get_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -122,7 +126,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -132,7 +136,7 @@ def build_create_or_update_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -164,7 +168,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -173,7 +177,7 @@ def build_delete_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -203,7 +207,7 @@ def build_analysis_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -213,7 +217,7 @@ def build_analysis_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -263,7 +267,7 @@ def __init__(self, *args, **kwargs):
@distributed_trace
def list(
self, resource_group_name: str, deployment_name: str, **kwargs: Any
- ) -> Iterable["_models.NginxConfiguration"]:
+ ) -> Iterable["_models.NginxConfigurationResponse"]:
"""List the NGINX configuration of given NGINX deployment.
List the NGINX configuration of given NGINX deployment.
@@ -273,9 +277,9 @@ def list(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :return: An iterator like instance of either NginxConfiguration or the result of cls(response)
- :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An iterator like instance of either NginxConfigurationResponse or the result of
+ cls(response)
+ :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
_headers = kwargs.pop("headers", {}) or {}
@@ -284,7 +288,7 @@ def list(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxConfigurationListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -295,17 +299,15 @@ def list(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -317,13 +319,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("NginxConfigurationListResponse", pipeline_response)
@@ -333,33 +334,27 @@ def extract_data(pipeline_response):
return deserialized.next_link or None, iter(list_of_elem)
def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return ItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations"
- }
-
@distributed_trace
def get(
self, resource_group_name: str, deployment_name: str, configuration_name: str, **kwargs: Any
- ) -> _models.NginxConfiguration:
+ ) -> _models.NginxConfigurationResponse:
"""Get the NGINX configuration of given NGINX deployment.
Get the NGINX configuration of given NGINX deployment.
@@ -372,12 +367,11 @@ def get(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :return: NginxConfiguration or the result of cls(response)
- :rtype: ~azure.mgmt.nginx.models.NginxConfiguration
+ :return: NginxConfigurationResponse or the result of cls(response)
+ :rtype: ~azure.mgmt.nginx.models.NginxConfigurationResponse
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -389,55 +383,47 @@ def get(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[_models.NginxConfigurationResponse] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = self._deserialize("NginxConfigurationResponse", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return deserialized # type: ignore
def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.NginxConfiguration, IO]] = None,
+ body: Optional[Union[_models.NginxConfigurationRequest, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxConfiguration:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -450,7 +436,7 @@ def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -459,11 +445,11 @@ def _create_or_update_initial(
_content = body
else:
if body is not None:
- _json = self._serialize.body(body, "NginxConfiguration")
+ _json = self._serialize.body(body, "NginxConfigurationRequest")
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -472,53 +458,46 @@ def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
-
@overload
def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[_models.NginxConfiguration] = None,
+ body: Optional[_models.NginxConfigurationRequest] = None,
*,
content_type: str = "application/json",
**kwargs: Any
- ) -> LROPoller[_models.NginxConfiguration]:
+ ) -> LROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -532,21 +511,13 @@ def begin_create_or_update(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration. Default value is None.
- :type body: ~azure.mgmt.nginx.models.NginxConfiguration
+ :type body: ~azure.mgmt.nginx.models.NginxConfigurationRequest
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of LROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An instance of LROPoller that returns either NginxConfigurationResponse or the result
+ of cls(response)
+ :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
@@ -556,11 +527,11 @@ def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
- ) -> LROPoller[_models.NginxConfiguration]:
+ ) -> LROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -574,21 +545,13 @@ def begin_create_or_update(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of LROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :return: An instance of LROPoller that returns either NginxConfigurationResponse or the result
+ of cls(response)
+ :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
@@ -598,9 +561,9 @@ def begin_create_or_update(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.NginxConfiguration, IO]] = None,
+ body: Optional[Union[_models.NginxConfigurationRequest, IO[bytes]]] = None,
**kwargs: Any
- ) -> LROPoller[_models.NginxConfiguration]:
+ ) -> LROPoller[_models.NginxConfigurationResponse]:
"""Create or update the NGINX configuration for given NGINX deployment.
Create or update the NGINX configuration for given NGINX deployment.
@@ -613,23 +576,12 @@ def begin_create_or_update(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :param body: The NGINX configuration. Is either a NginxConfiguration type or a IO type. Default
- value is None.
- :type body: ~azure.mgmt.nginx.models.NginxConfiguration or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
- :return: An instance of LROPoller that returns either NginxConfiguration or the result of
- cls(response)
- :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfiguration]
+ :param body: The NGINX configuration. Is either a NginxConfigurationRequest type or a IO[bytes]
+ type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxConfigurationRequest or IO[bytes]
+ :return: An instance of LROPoller that returns either NginxConfigurationResponse or the result
+ of cls(response)
+ :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxConfigurationResponse]
:raises ~azure.core.exceptions.HttpResponseError:
"""
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
@@ -637,7 +589,7 @@ def begin_create_or_update(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxConfiguration] = kwargs.pop("cls", None)
+ cls: ClsType[_models.NginxConfigurationResponse] = kwargs.pop("cls", None)
polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
@@ -654,12 +606,13 @@ def begin_create_or_update(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxConfiguration", pipeline_response)
+ deserialized = self._deserialize("NginxConfigurationResponse", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -671,22 +624,20 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[_models.NginxConfigurationResponse].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return LROPoller[_models.NginxConfigurationResponse](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- def _delete_initial( # pylint: disable=inconsistent-return-statements
+ def _delete_initial(
self, resource_group_name: str, deployment_name: str, configuration_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -698,41 +649,42 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def begin_delete(
@@ -750,14 +702,6 @@ def begin_delete(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.LROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -771,7 +715,7 @@ def begin_delete(
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = self._delete_initial( # type: ignore
+ raw_result = self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -781,11 +725,12 @@ def begin_delete(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs))
@@ -794,17 +739,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}"
- }
+ return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@overload
def analysis(
@@ -834,7 +775,6 @@ def analysis(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
@@ -846,7 +786,7 @@ def analysis(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -864,11 +804,10 @@ def analysis(
the singleton of NGINX conf. Required.
:type configuration_name: str
:param body: The NGINX configuration to analyze. Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
@@ -880,7 +819,7 @@ def analysis(
resource_group_name: str,
deployment_name: str,
configuration_name: str,
- body: Optional[Union[_models.AnalysisCreate, IO]] = None,
+ body: Optional[Union[_models.AnalysisCreate, IO[bytes]]] = None,
**kwargs: Any
) -> _models.AnalysisResult:
"""Analyze an NGINX configuration without applying it to the NGINXaaS deployment.
@@ -895,18 +834,14 @@ def analysis(
:param configuration_name: The name of configuration, only 'default' is supported value due to
the singleton of NGINX conf. Required.
:type configuration_name: str
- :param body: The NGINX configuration to analyze. Is either a AnalysisCreate type or a IO type.
- Default value is None.
- :type body: ~azure.mgmt.nginx.models.AnalysisCreate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param body: The NGINX configuration to analyze. Is either a AnalysisCreate type or a IO[bytes]
+ type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.AnalysisCreate or IO[bytes]
:return: AnalysisResult or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.AnalysisResult
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -932,7 +867,7 @@ def analysis(
else:
_json = None
- request = build_analysis_request(
+ _request = build_analysis_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
configuration_name=configuration_name,
@@ -941,34 +876,26 @@ def analysis(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.analysis.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("AnalysisResult", pipeline_response)
+ deserialized = self._deserialize("AnalysisResult", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- analysis.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze"
- }
+ return deserialized # type: ignore
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_deployments_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_deployments_operations.py
index cc9db174ef0d..816e201aa2fa 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_deployments_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_deployments_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +6,8 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
import urllib.parse
from azure.core.exceptions import (
@@ -16,13 +16,14 @@
ResourceExistsError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -30,8 +31,11 @@
from .. import models as _models
from .._serialization import Serializer
-from .._vendor import _convert_request
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +49,7 @@ def build_get_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -54,7 +58,7 @@ def build_get_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -83,7 +87,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -93,7 +97,7 @@ def build_create_or_update_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -124,7 +128,7 @@ def build_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -134,7 +138,7 @@ def build_update_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -165,7 +169,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -174,7 +178,7 @@ def build_delete_request(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -201,13 +205,13 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
_url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments")
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
}
_url: str = _url.format(**path_format_arguments) # type: ignore
@@ -225,7 +229,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -234,7 +238,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments",
) # pylint: disable=line-too-long
path_format_arguments = {
- "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
"resourceGroupName": _SERIALIZER.url(
"resource_group_name", resource_group_name, "str", max_length=90, min_length=1
),
@@ -281,12 +285,11 @@ def get(self, resource_group_name: str, deployment_name: str, **kwargs: Any) ->
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: NginxDeployment or the result of cls(response)
:rtype: ~azure.mgmt.nginx.models.NginxDeployment
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -300,51 +303,43 @@ def get(self, resource_group_name: str, deployment_name: str, **kwargs: Any) ->
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.get.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- get.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return deserialized # type: ignore
def _create_or_update_initial(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeployment, IO]] = None,
+ body: Optional[Union[_models.NginxDeployment, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxDeployment:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -357,7 +352,7 @@ def _create_or_update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -370,7 +365,7 @@ def _create_or_update_initial(
else:
_json = None
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
@@ -378,42 +373,35 @@ def _create_or_update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._create_or_update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _create_or_update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
-
@overload
def begin_create_or_update(
self,
@@ -438,14 +426,6 @@ def begin_create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -457,7 +437,7 @@ def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -472,18 +452,10 @@ def begin_create_or_update(
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
:param body: Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -495,7 +467,7 @@ def begin_create_or_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeployment, IO]] = None,
+ body: Optional[Union[_models.NginxDeployment, IO[bytes]]] = None,
**kwargs: Any
) -> LROPoller[_models.NginxDeployment]:
"""Create or update the NGINX deployment.
@@ -507,19 +479,8 @@ def begin_create_or_update(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :param body: Is either a NginxDeployment type or a IO type. Default value is None.
- :type body: ~azure.mgmt.nginx.models.NginxDeployment or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: Is either a NginxDeployment type or a IO[bytes] type. Default value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeployment or IO[bytes]
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -546,12 +507,13 @@ def begin_create_or_update(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -563,26 +525,24 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[_models.NginxDeployment].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return LROPoller[_models.NginxDeployment](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
def _update_initial(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO]] = None,
+ body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO[bytes]]] = None,
**kwargs: Any
- ) -> _models.NginxDeployment:
- error_map = {
+ ) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -595,7 +555,7 @@ def _update_initial(
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- cls: ClsType[_models.NginxDeployment] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
@@ -608,7 +568,7 @@ def _update_initial(
else:
_json = None
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
@@ -616,42 +576,35 @@ def _update_initial(
content_type=content_type,
json=_json,
content=_content,
- template_url=self._update_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 201]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- _update_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
-
@overload
def begin_update(
self,
@@ -676,14 +629,6 @@ def begin_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -695,7 +640,7 @@ def begin_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[IO] = None,
+ body: Optional[IO[bytes]] = None,
*,
content_type: str = "application/json",
**kwargs: Any
@@ -710,18 +655,10 @@ def begin_update(
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
:param body: Default value is None.
- :type body: IO
+ :type body: IO[bytes]
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -733,7 +670,7 @@ def begin_update(
self,
resource_group_name: str,
deployment_name: str,
- body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO]] = None,
+ body: Optional[Union[_models.NginxDeploymentUpdateParameters, IO[bytes]]] = None,
**kwargs: Any
) -> LROPoller[_models.NginxDeployment]:
"""Update the NGINX deployment.
@@ -745,20 +682,9 @@ def begin_update(
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :param body: Is either a NginxDeploymentUpdateParameters type or a IO type. Default value is
- None.
- :type body: ~azure.mgmt.nginx.models.NginxDeploymentUpdateParameters or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
+ :param body: Is either a NginxDeploymentUpdateParameters type or a IO[bytes] type. Default
+ value is None.
+ :type body: ~azure.mgmt.nginx.models.NginxDeploymentUpdateParameters or IO[bytes]
:return: An instance of LROPoller that returns either NginxDeployment or the result of
cls(response)
:rtype: ~azure.core.polling.LROPoller[~azure.mgmt.nginx.models.NginxDeployment]
@@ -785,12 +711,13 @@ def begin_update(
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response):
- deserialized = self._deserialize("NginxDeployment", pipeline_response)
+ deserialized = self._deserialize("NginxDeployment", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized
if polling is True:
@@ -800,22 +727,18 @@ def get_long_running_output(pipeline_response):
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[_models.NginxDeployment].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return LROPoller[_models.NginxDeployment](
+ self._client, raw_result, get_long_running_output, polling_method # type: ignore
+ )
- def _delete_initial( # pylint: disable=inconsistent-return-statements
- self, resource_group_name: str, deployment_name: str, **kwargs: Any
- ) -> None:
- error_map = {
+ def _delete_initial(self, resource_group_name: str, deployment_name: str, **kwargs: Any) -> Iterator[bytes]:
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -827,40 +750,41 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
- cls: ClsType[None] = kwargs.pop("cls", None)
+ cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self._delete_initial.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
- _stream = False
+ _decompress = kwargs.pop("decompress", True)
+ _stream = True
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200, 202, 204]:
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+ deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- _delete_initial.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def begin_delete(self, resource_group_name: str, deployment_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -873,14 +797,6 @@ def begin_delete(self, resource_group_name: str, deployment_name: str, **kwargs:
:type resource_group_name: str
:param deployment_name: The name of targeted NGINX deployment. Required.
:type deployment_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
- :keyword str continuation_token: A continuation token to restart a poller from a saved state.
- :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
- operation to not poll, or pass in your own initialized polling object for a personal polling
- strategy.
- :paramtype polling: bool or ~azure.core.polling.PollingMethod
- :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
- Retry-After header is present.
:return: An instance of LROPoller that returns either None or the result of cls(response)
:rtype: ~azure.core.polling.LROPoller[None]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -894,7 +810,7 @@ def begin_delete(self, resource_group_name: str, deployment_name: str, **kwargs:
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
cont_token: Optional[str] = kwargs.pop("continuation_token", None)
if cont_token is None:
- raw_result = self._delete_initial( # type: ignore
+ raw_result = self._delete_initial(
resource_group_name=resource_group_name,
deployment_name=deployment_name,
api_version=api_version,
@@ -903,11 +819,12 @@ def begin_delete(self, resource_group_name: str, deployment_name: str, **kwargs:
params=_params,
**kwargs
)
+ raw_result.http_response.read() # type: ignore
kwargs.pop("error_map", None)
def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements
if cls:
- return cls(pipeline_response, None, {})
+ return cls(pipeline_response, None, {}) # type: ignore
if polling is True:
polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs))
@@ -916,17 +833,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
else:
polling_method = polling
if cont_token:
- return LROPoller.from_continuation_token(
+ return LROPoller[None].from_continuation_token(
polling_method=polling_method,
continuation_token=cont_token,
client=self._client,
deserialization_callback=get_long_running_output,
)
- return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore
-
- begin_delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}"
- }
+ return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.NginxDeployment"]:
@@ -934,7 +847,6 @@ def list(self, **kwargs: Any) -> Iterable["_models.NginxDeployment"]:
List the NGINX deployments resources.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxDeployment or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxDeployment]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -945,7 +857,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.NginxDeployment"]:
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeploymentListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -956,15 +868,13 @@ def list(self, **kwargs: Any) -> Iterable["_models.NginxDeployment"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -976,13 +886,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("NginxDeploymentListResponse", pipeline_response)
@@ -992,27 +901,23 @@ def extract_data(pipeline_response):
return deserialized.next_link or None, iter(list_of_elem)
def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return ItemPaged(get_next, extract_data)
- list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments"}
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.NginxDeployment"]:
"""List all NGINX deployments under the specified resource group.
@@ -1022,7 +927,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
:param resource_group_name: The name of the resource group. The name is case insensitive.
Required.
:type resource_group_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either NginxDeployment or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.NginxDeployment]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -1033,7 +937,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.NginxDeploymentListResponse] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1044,16 +948,14 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
def prepare_request(next_link=None):
if not next_link:
- request = build_list_by_resource_group_request(
+ _request = build_list_by_resource_group_request(
resource_group_name=resource_group_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.list_by_resource_group.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -1065,13 +967,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("NginxDeploymentListResponse", pipeline_response)
@@ -1081,25 +982,19 @@ def extract_data(pipeline_response):
return deserialized.next_link or None, iter(list_of_elem)
def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list_by_resource_group.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments"
- }
diff --git a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_operations.py b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_operations.py
index d5633da690af..b7ece36d4268 100644
--- a/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_operations.py
+++ b/sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+import sys
from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
import urllib.parse
@@ -19,16 +19,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from .._serialization import Serializer
-from .._vendor import _convert_request
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
+else:
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -40,7 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01-preview"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-11-01-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -76,11 +78,10 @@ def __init__(self, *args, **kwargs):
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]:
- """List all operations provided by Nginx.NginxPlus for the 2024-01-01-preview api version.
+ """List all operations provided by Nginx.NginxPlus for the 2024-11-01-preview api version.
- List all operations provided by Nginx.NginxPlus for the 2024-01-01-preview api version.
+ List all operations provided by Nginx.NginxPlus for the 2024-11-01-preview api version.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either OperationResult or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.nginx.models.OperationResult]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -91,7 +92,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]:
api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -102,14 +103,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -121,13 +120,12 @@ def prepare_request(next_link=None):
}
)
_next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -137,23 +135,19 @@ def extract_data(pipeline_response):
return deserialized.next_link or None, iter(list_of_elem)
def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(
- _models.ResourceProviderDefaultErrorResponse, pipeline_response
- )
+ error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Nginx.NginxPlus/operations"}
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_create_or_update.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_create_or_update.py
new file mode 100644
index 000000000000..66c898cc6ead
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_create_or_update.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.nginx import NginxManagementClient
+
+"""
+# PREREQUISITES
+ pip install azure-identity
+ pip install azure-mgmt-nginx
+# USAGE
+ python api_keys_create_or_update.py
+
+ Before run the sample, please set the values of the client ID, tenant ID and client secret
+ of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+ AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+ https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+ client = NginxManagementClient(
+ credential=DefaultAzureCredential(),
+ subscription_id="00000000-0000-0000-0000-000000000000",
+ )
+
+ response = client.api_keys.create_or_update(
+ resource_group_name="myResourceGroup",
+ deployment_name="myDeployment",
+ api_key_name="myApiKey",
+ )
+ print(response)
+
+
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
+if __name__ == "__main__":
+ main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_delete.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_delete.py
new file mode 100644
index 000000000000..1d3d1f295162
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_delete.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.nginx import NginxManagementClient
+
+"""
+# PREREQUISITES
+ pip install azure-identity
+ pip install azure-mgmt-nginx
+# USAGE
+ python api_keys_delete.py
+
+ Before run the sample, please set the values of the client ID, tenant ID and client secret
+ of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+ AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+ https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+ client = NginxManagementClient(
+ credential=DefaultAzureCredential(),
+ subscription_id="00000000-0000-0000-0000-000000000000",
+ )
+
+ client.api_keys.delete(
+ resource_group_name="myResourceGroup",
+ deployment_name="myDeployment",
+ api_key_name="myApiKey",
+ )
+
+
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
+if __name__ == "__main__":
+ main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_get.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_get.py
new file mode 100644
index 000000000000..e43c55ad8a65
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_get.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.nginx import NginxManagementClient
+
+"""
+# PREREQUISITES
+ pip install azure-identity
+ pip install azure-mgmt-nginx
+# USAGE
+ python api_keys_get.py
+
+ Before run the sample, please set the values of the client ID, tenant ID and client secret
+ of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+ AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+ https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+ client = NginxManagementClient(
+ credential=DefaultAzureCredential(),
+ subscription_id="00000000-0000-0000-0000-000000000000",
+ )
+
+ response = client.api_keys.get(
+ resource_group_name="myResourceGroup",
+ deployment_name="myDeployment",
+ api_key_name="myApiKey",
+ )
+ print(response)
+
+
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Get.json
+if __name__ == "__main__":
+ main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_list.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_list.py
new file mode 100644
index 000000000000..14656db6c4f5
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/api_keys_list.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.nginx import NginxManagementClient
+
+"""
+# PREREQUISITES
+ pip install azure-identity
+ pip install azure-mgmt-nginx
+# USAGE
+ python api_keys_list.py
+
+ Before run the sample, please set the values of the client ID, tenant ID and client secret
+ of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+ AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+ https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+ client = NginxManagementClient(
+ credential=DefaultAzureCredential(),
+ subscription_id="00000000-0000-0000-0000-000000000000",
+ )
+
+ response = client.api_keys.list(
+ resource_group_name="myResourceGroup",
+ deployment_name="myDeployment",
+ )
+ for item in response:
+ print(item)
+
+
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_List.json
+if __name__ == "__main__":
+ main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_create_or_update.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_create_or_update.py
index 095c62e3c31a..dc033d4bbd8e 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_create_or_update.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_create_or_update.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_delete.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_delete.py
index 0bd43015a596..d1d1400bdd09 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_delete.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_delete.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
).result()
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Delete.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Delete.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_get.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_get.py
index 26ad825c6067..f3a32df1144f 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_get.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_list.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_list.py
index fcbf5202e020..e6be437650f1 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_list.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/certificates_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(item)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_analysis.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_analysis.py
index e27437012406..a3ccb680adc2 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_analysis.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_analysis.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Analysis.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_create_or_update.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_create_or_update.py
index a81ccc161a3a..1f487c964cd6 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_create_or_update.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_create_or_update.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_delete.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_delete.py
index cb434e014f1b..d71ddae41f25 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_delete.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_delete.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
).result()
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Delete.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Delete.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_get.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_get.py
index 907d11453321..cac35ab11b6d 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_get.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Get.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Get.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_list.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_list.py
index 40a9ee9fc58f..7093aad43cab 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_list.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/configurations_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -37,6 +38,6 @@ def main():
print(item)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_List.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_List.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_create.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_create.py
index 9fb508e1b455..3ddba130d6c7 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_create.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_create.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Create.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_delete.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_delete.py
index 9a94d03d3152..b024fdf29d3b 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_delete.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_delete.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -35,6 +36,6 @@ def main():
).result()
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Delete.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Delete.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get.py
index bfd8e1f9c466..4158a22fd119 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get_auto_scale.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get_auto_scale.py
index 95ee4e370726..8920a0811d56 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get_auto_scale.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_get_auto_scale.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list.py
index 3fc2df8f69bd..6236b8df9a3f 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -34,6 +35,6 @@ def main():
print(item)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_List.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_List.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list_by_resource_group.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list_by_resource_group.py
index 89054dbad138..a56ae5afd178 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list_by_resource_group.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_list_by_resource_group.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
print(item)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update.py
index 6ba62b0a1da7..34925bd37cc8 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -36,6 +37,6 @@ def main():
print(response)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Update.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update_subnet.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update_subnet.py
new file mode 100644
index 000000000000..7b595c70ddb7
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/deployments_update_subnet.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.nginx import NginxManagementClient
+
+"""
+# PREREQUISITES
+ pip install azure-identity
+ pip install azure-mgmt-nginx
+# USAGE
+ python deployments_update_subnet.py
+
+ Before run the sample, please set the values of the client ID, tenant ID and client secret
+ of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+ AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+ https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+ client = NginxManagementClient(
+ credential=DefaultAzureCredential(),
+ subscription_id="00000000-0000-0000-0000-000000000000",
+ )
+
+ response = client.deployments.begin_update(
+ resource_group_name="myResourceGroup",
+ deployment_name="myDeployment",
+ ).result()
+ print(response)
+
+
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
+if __name__ == "__main__":
+ main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_samples/operations_list.py b/sdk/nginx/azure-mgmt-nginx/generated_samples/operations_list.py
index 28ca0fb9441e..e22445325bcc 100644
--- a/sdk/nginx/azure-mgmt-nginx/generated_samples/operations_list.py
+++ b/sdk/nginx/azure-mgmt-nginx/generated_samples/operations_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.nginx import NginxManagementClient
"""
@@ -34,6 +35,6 @@ def main():
print(item)
-# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Operations_List.json
+# x-ms-original-file: specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Operations_List.json
if __name__ == "__main__":
main()
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/conftest.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/conftest.py
new file mode 100644
index 000000000000..86ae13df960d
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/conftest.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import os
+import pytest
+from dotenv import load_dotenv
+from devtools_testutils import (
+ test_proxy,
+ add_general_regex_sanitizer,
+ add_body_key_sanitizer,
+ add_header_regex_sanitizer,
+)
+
+load_dotenv()
+
+
+# For security, please avoid record sensitive identity information in recordings
+@pytest.fixture(scope="session", autouse=True)
+def add_sanitizers(test_proxy):
+ nginxmanagement_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000")
+ nginxmanagement_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000")
+ nginxmanagement_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000")
+ nginxmanagement_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(regex=nginxmanagement_subscription_id, value="00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(regex=nginxmanagement_tenant_id, value="00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(regex=nginxmanagement_client_id, value="00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(regex=nginxmanagement_client_secret, value="00000000-0000-0000-0000-000000000000")
+
+ add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]")
+ add_header_regex_sanitizer(key="Cookie", value="cookie;")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations.py
new file mode 100644
index 000000000000..778d8cb65fef
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations.py
@@ -0,0 +1,70 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementApiKeysOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_api_keys_create_or_update(self, resource_group):
+ response = self.client.api_keys.create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_api_keys_delete(self, resource_group):
+ response = self.client.api_keys.delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_api_keys_get(self, resource_group):
+ response = self.client.api_keys.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_api_keys_list(self, resource_group):
+ response = self.client.api_keys.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations_async.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations_async.py
new file mode 100644
index 000000000000..bd3935178b67
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_api_keys_operations_async.py
@@ -0,0 +1,71 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx.aio import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementApiKeysOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_api_keys_create_or_update(self, resource_group):
+ response = await self.client.api_keys.create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_api_keys_delete(self, resource_group):
+ response = await self.client.api_keys.delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_api_keys_get(self, resource_group):
+ response = await self.client.api_keys.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_key_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_api_keys_list(self, resource_group):
+ response = self.client.api_keys.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations.py
new file mode 100644
index 000000000000..9015537ef366
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations.py
@@ -0,0 +1,70 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementCertificatesOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_certificates_get(self, resource_group):
+ response = self.client.certificates.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_certificates_begin_create_or_update(self, resource_group):
+ response = self.client.certificates.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_certificates_begin_delete(self, resource_group):
+ response = self.client.certificates.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_certificates_list(self, resource_group):
+ response = self.client.certificates.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations_async.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations_async.py
new file mode 100644
index 000000000000..31377bb30174
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_certificates_operations_async.py
@@ -0,0 +1,75 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx.aio import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementCertificatesOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_certificates_get(self, resource_group):
+ response = await self.client.certificates.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_certificates_begin_create_or_update(self, resource_group):
+ response = await (
+ await self.client.certificates.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_certificates_begin_delete(self, resource_group):
+ response = await (
+ await self.client.certificates.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ certificate_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_certificates_list(self, resource_group):
+ response = self.client.certificates.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations.py
new file mode 100644
index 000000000000..77da242df523
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations.py
@@ -0,0 +1,83 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementConfigurationsOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_configurations_list(self, resource_group):
+ response = self.client.configurations.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_configurations_get(self, resource_group):
+ response = self.client.configurations.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_configurations_begin_create_or_update(self, resource_group):
+ response = self.client.configurations.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_configurations_begin_delete(self, resource_group):
+ response = self.client.configurations.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_configurations_analysis(self, resource_group):
+ response = self.client.configurations.analysis(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations_async.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations_async.py
new file mode 100644
index 000000000000..20ceda6c70e3
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_configurations_operations_async.py
@@ -0,0 +1,88 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx.aio import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementConfigurationsOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_configurations_list(self, resource_group):
+ response = self.client.configurations.list(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_configurations_get(self, resource_group):
+ response = await self.client.configurations.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_configurations_begin_create_or_update(self, resource_group):
+ response = await (
+ await self.client.configurations.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_configurations_begin_delete(self, resource_group):
+ response = await (
+ await self.client.configurations.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_configurations_analysis(self, resource_group):
+ response = await self.client.configurations.analysis(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ configuration_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations.py
new file mode 100644
index 000000000000..0dbecf943803
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations.py
@@ -0,0 +1,88 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementDeploymentsOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_get(self, resource_group):
+ response = self.client.deployments.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_begin_create_or_update(self, resource_group):
+ response = self.client.deployments.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_begin_update(self, resource_group):
+ response = self.client.deployments.begin_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_begin_delete(self, resource_group):
+ response = self.client.deployments.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_list(self, resource_group):
+ response = self.client.deployments.list(
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_deployments_list_by_resource_group(self, resource_group):
+ response = self.client.deployments.list_by_resource_group(
+ resource_group_name=resource_group.name,
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations_async.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations_async.py
new file mode 100644
index 000000000000..337809d16e8a
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_deployments_operations_async.py
@@ -0,0 +1,95 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx.aio import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementDeploymentsOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_get(self, resource_group):
+ response = await self.client.deployments.get(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_begin_create_or_update(self, resource_group):
+ response = await (
+ await self.client.deployments.begin_create_or_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_begin_update(self, resource_group):
+ response = await (
+ await self.client.deployments.begin_update(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_begin_delete(self, resource_group):
+ response = await (
+ await self.client.deployments.begin_delete(
+ resource_group_name=resource_group.name,
+ deployment_name="str",
+ api_version="2024-11-01-preview",
+ )
+ ).result() # call '.result()' to poll until service return final result
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_list(self, resource_group):
+ response = self.client.deployments.list(
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_deployments_list_by_resource_group(self, resource_group):
+ response = self.client.deployments.list_by_resource_group(
+ resource_group_name=resource_group.name,
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations.py
new file mode 100644
index 000000000000..0bd6d31cfba8
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_operations_list(self, resource_group):
+ response = self.client.operations.list(
+ api_version="2024-11-01-preview",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations_async.py b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations_async.py
new file mode 100644
index 000000000000..8f0c573e997a
--- /dev/null
+++ b/sdk/nginx/azure-mgmt-nginx/generated_tests/test_nginx_management_operations_async.py
@@ -0,0 +1,30 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.nginx.aio import NginxManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestNginxManagementOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(NginxManagementClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_operations_list(self, resource_group):
+ response = self.client.operations.list(
+ api_version="2024-11-01-preview",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/nginx/azure-mgmt-nginx/setup.py b/sdk/nginx/azure-mgmt-nginx/setup.py
index f15b5f6f311e..4c971572f69c 100644
--- a/sdk/nginx/azure-mgmt-nginx/setup.py
+++ b/sdk/nginx/azure-mgmt-nginx/setup.py
@@ -74,9 +74,10 @@
"pytyped": ["py.typed"],
},
install_requires=[
- "isodate<1.0.0,>=0.6.1",
- "azure-common~=1.1",
- "azure-mgmt-core>=1.3.2,<2.0.0",
+ "isodate>=0.6.1",
+ "typing-extensions>=4.6.0",
+ "azure-common>=1.1",
+ "azure-mgmt-core>=1.3.2",
],
python_requires=">=3.8",
)