diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/README.md b/sdk/dynatrace/azure-mgmt-dynatrace/README.md index 9382ae6adf15..3908301ce29e 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/README.md +++ b/sdk/dynatrace/azure-mgmt-dynatrace/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Dynatrace Management Client Library. -This package has been tested with Python 3.7+. +This package has been tested with Python 3.8+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ @@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For ### Prerequisites -- Python 3.7+ is required to use this package. +- Python 3.8+ is required to use this package. - [Azure subscription](https://azure.microsoft.com/free/) ### Install the package @@ -59,6 +59,3 @@ Code samples for this package can be found at: If you encounter any bugs or have suggestions, please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-python/issues) section of the project. - - - diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/_meta.json b/sdk/dynatrace/azure-mgmt-dynatrace/_meta.json index 99d92708ce09..f168be9d80b7 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/_meta.json +++ b/sdk/dynatrace/azure-mgmt-dynatrace/_meta.json @@ -1,11 +1,11 @@ { - "commit": "c992976478b8ab8c3ea2b4abaeac9b0aacee55fe", + "commit": "aa66ad27d11377eb8645f63d12febe0b028963fb", "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/dynatrace/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 --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False", + "autorest_command": "autorest specification/dynatrace/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/dynatrace/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/__init__.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/__init__.py index 41175b20ad1c..690e35f56829 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/__init__.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/__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 ._dynatrace_observability_mgmt_client import DynatraceObservabilityMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._dynatrace_observability_mgmt_client import DynatraceObservabilityMgmtClient # 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__ = [ "DynatraceObservabilityMgmtClient", ] -__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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_configuration.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_configuration.py index f3b4ec5eb65d..312bb7f89dba 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_configuration.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_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 DynatraceObservabilityMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class DynatraceObservabilityMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for DynatraceObservabilityMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -35,7 +33,6 @@ class DynatraceObservabilityMgmtClientConfiguration(Configuration): # pylint: d """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(DynatraceObservabilityMgmtClientConfiguration, self).__init__(**kwargs) api_version: str = kwargs.pop("api_version", "2023-04-27") if credential is 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-dynatrace/{}".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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_dynatrace_observability_mgmt_client.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_dynatrace_observability_mgmt_client.py index 9bcbe9eae7c3..dbe8fe202a96 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_dynatrace_observability_mgmt_client.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_dynatrace_observability_mgmt_client.py @@ -8,9 +8,12 @@ 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 DynatraceObservabilityMgmtClientConfiguration @@ -18,11 +21,10 @@ from .operations import MonitorsOperations, Operations, SingleSignOnOperations, TagRulesOperations if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class DynatraceObservabilityMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class DynatraceObservabilityMgmtClient: """DynatraceObservabilityMgmtClient. :ivar monitors: MonitorsOperations operations @@ -56,7 +58,25 @@ def __init__( self._config = DynatraceObservabilityMgmtClientConfiguration( 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) @@ -67,7 +87,7 @@ def __init__( self.tag_rules = TagRulesOperations(self._client, self._config, self._serialize, self._deserialize) self.single_sign_on = SingleSignOnOperations(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 +107,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) -> "DynatraceObservabilityMgmtClient": + def __enter__(self) -> Self: self._client.__enter__() return self diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_patch.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_patch.py index f99e77fef986..17dbc073e01b 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_patch.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_serialization.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_serialization.py index 4bae2292227b..b24ab2885450 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_serialization.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_vendor.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_vendor.py deleted file mode 100644 index 0dafe0e287ff..000000000000 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_version.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_version.py index 48944bf3938a..e5754a47ce68 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_version.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0" +VERSION = "1.0.0b1" diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/__init__.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/__init__.py index 35d974e07a19..40d67dab05f7 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/__init__.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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 ._dynatrace_observability_mgmt_client import DynatraceObservabilityMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._dynatrace_observability_mgmt_client import DynatraceObservabilityMgmtClient # 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__ = [ "DynatraceObservabilityMgmtClient", ] -__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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_configuration.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_configuration.py index d62c3cb1cdc3..e3020cf67fe6 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_configuration.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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 DynatraceObservabilityMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class DynatraceObservabilityMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for DynatraceObservabilityMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -35,7 +33,6 @@ class DynatraceObservabilityMgmtClientConfiguration(Configuration): # pylint: d """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(DynatraceObservabilityMgmtClientConfiguration, self).__init__(**kwargs) api_version: str = kwargs.pop("api_version", "2023-04-27") if credential is 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-dynatrace/{}".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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_dynatrace_observability_mgmt_client.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_dynatrace_observability_mgmt_client.py index 9db3107a3998..4145affc4c85 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_dynatrace_observability_mgmt_client.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_dynatrace_observability_mgmt_client.py @@ -8,9 +8,12 @@ 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 @@ -18,11 +21,10 @@ from .operations import MonitorsOperations, Operations, SingleSignOnOperations, TagRulesOperations if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class DynatraceObservabilityMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class DynatraceObservabilityMgmtClient: """DynatraceObservabilityMgmtClient. :ivar monitors: MonitorsOperations operations @@ -56,7 +58,25 @@ def __init__( self._config = DynatraceObservabilityMgmtClientConfiguration( 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) @@ -67,7 +87,9 @@ def __init__( self.tag_rules = TagRulesOperations(self._client, self._config, self._serialize, self._deserialize) self.single_sign_on = SingleSignOnOperations(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 +109,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) -> "DynatraceObservabilityMgmtClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_patch.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_patch.py index f99e77fef986..17dbc073e01b 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/_patch.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/__init__.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/__init__.py index f5a4d0f9f64d..401987535e42 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/__init__.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/__init__.py @@ -5,14 +5,20 @@ # 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 ._monitors_operations import MonitorsOperations -from ._operations import Operations -from ._tag_rules_operations import TagRulesOperations -from ._single_sign_on_operations import SingleSignOnOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._monitors_operations import MonitorsOperations # type: ignore +from ._operations import Operations # type: ignore +from ._tag_rules_operations import TagRulesOperations # type: ignore +from ._single_sign_on_operations import SingleSignOnOperations # 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__ = [ @@ -21,5 +27,5 @@ "TagRulesOperations", "SingleSignOnOperations", ] -__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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_monitors_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_monitors_operations.py index 0b288e37823f..b8d826e65614 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_monitors_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_monitors_operations.py @@ -7,7 +7,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 +18,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 +32,6 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._monitors_operations import ( build_create_or_update_request, build_delete_request, @@ -48,6 +49,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]] @@ -84,7 +89,6 @@ def list_monitored_resources( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MonitoredResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.MonitoredResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -95,7 +99,7 @@ def list_monitored_resources( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoredResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -106,17 +110,15 @@ def list_monitored_resources( def prepare_request(next_link=None): if not next_link: - request = build_list_monitored_resources_request( + _request = build_list_monitored_resources_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_monitored_resources.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 @@ -128,13 +130,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("MonitoredResourceListResponse", pipeline_response) @@ -144,11 +145,11 @@ 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 @@ -161,10 +162,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listMonitoredResources" - } - @distributed_trace_async async def get_vm_host_payload( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -180,12 +177,11 @@ async def get_vm_host_payload( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: VMExtensionPayload or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.VMExtensionPayload :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -199,21 +195,19 @@ async def get_vm_host_payload( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.VMExtensionPayload] = kwargs.pop("cls", None) - request = build_get_vm_host_payload_request( + _request = build_get_vm_host_payload_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_vm_host_payload.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 @@ -223,16 +217,12 @@ async def get_vm_host_payload( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("VMExtensionPayload", pipeline_response) + deserialized = self._deserialize("VMExtensionPayload", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_vm_host_payload.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getVMHostPayload" - } + return deserialized # type: ignore @distributed_trace_async async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.MonitorResource: @@ -245,12 +235,11 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -264,21 +253,19 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitorResource] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -288,21 +275,21 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", 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/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore async def _create_or_update_initial( - self, resource_group_name: str, monitor_name: str, resource: Union[_models.MonitorResource, IO], **kwargs: Any - ) -> _models.MonitorResource: - error_map = { + self, + resource_group_name: str, + monitor_name: str, + resource: Union[_models.MonitorResource, IO[bytes]], + **kwargs: Any + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -315,7 +302,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.MonitorResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -325,7 +312,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(resource, "MonitorResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -333,40 +320,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("MonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("MonitorResource", 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/Dynatrace.Observability/monitors/{monitorName}" - } - @overload async def begin_create_or_update( self, @@ -391,14 +373,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 MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -410,7 +384,7 @@ async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -425,18 +399,10 @@ async def begin_create_or_update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -445,7 +411,11 @@ async def begin_create_or_update( @distributed_trace_async async def begin_create_or_update( - self, resource_group_name: str, monitor_name: str, resource: Union[_models.MonitorResource, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + resource: Union[_models.MonitorResource, IO[bytes]], + **kwargs: Any ) -> AsyncLROPoller[_models.MonitorResource]: """Create a MonitorResource. @@ -456,20 +426,9 @@ async def begin_create_or_update( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param resource: Resource create parameters. Is either a MonitorResource type or a IO type. - Required. - :type resource: ~azure.mgmt.dynatrace.models.MonitorResource 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 resource: Resource create parameters. Is either a MonitorResource type or a IO[bytes] + type. Required. + :type resource: ~azure.mgmt.dynatrace.models.MonitorResource or IO[bytes] :return: An instance of AsyncLROPoller that returns either MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -496,12 +455,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("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -514,17 +474,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.MonitorResource].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/Dynatrace.Observability/monitors/{monitorName}" - } + return AsyncLROPoller[_models.MonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @overload async def update( @@ -550,7 +508,6 @@ async def 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 :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: @@ -561,7 +518,7 @@ async def update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -576,11 +533,10 @@ async def update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: The resource properties to be updated. Required. - :type resource: IO + :type resource: 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: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: @@ -591,7 +547,7 @@ async def update( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.MonitorResourceUpdate, IO], + resource: Union[_models.MonitorResourceUpdate, IO[bytes]], **kwargs: Any ) -> _models.MonitorResource: """Update a MonitorResource. @@ -604,17 +560,13 @@ async def update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: The resource properties to be updated. Is either a MonitorResourceUpdate type - or a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.MonitorResourceUpdate 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 + or a IO[bytes] type. Required. + :type resource: ~azure.mgmt.dynatrace.models.MonitorResourceUpdate or IO[bytes] :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -637,7 +589,7 @@ async def update( else: _json = self._serialize.body(resource, "MonitorResourceUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -645,16 +597,14 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.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 @@ -664,21 +614,15 @@ async def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore - async def _delete_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, monitor_name: str, **kwargs: Any - ) -> None: - error_map = { + async def _delete_initial(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -690,38 +634,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, monitor_name=monitor_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.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/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> AsyncLROPoller[None]: @@ -734,14 +681,6 @@ async def begin_delete(self, resource_group_name: str, monitor_name: str, **kwar :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_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: @@ -755,7 +694,7 @@ async def begin_delete(self, resource_group_name: str, monitor_name: str, **kwar 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, monitor_name=monitor_name, api_version=api_version, @@ -764,11 +703,12 @@ async def begin_delete(self, resource_group_name: str, monitor_name: str, **kwar 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( @@ -780,17 +720,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/Dynatrace.Observability/monitors/{monitorName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list_by_subscription_id(self, **kwargs: Any) -> AsyncIterable["_models.MonitorResource"]: @@ -798,7 +734,6 @@ def list_by_subscription_id(self, **kwargs: Any) -> AsyncIterable["_models.Monit List all MonitorResource by subscriptionId. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MonitorResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.MonitorResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -809,7 +744,7 @@ def list_by_subscription_id(self, **kwargs: Any) -> AsyncIterable["_models.Monit api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -820,15 +755,13 @@ def list_by_subscription_id(self, **kwargs: Any) -> AsyncIterable["_models.Monit def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_id_request( + _request = build_list_by_subscription_id_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription_id.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 @@ -840,13 +773,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("MonitorResourceListResult", pipeline_response) @@ -856,11 +788,11 @@ 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 @@ -873,10 +805,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_subscription_id.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Dynatrace.Observability/monitors" - } - @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any @@ -888,7 +816,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 MonitorResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.MonitorResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -899,7 +826,7 @@ def list_by_resource_group( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -910,16 +837,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 @@ -931,13 +856,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("MonitorResourceListResult", pipeline_response) @@ -947,11 +871,11 @@ 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 @@ -964,10 +888,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors" - } - @overload async def get_marketplace_saa_s_resource_details( self, @@ -983,7 +903,6 @@ async def get_marketplace_saa_s_resource_details( :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: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -991,16 +910,15 @@ async def get_marketplace_saa_s_resource_details( @overload async def get_marketplace_saa_s_resource_details( - self, request: IO, *, content_type: str = "application/json", **kwargs: Any + self, request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.MarketplaceSaaSResourceDetailsResponse: """Get Marketplace SaaS resource details of a tenant under a specific subscription. :param request: Tenant Id. Required. - :type request: IO + :type request: 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: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1008,26 +926,22 @@ async def get_marketplace_saa_s_resource_details( @distributed_trace_async async def get_marketplace_saa_s_resource_details( - self, request: Union[_models.MarketplaceSaaSResourceDetailsRequest, IO], **kwargs: Any + self, request: Union[_models.MarketplaceSaaSResourceDetailsRequest, IO[bytes]], **kwargs: Any ) -> _models.MarketplaceSaaSResourceDetailsResponse: """Get Marketplace SaaS resource details of a tenant under a specific subscription. - :param request: Tenant Id. Is either a MarketplaceSaaSResourceDetailsRequest type or a IO type. - Required. - :type request: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsRequest 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 request: Tenant Id. Is either a MarketplaceSaaSResourceDetailsRequest type or a + IO[bytes] type. Required. + :type request: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsRequest or IO[bytes] :return: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, + 404: ResourceNotFoundError, 409: ResourceExistsError, 304: ResourceNotModifiedError, - 404: lambda response: ResourceNotFoundError(response=response, error_format=ARMErrorFormat), } error_map.update(kwargs.pop("error_map", {}) or {}) @@ -1046,22 +960,20 @@ async def get_marketplace_saa_s_resource_details( else: _json = self._serialize.body(request, "MarketplaceSaaSResourceDetailsRequest") - request = build_get_marketplace_saa_s_resource_details_request( + _request = build_get_marketplace_saa_s_resource_details_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.get_marketplace_saa_s_resource_details.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 @@ -1071,16 +983,12 @@ async def get_marketplace_saa_s_resource_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MarketplaceSaaSResourceDetailsResponse", pipeline_response) + deserialized = self._deserialize("MarketplaceSaaSResourceDetailsResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_marketplace_saa_s_resource_details.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Dynatrace.Observability/getMarketplaceSaaSResourceDetails" - } + return deserialized # type: ignore @distributed_trace def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> AsyncIterable["_models.VMInfo"]: @@ -1093,7 +1001,6 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.VMInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1104,7 +1011,7 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.VMHostsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1115,17 +1022,15 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_hosts_request( + _request = build_list_hosts_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_hosts.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 @@ -1137,13 +1042,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("VMHostsListResponse", pipeline_response) @@ -1153,11 +1057,11 @@ 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 @@ -1170,10 +1074,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listHosts" - } - @distributed_trace_async async def get_metric_status( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -1185,12 +1085,11 @@ async def get_metric_status( :type resource_group_name: str :param monitor_name: Name of the Monitor resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1204,21 +1103,19 @@ async def get_metric_status( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MetricsStatusResponse] = kwargs.pop("cls", None) - request = build_get_metric_status_request( + _request = build_get_metric_status_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_metric_status.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 @@ -1228,16 +1125,12 @@ async def get_metric_status( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricsStatusResponse", pipeline_response) + deserialized = self._deserialize("MetricsStatusResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_status.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getMetricStatus" - } + return deserialized # type: ignore @distributed_trace def list_app_services( @@ -1252,7 +1145,6 @@ def list_app_services( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.AppServiceInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1263,7 +1155,7 @@ def list_app_services( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AppServiceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1274,17 +1166,15 @@ def list_app_services( def prepare_request(next_link=None): if not next_link: - request = build_list_app_services_request( + _request = build_list_app_services_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_app_services.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 @@ -1296,13 +1186,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("AppServiceListResponse", pipeline_response) @@ -1312,11 +1201,11 @@ 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 @@ -1329,10 +1218,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_app_services.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listAppServices" - } - @overload async def get_sso_details( self, @@ -1357,7 +1242,6 @@ async def get_sso_details( :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: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1368,7 +1252,7 @@ async def get_sso_details( self, resource_group_name: str, monitor_name: str, - request: Optional[IO] = None, + request: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1383,11 +1267,10 @@ async def get_sso_details( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the get sso details request. Default value is None. - :type request: IO + :type request: 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: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1398,7 +1281,7 @@ async def get_sso_details( self, resource_group_name: str, monitor_name: str, - request: Optional[Union[_models.SSODetailsRequest, IO]] = None, + request: Optional[Union[_models.SSODetailsRequest, IO[bytes]]] = None, **kwargs: Any ) -> _models.SSODetailsResponse: """Gets the SSO configuration details from the partner. @@ -1411,21 +1294,17 @@ async def get_sso_details( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the get sso details request. Is either a SSODetailsRequest type - or a IO type. Default value is None. - :type request: ~azure.mgmt.dynatrace.models.SSODetailsRequest 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 + or a IO[bytes] type. Default value is None. + :type request: ~azure.mgmt.dynatrace.models.SSODetailsRequest or IO[bytes] :return: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, 304: ResourceNotModifiedError, - 401: lambda response: ClientAuthenticationError(response=response, error_format=ARMErrorFormat), } error_map.update(kwargs.pop("error_map", {}) or {}) @@ -1447,7 +1326,7 @@ async def get_sso_details( else: _json = None - request = build_get_sso_details_request( + _request = build_get_sso_details_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1455,16 +1334,14 @@ async def get_sso_details( content_type=content_type, json=_json, content=_content, - template_url=self.get_sso_details.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 @@ -1474,16 +1351,12 @@ async def get_sso_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("SSODetailsResponse", pipeline_response) + deserialized = self._deserialize("SSODetailsResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_sso_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getSSODetails" - } + return deserialized # type: ignore @overload def list_linkable_environments( @@ -1509,7 +1382,6 @@ def list_linkable_environments( :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: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: @@ -1522,7 +1394,7 @@ def list_linkable_environments( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1537,11 +1409,10 @@ def list_linkable_environments( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the linkable environment request. Required. - :type request: IO + :type request: 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: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: @@ -1554,7 +1425,7 @@ def list_linkable_environments( self, resource_group_name: str, monitor_name: str, - request: Union[_models.LinkableEnvironmentRequest, IO], + request: Union[_models.LinkableEnvironmentRequest, IO[bytes]], **kwargs: Any ) -> AsyncIterable["_models.LinkableEnvironmentResponse"]: """Gets all the Dynatrace environments that a user can link a azure resource to. @@ -1567,12 +1438,8 @@ def list_linkable_environments( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the linkable environment request. Is either a - LinkableEnvironmentRequest type or a IO type. Required. - :type request: ~azure.mgmt.dynatrace.models.LinkableEnvironmentRequest 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 + LinkableEnvironmentRequest type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.dynatrace.models.LinkableEnvironmentRequest or IO[bytes] :return: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: @@ -1586,7 +1453,7 @@ def list_linkable_environments( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.LinkableEnvironmentListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1604,7 +1471,7 @@ def list_linkable_environments( def prepare_request(next_link=None): if not next_link: - request = build_list_linkable_environments_request( + _request = build_list_linkable_environments_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1612,12 +1479,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - template_url=self.list_linkable_environments.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 @@ -1629,13 +1494,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("LinkableEnvironmentListResponse", pipeline_response) @@ -1645,11 +1509,11 @@ 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 @@ -1661,7 +1525,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list_linkable_environments.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listLinkableEnvironments" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_operations.py index 269e031c7f9c..b03f3fb6c7b7 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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]] @@ -58,7 +60,6 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: List the operations for Dynatrace.Observability. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -69,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: 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.Operation"]: 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,11 +113,11 @@ 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 @@ -131,5 +129,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Dynatrace.Observability/operations"} diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_single_sign_on_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_single_sign_on_operations.py index 6e14e0c859d8..904c96897a8b 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_single_sign_on_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_single_sign_on_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,13 +31,16 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._single_sign_on_operations import ( build_create_or_update_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]] @@ -65,10 +69,10 @@ async def _create_or_update_initial( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: Union[_models.DynatraceSingleSignOnResource, IO], + resource: Union[_models.DynatraceSingleSignOnResource, IO[bytes]], **kwargs: Any - ) -> _models.DynatraceSingleSignOnResource: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -81,7 +85,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.DynatraceSingleSignOnResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -91,7 +95,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(resource, "DynatraceSingleSignOnResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -100,40 +104,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DynatraceSingleSignOnResource", 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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } - @overload async def begin_create_or_update( self, @@ -161,14 +160,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 DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -182,7 +173,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -199,18 +190,10 @@ async def begin_create_or_update( :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -224,7 +207,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: Union[_models.DynatraceSingleSignOnResource, IO], + resource: Union[_models.DynatraceSingleSignOnResource, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.DynatraceSingleSignOnResource]: """Create a DynatraceSingleSignOnResource. @@ -239,19 +222,8 @@ async def begin_create_or_update( :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str :param resource: Resource create parameters. Is either a DynatraceSingleSignOnResource type or - a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource 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. + a IO[bytes] type. Required. + :type resource: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource or IO[bytes] :return: An instance of AsyncLROPoller that returns either DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -280,12 +252,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("DynatraceSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -298,17 +271,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.DynatraceSingleSignOnResource].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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return AsyncLROPoller[_models.DynatraceSingleSignOnResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace_async async def get( @@ -325,12 +296,11 @@ async def get( :type monitor_name: str :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DynatraceSingleSignOnResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -344,22 +314,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DynatraceSingleSignOnResource] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -369,16 +337,12 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DynatraceSingleSignOnResource", 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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return deserialized # type: ignore @distributed_trace def list( @@ -393,7 +357,6 @@ def list( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -406,7 +369,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DynatraceSingleSignOnResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -417,17 +380,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, monitor_name=monitor_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 @@ -439,13 +400,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("DynatraceSingleSignOnResourceListResult", pipeline_response) @@ -455,11 +415,11 @@ 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 @@ -471,7 +431,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_tag_rules_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_tag_rules_operations.py index 2c65bfae6336..77ac5965c180 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_tag_rules_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/aio/operations/_tag_rules_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._tag_rules_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 monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -95,22 +98,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_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 @@ -120,26 +121,22 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", 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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore async def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any - ) -> _models.TagRule: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -152,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.TagRule] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -162,7 +159,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(resource, "TagRule") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -171,40 +168,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("TagRule", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("TagRule", 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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } - @overload async def begin_create_or_update( self, @@ -232,14 +224,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 TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.TagRule] @@ -252,7 +236,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -269,18 +253,10 @@ async def begin_create_or_update( :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.TagRule] @@ -293,7 +269,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.TagRule]: """Create a TagRule. @@ -307,19 +283,9 @@ async def begin_create_or_update( :type monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str - :param resource: Resource create parameters. Is either a TagRule type or a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.TagRule 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 resource: Resource create parameters. Is either a TagRule type or a IO[bytes] type. + Required. + :type resource: ~azure.mgmt.dynatrace.models.TagRule or IO[bytes] :return: An instance of AsyncLROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.dynatrace.models.TagRule] @@ -347,12 +313,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("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -365,22 +332,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.TagRule].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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return AsyncLROPoller[_models.TagRule]( + 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, monitor_name: str, rule_set_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -392,39 +357,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, monitor_name=monitor_name, rule_set_name=rule_set_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.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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -441,14 +409,6 @@ async def begin_delete( :type monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_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: @@ -462,7 +422,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, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -472,11 +432,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( @@ -488,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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> AsyncIterable["_models.TagRule"]: @@ -511,7 +468,6 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> As :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TagRule or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.dynatrace.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -522,7 +478,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> As api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRuleListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -533,17 +489,15 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> As def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -555,13 +509,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("TagRuleListResult", pipeline_response) @@ -571,11 +524,11 @@ 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 @@ -587,7 +540,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/tagRules" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/__init__.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/__init__.py index 05e6d5dfa99e..39a868c2504c 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/__init__.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/__init__.py @@ -5,74 +5,85 @@ # 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 AccountInfo -from ._models_py3 import AppServiceInfo -from ._models_py3 import AppServiceListResponse -from ._models_py3 import DynatraceEnvironmentProperties -from ._models_py3 import DynatraceSingleSignOnProperties -from ._models_py3 import DynatraceSingleSignOnResource -from ._models_py3 import DynatraceSingleSignOnResourceListResult -from ._models_py3 import EnvironmentInfo -from ._models_py3 import ErrorAdditionalInfo -from ._models_py3 import ErrorDetail -from ._models_py3 import ErrorResponse -from ._models_py3 import FilteringTag -from ._models_py3 import IdentityProperties -from ._models_py3 import LinkableEnvironmentListResponse -from ._models_py3 import LinkableEnvironmentRequest -from ._models_py3 import LinkableEnvironmentResponse -from ._models_py3 import LogRules -from ._models_py3 import MarketplaceSaaSResourceDetailsRequest -from ._models_py3 import MarketplaceSaaSResourceDetailsResponse -from ._models_py3 import MetricRules -from ._models_py3 import MetricsStatusResponse -from ._models_py3 import MonitorResource -from ._models_py3 import MonitorResourceListResult -from ._models_py3 import MonitorResourceUpdate -from ._models_py3 import MonitoredResource -from ._models_py3 import MonitoredResourceListResponse -from ._models_py3 import Operation -from ._models_py3 import OperationDisplay -from ._models_py3 import OperationListResult -from ._models_py3 import PlanData -from ._models_py3 import ProxyResource -from ._models_py3 import Resource -from ._models_py3 import SSODetailsRequest -from ._models_py3 import SSODetailsResponse -from ._models_py3 import SystemData -from ._models_py3 import TagRule -from ._models_py3 import TagRuleListResult -from ._models_py3 import TrackedResource -from ._models_py3 import UserAssignedIdentity -from ._models_py3 import UserInfo -from ._models_py3 import VMExtensionPayload -from ._models_py3 import VMHostsListResponse -from ._models_py3 import VMInfo +from typing import TYPE_CHECKING -from ._dynatrace_observability_mgmt_client_enums import ActionType -from ._dynatrace_observability_mgmt_client_enums import AutoUpdateSetting -from ._dynatrace_observability_mgmt_client_enums import AvailabilityState -from ._dynatrace_observability_mgmt_client_enums import CreatedByType -from ._dynatrace_observability_mgmt_client_enums import LiftrResourceCategories -from ._dynatrace_observability_mgmt_client_enums import LogModule -from ._dynatrace_observability_mgmt_client_enums import ManagedIdentityType -from ._dynatrace_observability_mgmt_client_enums import MarketplaceSubscriptionStatus -from ._dynatrace_observability_mgmt_client_enums import MonitoringStatus -from ._dynatrace_observability_mgmt_client_enums import MonitoringType -from ._dynatrace_observability_mgmt_client_enums import Origin -from ._dynatrace_observability_mgmt_client_enums import ProvisioningState -from ._dynatrace_observability_mgmt_client_enums import SSOStatus -from ._dynatrace_observability_mgmt_client_enums import SendAadLogsStatus -from ._dynatrace_observability_mgmt_client_enums import SendActivityLogsStatus -from ._dynatrace_observability_mgmt_client_enums import SendSubscriptionLogsStatus -from ._dynatrace_observability_mgmt_client_enums import SendingLogsStatus -from ._dynatrace_observability_mgmt_client_enums import SendingMetricsStatus -from ._dynatrace_observability_mgmt_client_enums import SingleSignOnStates -from ._dynatrace_observability_mgmt_client_enums import TagAction -from ._dynatrace_observability_mgmt_client_enums import UpdateStatus +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models_py3 import ( # type: ignore + AccountInfo, + AppServiceInfo, + AppServiceListResponse, + DynatraceEnvironmentProperties, + DynatraceSingleSignOnProperties, + DynatraceSingleSignOnResource, + DynatraceSingleSignOnResourceListResult, + EnvironmentInfo, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + FilteringTag, + IdentityProperties, + LinkableEnvironmentListResponse, + LinkableEnvironmentRequest, + LinkableEnvironmentResponse, + LogRules, + MarketplaceSaaSResourceDetailsRequest, + MarketplaceSaaSResourceDetailsResponse, + MetricRules, + MetricsStatusResponse, + MonitorResource, + MonitorResourceListResult, + MonitorResourceUpdate, + MonitoredResource, + MonitoredResourceListResponse, + Operation, + OperationDisplay, + OperationListResult, + PlanData, + ProxyResource, + Resource, + SSODetailsRequest, + SSODetailsResponse, + SystemData, + TagRule, + TagRuleListResult, + TrackedResource, + UserAssignedIdentity, + UserInfo, + VMExtensionPayload, + VMHostsListResponse, + VMInfo, +) + +from ._dynatrace_observability_mgmt_client_enums import ( # type: ignore + ActionType, + AutoUpdateSetting, + AvailabilityState, + CreatedByType, + LiftrResourceCategories, + LogModule, + ManagedIdentityType, + MarketplaceSubscriptionStatus, + MonitoringStatus, + MonitoringType, + Origin, + ProvisioningState, + SSOStatus, + SendAadLogsStatus, + SendActivityLogsStatus, + SendSubscriptionLogsStatus, + SendingLogsStatus, + SendingMetricsStatus, + SingleSignOnStates, + TagAction, + UpdateStatus, +) 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__ = [ @@ -141,5 +152,5 @@ "TagAction", "UpdateStatus", ] -__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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/_models_py3.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/_models_py3.py index 252ad2f658a4..50b2e7760914 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/models/_models_py3.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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,7 +13,6 @@ from .. import _serialization if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models @@ -280,7 +279,7 @@ class Resource(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -316,7 +315,7 @@ class ProxyResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -325,22 +324,6 @@ class ProxyResource(Resource): :vartype type: str """ - _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"}, - } - - def __init__(self, **kwargs: Any) -> None: - """ """ - super().__init__(**kwargs) - class DynatraceSingleSignOnResource(ProxyResource): """Single sign-on configurations for a given monitor resource. @@ -348,7 +331,7 @@ class DynatraceSingleSignOnResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -424,7 +407,7 @@ def __init__( class DynatraceSingleSignOnResourceListResult(_serialization.Model): """The response of a DynatraceSingleSignOnResource list operation. - 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 value: The items on this page. Required. :vartype value: list[~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource] @@ -640,7 +623,7 @@ class IdentityProperties(_serialization.Model): 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 Azure. + All required parameters must be populated in order to send to server. :ivar tenant_id: The Active Directory tenant id of the principal. :vartype tenant_id: str @@ -723,7 +706,7 @@ def __init__( class LinkableEnvironmentRequest(_serialization.Model): """Request for getting all the linkable environments for a user. - 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 tenant_id: Tenant Id of the user in which they want to link the environment. Required. :vartype tenant_id: str @@ -863,7 +846,7 @@ def __init__( class MarketplaceSaaSResourceDetailsRequest(_serialization.Model): """Request for getting Marketplace SaaS resource details for a tenant Id. - 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 tenant_id: Tenant Id. Required. :vartype tenant_id: str @@ -1088,10 +1071,10 @@ class TrackedResource(Resource): 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 Azure. + All required parameters must be populated in order to send to server. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1131,15 +1114,15 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw self.location = location -class MonitorResource(TrackedResource): # pylint: disable=too-many-instance-attributes +class MonitorResource(TrackedResource): """Dynatrace Monitor Resource. 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 Azure. + All required parameters must be populated in order to send to server. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1260,7 +1243,7 @@ def __init__( class MonitorResourceListResult(_serialization.Model): """The response of a MonitorResource list operation. - 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 value: The items on this page. Required. :vartype value: list[~azure.mgmt.dynatrace.models.MonitorResource] @@ -1481,7 +1464,7 @@ def __init__( class SSODetailsRequest(_serialization.Model): """Request for getting sso details for a user. - 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 user_principal: user principal id of the user. Required. :vartype user_principal: str @@ -1629,7 +1612,7 @@ class TagRule(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1689,7 +1672,7 @@ def __init__( class TagRuleListResult(_serialization.Model): """The response of a TagRule list operation. - 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 value: The items on this page. Required. :vartype value: list[~azure.mgmt.dynatrace.models.TagRule] @@ -1721,7 +1704,7 @@ def __init__(self, *, value: List["_models.TagRule"], next_link: Optional[str] = class UserAssignedIdentity(_serialization.Model): """A managed identity assigned by the user. - 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 client_id: The active directory client identifier for this principal. Required. :vartype client_id: str diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/__init__.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/__init__.py index f5a4d0f9f64d..401987535e42 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/__init__.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/__init__.py @@ -5,14 +5,20 @@ # 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 ._monitors_operations import MonitorsOperations -from ._operations import Operations -from ._tag_rules_operations import TagRulesOperations -from ._single_sign_on_operations import SingleSignOnOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._monitors_operations import MonitorsOperations # type: ignore +from ._operations import Operations # type: ignore +from ._tag_rules_operations import TagRulesOperations # type: ignore +from ._single_sign_on_operations import SingleSignOnOperations # 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__ = [ @@ -21,5 +27,5 @@ "TagRulesOperations", "SingleSignOnOperations", ] -__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/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_monitors_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_monitors_operations.py index 149ebf23ecd4..8085228296f8 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_monitors_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_monitors_operations.py @@ -7,7 +7,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 +17,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 +32,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]] @@ -295,7 +300,9 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_get_marketplace_saa_s_resource_details_request(subscription_id: str, **kwargs: Any) -> HttpRequest: +def build_get_marketplace_saa_s_resource_details_request( # pylint: disable=name-too-long + subscription_id: str, **kwargs: Any +) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -528,7 +535,6 @@ def list_monitored_resources( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MonitoredResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.MonitoredResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -539,7 +545,7 @@ def list_monitored_resources( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoredResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -550,17 +556,15 @@ def list_monitored_resources( def prepare_request(next_link=None): if not next_link: - request = build_list_monitored_resources_request( + _request = build_list_monitored_resources_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_monitored_resources.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 @@ -572,13 +576,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("MonitoredResourceListResponse", pipeline_response) @@ -588,11 +591,11 @@ 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 @@ -605,10 +608,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listMonitoredResources" - } - @distributed_trace def get_vm_host_payload( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -624,12 +623,11 @@ def get_vm_host_payload( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: VMExtensionPayload or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.VMExtensionPayload :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -643,21 +641,19 @@ def get_vm_host_payload( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.VMExtensionPayload] = kwargs.pop("cls", None) - request = build_get_vm_host_payload_request( + _request = build_get_vm_host_payload_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_vm_host_payload.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 @@ -667,16 +663,12 @@ def get_vm_host_payload( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("VMExtensionPayload", pipeline_response) + deserialized = self._deserialize("VMExtensionPayload", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_vm_host_payload.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getVMHostPayload" - } + return deserialized # type: ignore @distributed_trace def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.MonitorResource: @@ -689,12 +681,11 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -708,21 +699,19 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitorResource] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -732,21 +721,21 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", 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/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore def _create_or_update_initial( - self, resource_group_name: str, monitor_name: str, resource: Union[_models.MonitorResource, IO], **kwargs: Any - ) -> _models.MonitorResource: - error_map = { + self, + resource_group_name: str, + monitor_name: str, + resource: Union[_models.MonitorResource, IO[bytes]], + **kwargs: Any + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -759,7 +748,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.MonitorResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -769,7 +758,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(resource, "MonitorResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -777,40 +766,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("MonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("MonitorResource", 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/Dynatrace.Observability/monitors/{monitorName}" - } - @overload def begin_create_or_update( self, @@ -835,14 +819,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 MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -854,7 +830,7 @@ def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -869,18 +845,10 @@ def begin_create_or_update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -889,7 +857,11 @@ def begin_create_or_update( @distributed_trace def begin_create_or_update( - self, resource_group_name: str, monitor_name: str, resource: Union[_models.MonitorResource, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + resource: Union[_models.MonitorResource, IO[bytes]], + **kwargs: Any ) -> LROPoller[_models.MonitorResource]: """Create a MonitorResource. @@ -900,20 +872,9 @@ def begin_create_or_update( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param resource: Resource create parameters. Is either a MonitorResource type or a IO type. - Required. - :type resource: ~azure.mgmt.dynatrace.models.MonitorResource 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 resource: Resource create parameters. Is either a MonitorResource type or a IO[bytes] + type. Required. + :type resource: ~azure.mgmt.dynatrace.models.MonitorResource or IO[bytes] :return: An instance of LROPoller that returns either MonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.MonitorResource] @@ -940,12 +901,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("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -957,17 +919,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.MonitorResource].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/Dynatrace.Observability/monitors/{monitorName}" - } + return LROPoller[_models.MonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @overload def update( @@ -993,7 +953,6 @@ def 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 :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: @@ -1004,7 +963,7 @@ def update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1019,11 +978,10 @@ def update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: The resource properties to be updated. Required. - :type resource: IO + :type resource: 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: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: @@ -1034,7 +992,7 @@ def update( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.MonitorResourceUpdate, IO], + resource: Union[_models.MonitorResourceUpdate, IO[bytes]], **kwargs: Any ) -> _models.MonitorResource: """Update a MonitorResource. @@ -1047,17 +1005,13 @@ def update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param resource: The resource properties to be updated. Is either a MonitorResourceUpdate type - or a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.MonitorResourceUpdate 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 + or a IO[bytes] type. Required. + :type resource: ~azure.mgmt.dynatrace.models.MonitorResourceUpdate or IO[bytes] :return: MonitorResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1080,7 +1034,7 @@ def update( else: _json = self._serialize.body(resource, "MonitorResourceUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1088,16 +1042,14 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.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 @@ -1107,21 +1059,15 @@ def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitorResource", pipeline_response) + deserialized = self._deserialize("MonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore - def _delete_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, monitor_name: str, **kwargs: Any - ) -> None: - error_map = { + def _delete_initial(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1133,38 +1079,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, monitor_name=monitor_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.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/Dynatrace.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> LROPoller[None]: @@ -1177,14 +1126,6 @@ def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: An :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_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: @@ -1198,7 +1139,7 @@ def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: An 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, monitor_name=monitor_name, api_version=api_version, @@ -1207,11 +1148,12 @@ def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: An 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( @@ -1222,17 +1164,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/Dynatrace.Observability/monitors/{monitorName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list_by_subscription_id(self, **kwargs: Any) -> Iterable["_models.MonitorResource"]: @@ -1240,7 +1178,6 @@ def list_by_subscription_id(self, **kwargs: Any) -> Iterable["_models.MonitorRes List all MonitorResource by subscriptionId. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either MonitorResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.MonitorResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -1251,7 +1188,7 @@ def list_by_subscription_id(self, **kwargs: Any) -> Iterable["_models.MonitorRes api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1262,15 +1199,13 @@ def list_by_subscription_id(self, **kwargs: Any) -> Iterable["_models.MonitorRes def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_id_request( + _request = build_list_by_subscription_id_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription_id.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 @@ -1282,13 +1217,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("MonitorResourceListResult", pipeline_response) @@ -1298,11 +1232,11 @@ 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 @@ -1315,10 +1249,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_subscription_id.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Dynatrace.Observability/monitors" - } - @distributed_trace def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.MonitorResource"]: """List MonitorResource resources by resource group. @@ -1328,7 +1258,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 MonitorResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.MonitorResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -1339,7 +1268,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.MonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1350,16 +1279,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 @@ -1371,13 +1298,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("MonitorResourceListResult", pipeline_response) @@ -1387,11 +1313,11 @@ 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 @@ -1404,10 +1330,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors" - } - @overload def get_marketplace_saa_s_resource_details( self, @@ -1423,7 +1345,6 @@ def get_marketplace_saa_s_resource_details( :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: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1431,16 +1352,15 @@ def get_marketplace_saa_s_resource_details( @overload def get_marketplace_saa_s_resource_details( - self, request: IO, *, content_type: str = "application/json", **kwargs: Any + self, request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.MarketplaceSaaSResourceDetailsResponse: """Get Marketplace SaaS resource details of a tenant under a specific subscription. :param request: Tenant Id. Required. - :type request: IO + :type request: 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: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1448,26 +1368,22 @@ def get_marketplace_saa_s_resource_details( @distributed_trace def get_marketplace_saa_s_resource_details( - self, request: Union[_models.MarketplaceSaaSResourceDetailsRequest, IO], **kwargs: Any + self, request: Union[_models.MarketplaceSaaSResourceDetailsRequest, IO[bytes]], **kwargs: Any ) -> _models.MarketplaceSaaSResourceDetailsResponse: """Get Marketplace SaaS resource details of a tenant under a specific subscription. - :param request: Tenant Id. Is either a MarketplaceSaaSResourceDetailsRequest type or a IO type. - Required. - :type request: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsRequest 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 request: Tenant Id. Is either a MarketplaceSaaSResourceDetailsRequest type or a + IO[bytes] type. Required. + :type request: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsRequest or IO[bytes] :return: MarketplaceSaaSResourceDetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MarketplaceSaaSResourceDetailsResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, + 404: ResourceNotFoundError, 409: ResourceExistsError, 304: ResourceNotModifiedError, - 404: lambda response: ResourceNotFoundError(response=response, error_format=ARMErrorFormat), } error_map.update(kwargs.pop("error_map", {}) or {}) @@ -1486,22 +1402,20 @@ def get_marketplace_saa_s_resource_details( else: _json = self._serialize.body(request, "MarketplaceSaaSResourceDetailsRequest") - request = build_get_marketplace_saa_s_resource_details_request( + _request = build_get_marketplace_saa_s_resource_details_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.get_marketplace_saa_s_resource_details.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 @@ -1511,16 +1425,12 @@ def get_marketplace_saa_s_resource_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MarketplaceSaaSResourceDetailsResponse", pipeline_response) + deserialized = self._deserialize("MarketplaceSaaSResourceDetailsResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_marketplace_saa_s_resource_details.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Dynatrace.Observability/getMarketplaceSaaSResourceDetails" - } + return deserialized # type: ignore @distributed_trace def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> Iterable["_models.VMInfo"]: @@ -1533,7 +1443,6 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.VMInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1544,7 +1453,7 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.VMHostsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1555,17 +1464,15 @@ def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) def prepare_request(next_link=None): if not next_link: - request = build_list_hosts_request( + _request = build_list_hosts_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_hosts.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 @@ -1577,13 +1484,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("VMHostsListResponse", pipeline_response) @@ -1593,11 +1499,11 @@ 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 @@ -1610,10 +1516,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listHosts" - } - @distributed_trace def get_metric_status( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -1625,12 +1527,11 @@ def get_metric_status( :type resource_group_name: str :param monitor_name: Name of the Monitor resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1644,21 +1545,19 @@ def get_metric_status( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MetricsStatusResponse] = kwargs.pop("cls", None) - request = build_get_metric_status_request( + _request = build_get_metric_status_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_metric_status.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 @@ -1668,16 +1567,12 @@ def get_metric_status( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricsStatusResponse", pipeline_response) + deserialized = self._deserialize("MetricsStatusResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_status.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getMetricStatus" - } + return deserialized # type: ignore @distributed_trace def list_app_services( @@ -1692,7 +1587,6 @@ def list_app_services( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.AppServiceInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1703,7 +1597,7 @@ def list_app_services( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AppServiceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1714,17 +1608,15 @@ def list_app_services( def prepare_request(next_link=None): if not next_link: - request = build_list_app_services_request( + _request = build_list_app_services_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_app_services.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 @@ -1736,13 +1628,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("AppServiceListResponse", pipeline_response) @@ -1752,11 +1643,11 @@ 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 @@ -1769,10 +1660,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_app_services.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listAppServices" - } - @overload def get_sso_details( self, @@ -1797,7 +1684,6 @@ def get_sso_details( :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: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1808,7 +1694,7 @@ def get_sso_details( self, resource_group_name: str, monitor_name: str, - request: Optional[IO] = None, + request: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1823,11 +1709,10 @@ def get_sso_details( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the get sso details request. Default value is None. - :type request: IO + :type request: 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: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1838,7 +1723,7 @@ def get_sso_details( self, resource_group_name: str, monitor_name: str, - request: Optional[Union[_models.SSODetailsRequest, IO]] = None, + request: Optional[Union[_models.SSODetailsRequest, IO[bytes]]] = None, **kwargs: Any ) -> _models.SSODetailsResponse: """Gets the SSO configuration details from the partner. @@ -1851,21 +1736,17 @@ def get_sso_details( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the get sso details request. Is either a SSODetailsRequest type - or a IO type. Default value is None. - :type request: ~azure.mgmt.dynatrace.models.SSODetailsRequest 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 + or a IO[bytes] type. Default value is None. + :type request: ~azure.mgmt.dynatrace.models.SSODetailsRequest or IO[bytes] :return: SSODetailsResponse or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.SSODetailsResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, 304: ResourceNotModifiedError, - 401: lambda response: ClientAuthenticationError(response=response, error_format=ARMErrorFormat), } error_map.update(kwargs.pop("error_map", {}) or {}) @@ -1887,7 +1768,7 @@ def get_sso_details( else: _json = None - request = build_get_sso_details_request( + _request = build_get_sso_details_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1895,16 +1776,14 @@ def get_sso_details( content_type=content_type, json=_json, content=_content, - template_url=self.get_sso_details.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 @@ -1914,16 +1793,12 @@ def get_sso_details( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("SSODetailsResponse", pipeline_response) + deserialized = self._deserialize("SSODetailsResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_sso_details.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/getSSODetails" - } + return deserialized # type: ignore @overload def list_linkable_environments( @@ -1949,7 +1824,6 @@ def list_linkable_environments( :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: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.LinkableEnvironmentResponse] @@ -1961,7 +1835,7 @@ def list_linkable_environments( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1976,11 +1850,10 @@ def list_linkable_environments( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the linkable environment request. Required. - :type request: IO + :type request: 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: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.LinkableEnvironmentResponse] @@ -1992,7 +1865,7 @@ def list_linkable_environments( self, resource_group_name: str, monitor_name: str, - request: Union[_models.LinkableEnvironmentRequest, IO], + request: Union[_models.LinkableEnvironmentRequest, IO[bytes]], **kwargs: Any ) -> Iterable["_models.LinkableEnvironmentResponse"]: """Gets all the Dynatrace environments that a user can link a azure resource to. @@ -2005,12 +1878,8 @@ def list_linkable_environments( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param request: The details of the linkable environment request. Is either a - LinkableEnvironmentRequest type or a IO type. Required. - :type request: ~azure.mgmt.dynatrace.models.LinkableEnvironmentRequest 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 + LinkableEnvironmentRequest type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.dynatrace.models.LinkableEnvironmentRequest or IO[bytes] :return: An iterator like instance of either LinkableEnvironmentResponse or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.LinkableEnvironmentResponse] @@ -2023,7 +1892,7 @@ def list_linkable_environments( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.LinkableEnvironmentListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2041,7 +1910,7 @@ def list_linkable_environments( def prepare_request(next_link=None): if not next_link: - request = build_list_linkable_environments_request( + _request = build_list_linkable_environments_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -2049,12 +1918,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - template_url=self.list_linkable_environments.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 @@ -2066,13 +1933,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("LinkableEnvironmentListResponse", pipeline_response) @@ -2082,11 +1948,11 @@ 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 @@ -2098,7 +1964,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list_linkable_environments.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/listLinkableEnvironments" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_operations.py index c2ad38cf3377..cb83970b7b42 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/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]] @@ -80,7 +82,6 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: List the operations for Dynatrace.Observability. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -91,7 +92,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: 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.Operation"]: 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,11 +135,11 @@ 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 @@ -153,5 +151,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Dynatrace.Observability/operations"} diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_single_sign_on_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_single_sign_on_operations.py index fa5311c422cb..82e45e7dbdca 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_single_sign_on_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_single_sign_on_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]] @@ -165,10 +169,10 @@ def _create_or_update_initial( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: Union[_models.DynatraceSingleSignOnResource, IO], + resource: Union[_models.DynatraceSingleSignOnResource, IO[bytes]], **kwargs: Any - ) -> _models.DynatraceSingleSignOnResource: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -181,7 +185,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.DynatraceSingleSignOnResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -191,7 +195,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(resource, "DynatraceSingleSignOnResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -200,40 +204,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DynatraceSingleSignOnResource", 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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } - @overload def begin_create_or_update( self, @@ -261,14 +260,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 DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -282,7 +273,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -299,18 +290,10 @@ def begin_create_or_update( :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -324,7 +307,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - resource: Union[_models.DynatraceSingleSignOnResource, IO], + resource: Union[_models.DynatraceSingleSignOnResource, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.DynatraceSingleSignOnResource]: """Create a DynatraceSingleSignOnResource. @@ -339,19 +322,8 @@ def begin_create_or_update( :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str :param resource: Resource create parameters. Is either a DynatraceSingleSignOnResource type or - a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource 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. + a IO[bytes] type. Required. + :type resource: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource or IO[bytes] :return: An instance of LROPoller that returns either DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -380,12 +352,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("DynatraceSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -397,17 +370,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.DynatraceSingleSignOnResource].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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return LROPoller[_models.DynatraceSingleSignOnResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace def get( @@ -424,12 +395,11 @@ def get( :type monitor_name: str :param configuration_name: Single Sign On Configuration Name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DynatraceSingleSignOnResource or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.DynatraceSingleSignOnResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -443,22 +413,20 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DynatraceSingleSignOnResource] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -468,16 +436,12 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DynatraceSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DynatraceSingleSignOnResource", 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/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return deserialized # type: ignore @distributed_trace def list( @@ -492,7 +456,6 @@ def list( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DynatraceSingleSignOnResource or the result of cls(response) :rtype: @@ -505,7 +468,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DynatraceSingleSignOnResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -516,17 +479,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, monitor_name=monitor_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 @@ -538,13 +499,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("DynatraceSingleSignOnResourceListResult", pipeline_response) @@ -554,11 +514,11 @@ 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 @@ -570,7 +530,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/singleSignOnConfigurations" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_tag_rules_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_tag_rules_operations.py index 8da983bd5f5b..17b27119236d 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_tag_rules_operations.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/azure/mgmt/dynatrace/operations/_tag_rules_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]] @@ -207,12 +211,11 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * :type monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.dynatrace.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -226,22 +229,20 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_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 @@ -251,26 +252,22 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", 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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any - ) -> _models.TagRule: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -283,7 +280,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.TagRule] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -293,7 +290,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(resource, "TagRule") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -302,40 +299,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.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("TagRule", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("TagRule", 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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } - @overload def begin_create_or_update( self, @@ -363,14 +355,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 TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -382,7 +366,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -399,18 +383,10 @@ def begin_create_or_update( :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: 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 TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -422,7 +398,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.TagRule]: """Create a TagRule. @@ -436,19 +412,9 @@ def begin_create_or_update( :type monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_name: str - :param resource: Resource create parameters. Is either a TagRule type or a IO type. Required. - :type resource: ~azure.mgmt.dynatrace.models.TagRule 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 resource: Resource create parameters. Is either a TagRule type or a IO[bytes] type. + Required. + :type resource: ~azure.mgmt.dynatrace.models.TagRule or IO[bytes] :return: An instance of LROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.dynatrace.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -475,12 +441,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("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -492,22 +459,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.TagRule].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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return LROPoller[_models.TagRule]( + 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, monitor_name: str, rule_set_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -519,39 +484,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, monitor_name=monitor_name, rule_set_name=rule_set_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.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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete( @@ -568,14 +536,6 @@ def begin_delete( :type monitor_name: str :param rule_set_name: Monitor resource name. Required. :type rule_set_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: @@ -589,7 +549,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, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -599,11 +559,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( @@ -614,17 +575,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/Dynatrace.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> Iterable["_models.TagRule"]: @@ -637,7 +594,6 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> It :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TagRule or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.dynatrace.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -648,7 +604,7 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> It api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRuleListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -659,17 +615,15 @@ def list(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> It def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( resource_group_name=resource_group_name, monitor_name=monitor_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 @@ -681,13 +635,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("TagRuleListResult", pipeline_response) @@ -697,11 +650,11 @@ 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 @@ -713,7 +666,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Dynatrace.Observability/monitors/{monitorName}/tagRules" - } diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_maximum_set_gen.py index b3f8aa583468..8102376025b7 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_minimum_set_gen.py index b4cd200647ee..dc8eec51620c 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_create_or_update_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_maximum_set_gen.py index 2b22c8af6810..c5941f5e03cf 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_minimum_set_gen.py index 28673c6f9e9c..3265599780d6 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_delete_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_maximum_set_gen.py index bb3836fbff92..e64dd7595c99 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_minimum_set_gen.py index cbcd5f8adebb..b3efc5e95dbd 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_marketplace_saa_sresource_details_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_maximum_set_gen.py index 2fd6bf3ff655..e8de6d0e2206 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_maximum_set_gen.py index 50a3caebd8bc..b7d6919008ff 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_minimum_set_gen.py index d18424ac471c..d81a8b67918b 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_metric_status_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_minimum_set_gen.py index 05fe88cb5262..8418d3c0773b 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_maximum_set_gen.py index 0a3ef0d38954..be133118d0eb 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_minimum_set_gen.py index d51d068e3345..b73ec7c3c0be 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_sso_details_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_maximum_set_gen.py index c9cd2e986ac5..f92f7b98557f 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_minimum_set_gen.py index 39a5661d05d4..5f3425cd54ff 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_get_vm_host_payload_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_maximum_set_gen.py index 7bda37260f58..e8374deb5c45 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_minimum_set_gen.py index f6fa6c432180..03714795a6a4 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_app_services_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py index fe3eb7077e60..cf45fc1f6054 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_minimum_set_gen.py index f98511e2efd4..7ebd2eef4ba1 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_resource_group_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_maximum_set_gen.py index 2a2eb5ef9e6e..3f80a569015f 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_minimum_set_gen.py index 58ac1df06468..9fccc6e885f6 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_by_subscription_id_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_maximum_set_gen.py index 2d42f69e2abd..da7d9220c6ec 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_minimum_set_gen.py index df9a538a92db..d25c2245fe67 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_hosts_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_maximum_set_gen.py index 31b51b925097..a720de2288fa 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_minimum_set_gen.py index 8b627eeddecd..1047344fa1ed 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_linkable_environments_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py index f26559f5a268..fb59231c5a53 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py index b718e67232dc..d1e43bde7f1e 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_update_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_update_maximum_set_gen.py index 76cadc6c21e6..7cc5ac7fed6c 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_update_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/monitors_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_maximum_set_gen.py index 8d7cbd69a35b..bbc1d3eb1455 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_minimum_set_gen.py index 33dce5bcfdfc..b0ea2b6ec98e 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/operations_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_maximum_set_gen.py index 0aba980f9167..900b5bbcfd57 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_minimum_set_gen.py index c6ae98328c2c..717b4281e9f4 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_create_or_update_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_maximum_set_gen.py index 6dfc0887de56..56726f5d56b7 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_minimum_set_gen.py index 92cb7319fe73..6678ffadc33d 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_get_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_maximum_set_gen.py index a04d56d5da04..ad6856c30a8a 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_minimum_set_gen.py index a4b66db498b6..04954b1ab58c 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/single_sign_on_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_maximum_set_gen.py index 4d3577226984..9e78a3522cbf 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_minimum_set_gen.py index 50cd8e8573b0..753f26264cd0 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_create_or_update_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_maximum_set_gen.py index 84f179e85daa..9b8df26ce10e 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_minimum_set_gen.py index cc7527939a8b..80b7b6976401 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_delete_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_maximum_set_gen.py index d58364b96931..040e18272747 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_minimum_set_gen.py index 314a0d5fcedd..043c20ed664e 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_get_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_maximum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_maximum_set_gen.py index ea3d23e0d39a..9e50155b3612 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_maximum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_minimum_set_gen.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_minimum_set_gen.py index 65ea0e15b86a..19686117e024 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_minimum_set_gen.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_samples/tag_rules_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.dynatrace import DynatraceObservabilityMgmtClient """ diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/conftest.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/conftest.py new file mode 100644 index 000000000000..7bd5c499f717 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/conftest.py @@ -0,0 +1,47 @@ +# 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): + dynatraceobservabilitymgmt_subscription_id = os.environ.get( + "AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + dynatraceobservabilitymgmt_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + dynatraceobservabilitymgmt_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + dynatraceobservabilitymgmt_client_secret = os.environ.get( + "AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer( + regex=dynatraceobservabilitymgmt_subscription_id, value="00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer( + regex=dynatraceobservabilitymgmt_tenant_id, value="00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer( + regex=dynatraceobservabilitymgmt_client_id, value="00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer( + regex=dynatraceobservabilitymgmt_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/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations.py new file mode 100644 index 000000000000..37fe5ae9933a --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations.py @@ -0,0 +1,241 @@ +# 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.dynatrace import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtMonitorsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_monitored_resources(self, resource_group): + response = self.client.monitors.list_monitored_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get_vm_host_payload(self, resource_group): + response = self.client.monitors.get_vm_host_payload( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get(self, resource_group): + response = self.client.monitors.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_begin_create_or_update(self, resource_group): + response = self.client.monitors.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={ + "location": "str", + "dynatraceEnvironmentProperties": { + "accountInfo": {"accountId": "str", "regionId": "str"}, + "environmentInfo": { + "environmentId": "str", + "ingestionKey": "str", + "landingURL": "str", + "logsIngestionEndpoint": "str", + }, + "singleSignOnProperties": { + "aadDomains": ["str"], + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "liftrResourceCategory": "str", + "liftrResourcePreference": 0, + "marketplaceSubscriptionStatus": "str", + "monitoringStatus": "str", + "name": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2023-04-27", + ).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_monitors_update(self, resource_group): + response = self.client.monitors.update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={"tags": {"str": "str"}}, + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_begin_delete(self, resource_group): + response = self.client.monitors.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ).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_monitors_list_by_subscription_id(self, resource_group): + response = self.client.monitors.list_by_subscription_id( + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_by_resource_group(self, resource_group): + response = self.client.monitors.list_by_resource_group( + resource_group_name=resource_group.name, + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get_marketplace_saa_s_resource_details(self, resource_group): + response = self.client.monitors.get_marketplace_saa_s_resource_details( + request={"tenantId": "str"}, + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_hosts(self, resource_group): + response = self.client.monitors.list_hosts( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get_metric_status(self, resource_group): + response = self.client.monitors.get_metric_status( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_app_services(self, resource_group): + response = self.client.monitors.list_app_services( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get_sso_details(self, resource_group): + response = self.client.monitors.get_sso_details( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_linkable_environments(self, resource_group): + response = self.client.monitors.list_linkable_environments( + resource_group_name=resource_group.name, + monitor_name="str", + request={"region": "str", "tenantId": "str", "userPrincipal": "str"}, + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations_async.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations_async.py new file mode 100644 index 000000000000..b39b6bc77c61 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_monitors_operations_async.py @@ -0,0 +1,246 @@ +# 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.dynatrace.aio import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtMonitorsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_monitored_resources(self, resource_group): + response = self.client.monitors.list_monitored_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + 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_monitors_get_vm_host_payload(self, resource_group): + response = await self.client.monitors.get_vm_host_payload( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_get(self, resource_group): + response = await self.client.monitors.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_begin_create_or_update(self, resource_group): + response = await ( + await self.client.monitors.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={ + "location": "str", + "dynatraceEnvironmentProperties": { + "accountInfo": {"accountId": "str", "regionId": "str"}, + "environmentInfo": { + "environmentId": "str", + "ingestionKey": "str", + "landingURL": "str", + "logsIngestionEndpoint": "str", + }, + "singleSignOnProperties": { + "aadDomains": ["str"], + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "liftrResourceCategory": "str", + "liftrResourcePreference": 0, + "marketplaceSubscriptionStatus": "str", + "monitoringStatus": "str", + "name": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2023-04-27", + ) + ).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_monitors_update(self, resource_group): + response = await self.client.monitors.update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={"tags": {"str": "str"}}, + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_begin_delete(self, resource_group): + response = await ( + await self.client.monitors.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + ).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_monitors_list_by_subscription_id(self, resource_group): + response = self.client.monitors.list_by_subscription_id( + api_version="2023-04-27", + ) + 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_monitors_list_by_resource_group(self, resource_group): + response = self.client.monitors.list_by_resource_group( + resource_group_name=resource_group.name, + api_version="2023-04-27", + ) + 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_monitors_get_marketplace_saa_s_resource_details(self, resource_group): + response = await self.client.monitors.get_marketplace_saa_s_resource_details( + request={"tenantId": "str"}, + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_hosts(self, resource_group): + response = self.client.monitors.list_hosts( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + 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_monitors_get_metric_status(self, resource_group): + response = await self.client.monitors.get_metric_status( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_app_services(self, resource_group): + response = self.client.monitors.list_app_services( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + 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_monitors_get_sso_details(self, resource_group): + response = await self.client.monitors.get_sso_details( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_linkable_environments(self, resource_group): + response = self.client.monitors.list_linkable_environments( + resource_group_name=resource_group.name, + monitor_name="str", + request={"region": "str", "tenantId": "str", "userPrincipal": "str"}, + api_version="2023-04-27", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_operations.py new file mode 100644 index 000000000000..b86c3e75216d --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_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.dynatrace import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_operations_async.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_operations_async.py new file mode 100644 index 000000000000..3f4113b0a975 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_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.dynatrace.aio import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient, 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="2023-04-27", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations.py new file mode 100644 index 000000000000..9543eeedede1 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations.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.dynatrace import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtSingleSignOnOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_single_sign_on_begin_create_or_update(self, resource_group): + response = self.client.single_sign_on.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + resource={ + "aadDomains": ["str"], + "enterpriseAppId": "str", + "id": "str", + "name": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2023-04-27", + ).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_single_sign_on_get(self, resource_group): + response = self.client.single_sign_on.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_single_sign_on_list(self, resource_group): + response = self.client.single_sign_on.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations_async.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations_async.py new file mode 100644 index 000000000000..973bf9f99505 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_single_sign_on_operations_async.py @@ -0,0 +1,78 @@ +# 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.dynatrace.aio import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtSingleSignOnOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_single_sign_on_begin_create_or_update(self, resource_group): + response = await ( + await self.client.single_sign_on.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + resource={ + "aadDomains": ["str"], + "enterpriseAppId": "str", + "id": "str", + "name": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2023-04-27", + ) + ).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_single_sign_on_get(self, resource_group): + response = await self.client.single_sign_on.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_single_sign_on_list(self, resource_group): + response = self.client.single_sign_on.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations.py new file mode 100644 index 000000000000..f78532794e94 --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations.py @@ -0,0 +1,94 @@ +# 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.dynatrace import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtTagRulesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_get(self, resource_group): + response = self.client.tag_rules.get( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_begin_create_or_update(self, resource_group): + response = self.client.tag_rules.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + resource={ + "id": "str", + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendingMetrics": "str", + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2023-04-27", + ).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_tag_rules_begin_delete(self, resource_group): + response = self.client.tag_rules.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-04-27", + ).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_tag_rules_list(self, resource_group): + response = self.client.tag_rules.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations_async.py b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations_async.py new file mode 100644 index 000000000000..445ccc6a5e6d --- /dev/null +++ b/sdk/dynatrace/azure-mgmt-dynatrace/generated_tests/test_dynatrace_observability_mgmt_tag_rules_operations_async.py @@ -0,0 +1,99 @@ +# 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.dynatrace.aio import DynatraceObservabilityMgmtClient + +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 TestDynatraceObservabilityMgmtTagRulesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(DynatraceObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_get(self, resource_group): + response = await self.client.tag_rules.get( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-04-27", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_begin_create_or_update(self, resource_group): + response = await ( + await self.client.tag_rules.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + resource={ + "id": "str", + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendingMetrics": "str", + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2023-04-27", + ) + ).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_tag_rules_begin_delete(self, resource_group): + response = await ( + await self.client.tag_rules.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-04-27", + ) + ).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_tag_rules_list(self, resource_group): + response = self.client.tag_rules.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-04-27", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/dynatrace/azure-mgmt-dynatrace/setup.py b/sdk/dynatrace/azure-mgmt-dynatrace/setup.py index 17a53b9367c5..bdb6993067dc 100644 --- a/sdk/dynatrace/azure-mgmt-dynatrace/setup.py +++ b/sdk/dynatrace/azure-mgmt-dynatrace/setup.py @@ -53,11 +53,11 @@ "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: MIT License", ], zip_safe=False, @@ -74,10 +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", - "typing-extensions>=4.3.0; python_version<'3.8.0'", + "isodate>=0.6.1", + "typing-extensions>=4.6.0", + "azure-common>=1.1", + "azure-mgmt-core>=1.3.2", ], - python_requires=">=3.7", + python_requires=">=3.8", )