diff --git a/sdk/datadog/azure-mgmt-datadog/README.md b/sdk/datadog/azure-mgmt-datadog/README.md index 71077b3145d8..acc261dd7a0a 100644 --- a/sdk/datadog/azure-mgmt-datadog/README.md +++ b/sdk/datadog/azure-mgmt-datadog/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Datadog 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 diff --git a/sdk/datadog/azure-mgmt-datadog/_meta.json b/sdk/datadog/azure-mgmt-datadog/_meta.json index 4a96d0cfb5ba..63b537240743 100644 --- a/sdk/datadog/azure-mgmt-datadog/_meta.json +++ b/sdk/datadog/azure-mgmt-datadog/_meta.json @@ -1,11 +1,11 @@ { - "commit": "75fe114f1abd9d9269591123eb96ac4660e7a095", + "commit": "b9cc9a28697d44aeffd1ef71743b269ed998a498", "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.26.4", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/datadog/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/datadog/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.26.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/datadog/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/__init__.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/__init__.py index 63d0fedd527b..aeb7a543dfab 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/__init__.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/__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 ._microsoft_datadog_client import MicrosoftDatadogClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._microsoft_datadog_client import MicrosoftDatadogClient # 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__ = [ "MicrosoftDatadogClient", ] -__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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_configuration.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_configuration.py index 474c530c74bf..9dbc910302b1 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_configuration.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_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 MicrosoftDatadogClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class MicrosoftDatadogClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for MicrosoftDatadogClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +27,13 @@ class MicrosoftDatadogClientConfiguration(Configuration): # pylint: disable=too :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-10-20". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(MicrosoftDatadogClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-01-01") + api_version: str = kwargs.pop("api_version", "2023-10-20") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -48,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-datadog/{}".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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_microsoft_datadog_client.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_microsoft_datadog_client.py index f6cd2fa6e71f..a49908b81012 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_microsoft_datadog_client.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_microsoft_datadog_client.py @@ -8,14 +8,18 @@ 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 MicrosoftDatadogClientConfiguration from ._serialization import Deserializer, Serializer from .operations import ( + BillingInfoOperations, CreationSupportedOperations, MarketplaceAgreementsOperations, MonitoredSubscriptionsOperations, @@ -26,11 +30,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes +class MicrosoftDatadogClient: # pylint: disable=too-many-instance-attributes """MicrosoftDatadogClient. :ivar marketplace_agreements: MarketplaceAgreementsOperations operations @@ -41,6 +44,8 @@ class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyw :vartype monitors: azure.mgmt.datadog.operations.MonitorsOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.datadog.operations.Operations + :ivar billing_info: BillingInfoOperations operations + :vartype billing_info: azure.mgmt.datadog.operations.BillingInfoOperations :ivar tag_rules: TagRulesOperations operations :vartype tag_rules: azure.mgmt.datadog.operations.TagRulesOperations :ivar single_sign_on_configurations: SingleSignOnConfigurationsOperations operations @@ -55,7 +60,7 @@ class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyw :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-10-20". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -72,7 +77,25 @@ def __init__( self._config = MicrosoftDatadogClientConfiguration( 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) @@ -86,6 +109,7 @@ def __init__( ) self.monitors = MonitorsOperations(self._client, self._config, self._serialize, self._deserialize) self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) + self.billing_info = BillingInfoOperations(self._client, self._config, self._serialize, self._deserialize) self.tag_rules = TagRulesOperations(self._client, self._config, self._serialize, self._deserialize) self.single_sign_on_configurations = SingleSignOnConfigurationsOperations( self._client, self._config, self._serialize, self._deserialize @@ -94,7 +118,7 @@ def __init__( 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 @@ -114,12 +138,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) -> "MicrosoftDatadogClient": + def __enter__(self) -> Self: self._client.__enter__() return self diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_serialization.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_serialization.py index 4bae2292227b..ce17d1798ce7 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_serialization.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_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(object): # 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: @@ -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,21 +1666,28 @@ 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() if v.get("readonly") # pylint: disable=protected-access + ] + const = [ + k for k, v in response._validation.items() if v.get("constant") # pylint: disable=protected-access + ] 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: @@ -1602,7 +1697,7 @@ def _instantiate_model(self, response, attrs, additional_properties=None): 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 +1706,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 +1729,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 +1752,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 +1777,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 +1788,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 +1802,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 +1828,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 +1839,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 +1851,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 +1875,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 +1889,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 +1901,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 +1910,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 +1930,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 +1943,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 +1959,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 +1989,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 +1999,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 +2016,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 +2038,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 +2053,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 +2090,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 +2099,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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_vendor.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_vendor.py deleted file mode 100644 index 0dafe0e287ff..000000000000 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_version.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_version.py index 83f24ab50946..e5754a47ce68 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_version.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.1.0" +VERSION = "1.0.0b1" diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/__init__.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/__init__.py index 5fef36364b71..71a4d4c30b9e 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/__init__.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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 ._microsoft_datadog_client import MicrosoftDatadogClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._microsoft_datadog_client import MicrosoftDatadogClient # 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__ = [ "MicrosoftDatadogClient", ] -__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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_configuration.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_configuration.py index 7be4afb3bd40..9154a1df3c36 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_configuration.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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 MicrosoftDatadogClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class MicrosoftDatadogClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for MicrosoftDatadogClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +27,13 @@ class MicrosoftDatadogClientConfiguration(Configuration): # pylint: disable=too :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-10-20". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(MicrosoftDatadogClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2023-01-01") + api_version: str = kwargs.pop("api_version", "2023-10-20") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -48,6 +45,7 @@ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **k self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-datadog/{}".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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_microsoft_datadog_client.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_microsoft_datadog_client.py index 9f4e0714aff8..db1b8b78d6e1 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_microsoft_datadog_client.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/_microsoft_datadog_client.py @@ -8,14 +8,18 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient +from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy from .. import models as _models from .._serialization import Deserializer, Serializer from ._configuration import MicrosoftDatadogClientConfiguration from .operations import ( + BillingInfoOperations, CreationSupportedOperations, MarketplaceAgreementsOperations, MonitoredSubscriptionsOperations, @@ -26,11 +30,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes +class MicrosoftDatadogClient: # pylint: disable=too-many-instance-attributes """MicrosoftDatadogClient. :ivar marketplace_agreements: MarketplaceAgreementsOperations operations @@ -42,6 +45,8 @@ class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyw :vartype monitors: azure.mgmt.datadog.aio.operations.MonitorsOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.datadog.aio.operations.Operations + :ivar billing_info: BillingInfoOperations operations + :vartype billing_info: azure.mgmt.datadog.aio.operations.BillingInfoOperations :ivar tag_rules: TagRulesOperations operations :vartype tag_rules: azure.mgmt.datadog.aio.operations.TagRulesOperations :ivar single_sign_on_configurations: SingleSignOnConfigurationsOperations operations @@ -56,7 +61,7 @@ class MicrosoftDatadogClient: # pylint: disable=client-accepts-api-version-keyw :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-10-20". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -73,7 +78,25 @@ def __init__( self._config = MicrosoftDatadogClientConfiguration( 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) @@ -87,6 +110,7 @@ def __init__( ) self.monitors = MonitorsOperations(self._client, self._config, self._serialize, self._deserialize) self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) + self.billing_info = BillingInfoOperations(self._client, self._config, self._serialize, self._deserialize) self.tag_rules = TagRulesOperations(self._client, self._config, self._serialize, self._deserialize) self.single_sign_on_configurations = SingleSignOnConfigurationsOperations( self._client, self._config, self._serialize, self._deserialize @@ -95,7 +119,9 @@ def __init__( 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 @@ -115,12 +141,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) -> "MicrosoftDatadogClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/__init__.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/__init__.py index 8370b25c3643..661b9ecc8bec 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/__init__.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/__init__.py @@ -5,17 +5,24 @@ # 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 ._marketplace_agreements_operations import MarketplaceAgreementsOperations -from ._creation_supported_operations import CreationSupportedOperations -from ._monitors_operations import MonitorsOperations -from ._operations import Operations -from ._tag_rules_operations import TagRulesOperations -from ._single_sign_on_configurations_operations import SingleSignOnConfigurationsOperations -from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._marketplace_agreements_operations import MarketplaceAgreementsOperations # type: ignore +from ._creation_supported_operations import CreationSupportedOperations # type: ignore +from ._monitors_operations import MonitorsOperations # type: ignore +from ._operations import Operations # type: ignore +from ._billing_info_operations import BillingInfoOperations # type: ignore +from ._tag_rules_operations import TagRulesOperations # type: ignore +from ._single_sign_on_configurations_operations import SingleSignOnConfigurationsOperations # type: ignore +from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations # 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__ = [ @@ -23,9 +30,10 @@ "CreationSupportedOperations", "MonitorsOperations", "Operations", + "BillingInfoOperations", "TagRulesOperations", "SingleSignOnConfigurationsOperations", "MonitoredSubscriptionsOperations", ] -__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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_billing_info_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_billing_info_operations.py new file mode 100644 index 000000000000..5807f661244f --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_billing_info_operations.py @@ -0,0 +1,111 @@ +# 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 sys +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict +from azure.mgmt.core.exceptions import ARMErrorFormat + +from ... import models as _models +from ...operations._billing_info_operations import build_get_request + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + + +class BillingInfoOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.datadog.aio.MicrosoftDatadogClient`'s + :attr:`billing_info` attribute. + """ + + models = _models + + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace_async + async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.BillingInfoResponse: + """Get marketplace and organization info mapped to the given monitor. + + Get marketplace and organization info mapped to the given monitor. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param monitor_name: Monitor resource name. Required. + :type monitor_name: str + :return: BillingInfoResponse or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.BillingInfoResponse + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.BillingInfoResponse] = kwargs.pop("cls", None) + + _request = build_get_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize("BillingInfoResponse", pipeline_response.http_response) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_creation_supported_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_creation_supported_operations.py index dbbf75f8b416..b1495eea6a47 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_creation_supported_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_creation_supported_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar -import urllib.parse +import sys +from typing import Any, Callable, Dict, Optional, TypeVar -from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -19,17 +17,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.tracing.decorator import distributed_trace +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request from ...operations._creation_supported_operations import 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]] @@ -53,10 +52,8 @@ def __init__(self, *args, **kwargs) -> None: self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") - @distributed_trace - def list( - self, datadog_organization_id: str, **kwargs: Any - ) -> AsyncIterable["_models.CreateResourceSupportedResponse"]: + @distributed_trace_async + async def list(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateResourceSupportedResponse: """Informs if the current subscription is being already monitored for selected Datadog organization. @@ -65,20 +62,11 @@ def list( :param datadog_organization_id: Datadog Organization Id. Required. :type datadog_organization_id: str - :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either CreateResourceSupportedResponse or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.CreateResourceSupportedResponse] + :return: CreateResourceSupportedResponse or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.CreateResourceSupportedResponse :raises ~azure.core.exceptions.HttpResponseError: """ - _headers = kwargs.pop("headers", {}) or {} - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[_models.CreateResourceSupportedResponseList] = kwargs.pop("cls", None) - - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -86,64 +74,39 @@ def list( } error_map.update(kwargs.pop("error_map", {}) or {}) - def prepare_request(next_link=None): - if not next_link: - - request = build_list_request( - subscription_id=self._config.subscription_id, - datadog_organization_id=datadog_organization_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) - - else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request - - async def extract_data(pipeline_response): - deserialized = self._deserialize("CreateResourceSupportedResponseList", pipeline_response) - list_of_elem = deserialized.value - if cls: - list_of_elem = cls(list_of_elem) # type: ignore - return None, AsyncList(list_of_elem) - - async def get_next(next_link=None): - request = prepare_request(next_link) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs - ) - response = pipeline_response.http_response - - if response.status_code not in [200]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - return pipeline_response - - return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/subscriptionStatuses"} + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.CreateResourceSupportedResponse] = kwargs.pop("cls", None) + + _request = build_list_request( + subscription_id=self._config.subscription_id, + datadog_organization_id=datadog_organization_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize("CreateResourceSupportedResponse", pipeline_response.http_response) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore @distributed_trace_async async def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateResourceSupportedResponse: @@ -155,12 +118,11 @@ async def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.Crea :param datadog_organization_id: Datadog Organization Id. Required. :type datadog_organization_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CreateResourceSupportedResponse or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.CreateResourceSupportedResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -174,20 +136,18 @@ async def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.Crea api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CreateResourceSupportedResponse] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( subscription_id=self._config.subscription_id, datadog_organization_id=datadog_organization_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 @@ -197,11 +157,9 @@ async def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.Crea error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CreateResourceSupportedResponse", pipeline_response) + deserialized = self._deserialize("CreateResourceSupportedResponse", 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}/providers/Microsoft.Datadog/subscriptionStatuses/default"} + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_marketplace_agreements_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_marketplace_agreements_operations.py index f5e01a5817c8..e501fe50c467 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_marketplace_agreements_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_marketplace_agreements_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase +import sys from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse @@ -20,17 +20,19 @@ 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.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request from ...operations._marketplace_agreements_operations import build_create_or_update_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]] @@ -60,7 +62,6 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogAgreementResource List Datadog marketplace agreements in the subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DatadogAgreementResource or the result of cls(response) :rtype: @@ -73,7 +74,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogAgreementResource api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogAgreementResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -84,15 +85,13 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogAgreementResource def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -104,13 +103,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("DatadogAgreementResourceListResponse", pipeline_response) @@ -120,11 +118,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 @@ -137,8 +135,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements"} - @overload async def create_or_update( self, @@ -156,7 +152,6 @@ async def 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 :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: @@ -164,18 +159,17 @@ async def create_or_update( @overload async def create_or_update( - self, body: Optional[IO] = None, *, content_type: str = "application/json", **kwargs: Any + self, body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> _models.DatadogAgreementResource: """Create Datadog marketplace agreement in the subscription. Create Datadog marketplace agreement in the subscription. :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: @@ -183,23 +177,20 @@ async def create_or_update( @distributed_trace_async async def create_or_update( - self, body: Optional[Union[_models.DatadogAgreementResource, IO]] = None, **kwargs: Any + self, body: Optional[Union[_models.DatadogAgreementResource, IO[bytes]]] = None, **kwargs: Any ) -> _models.DatadogAgreementResource: """Create Datadog marketplace agreement in the subscription. Create Datadog marketplace agreement in the subscription. - :param body: Is either a DatadogAgreementResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogAgreementResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a DatadogAgreementResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogAgreementResource or IO[bytes] :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -225,22 +216,20 @@ async def create_or_update( else: _json = None - request = build_create_or_update_request( + _request = build_create_or_update_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.create_or_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 @@ -250,13 +239,9 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogAgreementResource", pipeline_response) + deserialized = self._deserialize("DatadogAgreementResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements/default" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitored_subscriptions_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitored_subscriptions_operations.py index 89a14f086ceb..819b9f02091a 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitored_subscriptions_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitored_subscriptions_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,30 +6,28 @@ # 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 urllib.parse +import sys +from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload -from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, 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.tracing.decorator import distributed_trace +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._monitored_subscriptions_operations import ( build_createor_update_request, build_delete_request, @@ -39,6 +36,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]] @@ -62,10 +63,10 @@ def __init__(self, *args, **kwargs) -> None: self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") - @distributed_trace - def list( + @distributed_trace_async + async def list( self, resource_group_name: str, monitor_name: str, **kwargs: Any - ) -> AsyncIterable["_models.MonitoredSubscriptionProperties"]: + ) -> _models.MonitoredSubscriptionProperties: """List the subscriptions currently being monitored by the Datadog monitor resource. List the subscriptions currently being monitored by the Datadog monitor resource. @@ -75,20 +76,11 @@ 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 MonitoredSubscriptionProperties or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.MonitoredSubscriptionProperties] + :return: MonitoredSubscriptionProperties or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - _headers = kwargs.pop("headers", {}) or {} - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[_models.MonitoredSubscriptionPropertiesList] = kwargs.pop("cls", None) - - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -96,67 +88,40 @@ def list( } error_map.update(kwargs.pop("error_map", {}) or {}) - def prepare_request(next_link=None): - if not next_link: - - request = build_list_request( - resource_group_name=resource_group_name, - 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) + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request - - async def extract_data(pipeline_response): - deserialized = self._deserialize("MonitoredSubscriptionPropertiesList", pipeline_response) - list_of_elem = deserialized.value - if cls: - list_of_elem = cls(list_of_elem) # type: ignore - return None, AsyncList(list_of_elem) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.MonitoredSubscriptionProperties] = kwargs.pop("cls", None) - async def get_next(next_link=None): - request = prepare_request(next_link) + _request = build_list_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs - ) - response = pipeline_response.http_response + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) - if response.status_code not in [200]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + response = pipeline_response.http_response - return pipeline_response + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - return AsyncItemPaged(get_next, extract_data) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions" - } + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore @distributed_trace_async async def get( @@ -173,12 +138,11 @@ async def get( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoredSubscriptionProperties or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -192,22 +156,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoredSubscriptionProperties] = 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 @@ -217,26 +179,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("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", 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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore async def _createor_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> Optional[_models.MonitoredSubscriptionProperties]: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -249,7 +207,7 @@ async def _createor_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[Optional[_models.MonitoredSubscriptionProperties]] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -262,7 +220,7 @@ async def _createor_update_initial( else: _json = None - request = build_createor_update_request( + _request = build_createor_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -271,40 +229,34 @@ async def _createor_update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._createor_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, 202]: + 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 = None - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - _createor_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload async def begin_createor_update( @@ -333,14 +285,6 @@ async def begin_createor_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 MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -354,7 +298,7 @@ async def begin_createor_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -371,18 +315,10 @@ async def begin_createor_update( :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -396,7 +332,7 @@ async def begin_createor_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any ) -> AsyncLROPoller[_models.MonitoredSubscriptionProperties]: """Add the subscriptions that should be monitored by the Datadog monitor resource. @@ -410,20 +346,9 @@ async def begin_createor_update( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a MonitoredSubscriptionProperties type or a IO[bytes] type. Default + value is None. + :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO[bytes] :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -452,12 +377,13 @@ async def begin_createor_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("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -467,27 +393,25 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.MonitoredSubscriptionProperties].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_createor_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return AsyncLROPoller[_models.MonitoredSubscriptionProperties]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) async def _update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> Optional[_models.MonitoredSubscriptionProperties]: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -500,7 +424,7 @@ async def _update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[Optional[_models.MonitoredSubscriptionProperties]] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -513,7 +437,7 @@ async def _update_initial( else: _json = None - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -522,37 +446,34 @@ async def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202]: + 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 = None - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload async def begin_update( @@ -581,14 +502,6 @@ async def begin_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -602,7 +515,7 @@ async def begin_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -619,18 +532,10 @@ async def begin_update( :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -644,7 +549,7 @@ async def begin_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any ) -> AsyncLROPoller[_models.MonitoredSubscriptionProperties]: """Updates the subscriptions that are being monitored by the Datadog monitor resource. @@ -658,20 +563,9 @@ async def begin_update( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a MonitoredSubscriptionProperties type or a IO[bytes] type. Default + value is None. + :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO[bytes] :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -700,12 +594,13 @@ async def begin_update( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -715,22 +610,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.MonitoredSubscriptionProperties].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return AsyncLROPoller[_models.MonitoredSubscriptionProperties]( + 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, configuration_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -742,39 +635,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, configuration_name=configuration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -791,14 +687,6 @@ async def begin_delete( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -812,7 +700,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, configuration_name=configuration_name, @@ -822,11 +710,12 @@ async def begin_delete( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) @@ -835,14 +724,10 @@ 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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitors_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitors_operations.py index b253930c9131..c8e5cb92631c 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_monitors_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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_request, build_delete_request, @@ -47,6 +48,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]] @@ -83,7 +88,6 @@ def list_api_keys( :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 DatadogApiKey or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.DatadogApiKey] :raises ~azure.core.exceptions.HttpResponseError: @@ -94,7 +98,7 @@ def list_api_keys( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogApiKeyListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -105,17 +109,15 @@ def list_api_keys( def prepare_request(next_link=None): if not next_link: - request = build_list_api_keys_request( + _request = build_list_api_keys_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_api_keys.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 @@ -127,13 +129,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("DatadogApiKeyListResponse", pipeline_response) @@ -143,11 +144,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 @@ -160,10 +161,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_api_keys.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listApiKeys" - } - @distributed_trace_async async def get_default_key( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -177,12 +174,11 @@ async def get_default_key( :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: DatadogApiKey or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogApiKey :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -196,21 +192,19 @@ async def get_default_key( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogApiKey] = kwargs.pop("cls", None) - request = build_get_default_key_request( + _request = build_get_default_key_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_default_key.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 @@ -220,19 +214,15 @@ async def get_default_key( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogApiKey", pipeline_response) + deserialized = self._deserialize("DatadogApiKey", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_default_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/getDefaultKey" - } + return deserialized # type: ignore @overload - async def set_default_key( # pylint: disable=inconsistent-return-statements + async def set_default_key( self, resource_group_name: str, monitor_name: str, @@ -255,18 +245,17 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements :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: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @overload - async def set_default_key( # pylint: disable=inconsistent-return-statements + async def set_default_key( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -281,22 +270,21 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @distributed_trace_async - async def set_default_key( # pylint: disable=inconsistent-return-statements + async def set_default_key( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogApiKey, IO]] = None, + body: Optional[Union[_models.DatadogApiKey, IO[bytes]]] = None, **kwargs: Any ) -> None: """Set the default api key. @@ -308,17 +296,13 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogApiKey type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogApiKey or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a DatadogApiKey type or a IO[bytes] type. Default value is None. + :type body: ~azure.mgmt.datadog.models.DatadogApiKey or IO[bytes] :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -344,7 +328,7 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements else: _json = None - request = build_set_default_key_request( + _request = build_set_default_key_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -352,16 +336,14 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements content_type=content_type, json=_json, content=_content, - template_url=self.set_default_key.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 @@ -372,11 +354,7 @@ async def set_default_key( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - set_default_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/setDefaultKey" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def list_hosts( @@ -391,7 +369,6 @@ def list_hosts( :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 DatadogHost or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.DatadogHost] :raises ~azure.core.exceptions.HttpResponseError: @@ -402,7 +379,7 @@ def list_hosts( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogHostListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -413,17 +390,15 @@ def list_hosts( 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 @@ -435,13 +410,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("DatadogHostListResponse", pipeline_response) @@ -451,11 +425,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 @@ -468,10 +442,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listHosts" - } - @distributed_trace def list_linked_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -485,7 +455,6 @@ def list_linked_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 LinkedResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.LinkedResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -496,7 +465,7 @@ def list_linked_resources( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.LinkedResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -507,17 +476,15 @@ def list_linked_resources( def prepare_request(next_link=None): if not next_link: - request = build_list_linked_resources_request( + _request = build_list_linked_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_linked_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 @@ -529,13 +496,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("LinkedResourceListResponse", pipeline_response) @@ -545,11 +511,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 @@ -562,10 +528,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_linked_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listLinkedResources" - } - @distributed_trace def list_monitored_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -579,7 +541,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.datadog.models.MonitoredResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -590,7 +551,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, @@ -601,17 +562,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 @@ -623,13 +582,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) @@ -639,11 +597,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 @@ -656,17 +614,12 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listMonitoredResources" - } - @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogMonitorResource"]: """List all monitors under the specified subscription. List all monitors under the specified subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DatadogMonitorResource or the result of cls(response) :rtype: @@ -679,7 +632,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogMonitorResource"] api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogMonitorResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -690,15 +643,13 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DatadogMonitorResource"] def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -710,13 +661,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("DatadogMonitorResourceListResponse", pipeline_response) @@ -726,11 +676,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 @@ -743,8 +693,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/monitors"} - @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any @@ -756,7 +704,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 DatadogMonitorResource or the result of cls(response) :rtype: @@ -769,7 +716,7 @@ def list_by_resource_group( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogMonitorResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -780,16 +727,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 @@ -801,13 +746,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("DatadogMonitorResourceListResponse", pipeline_response) @@ -817,11 +761,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 @@ -834,10 +778,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/Microsoft.Datadog/monitors" - } - @distributed_trace_async async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.DatadogMonitorResource: """Get the properties of a specific monitor resource. @@ -849,12 +789,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: DatadogMonitorResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogMonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -868,21 +807,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.DatadogMonitorResource] = 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 @@ -892,25 +829,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("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", 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/Microsoft.Datadog/monitors/{monitorName}" - } + return deserialized # type: ignore async def _create_initial( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResource, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResource, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogMonitorResource: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -923,7 +856,7 @@ async def _create_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.DatadogMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -936,7 +869,7 @@ async def _create_initial( else: _json = None - request = build_create_request( + _request = build_create_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -944,40 +877,35 @@ async def _create_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_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("DatadogMonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogMonitorResource", 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_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } - @overload async def begin_create( self, @@ -1002,14 +930,6 @@ async def begin_create( :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 DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1021,7 +941,7 @@ async def begin_create( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1036,18 +956,10 @@ async def begin_create( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1059,7 +971,7 @@ async def begin_create( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResource, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResource, IO[bytes]]] = None, **kwargs: Any ) -> AsyncLROPoller[_models.DatadogMonitorResource]: """Create a monitor resource. @@ -1071,19 +983,9 @@ async def begin_create( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogMonitorResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogMonitorResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a DatadogMonitorResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogMonitorResource or IO[bytes] :return: An instance of AsyncLROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1110,12 +1012,13 @@ async def begin_create( 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("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1128,26 +1031,24 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.DatadogMonitorResource].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.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } + return AsyncLROPoller[_models.DatadogMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) async def _update_initial( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogMonitorResource: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1160,7 +1061,7 @@ async def _update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.DatadogMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -1173,7 +1074,7 @@ async def _update_initial( else: _json = None - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1181,40 +1082,35 @@ async def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } - @overload async def begin_update( self, @@ -1239,14 +1135,6 @@ async def begin_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1258,7 +1146,7 @@ async def begin_update( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1273,18 +1161,10 @@ async def begin_update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1296,7 +1176,7 @@ async def begin_update( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO[bytes]]] = None, **kwargs: Any ) -> AsyncLROPoller[_models.DatadogMonitorResource]: """Update a monitor resource. @@ -1308,20 +1188,9 @@ async def begin_update( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogMonitorResourceUpdateParameters type or a IO type. Default - value is None. - :type body: ~azure.mgmt.datadog.models.DatadogMonitorResourceUpdateParameters or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + :param body: Is either a DatadogMonitorResourceUpdateParameters type or a IO[bytes] type. 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. + :type body: ~azure.mgmt.datadog.models.DatadogMonitorResourceUpdateParameters or IO[bytes] :return: An instance of AsyncLROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1348,12 +1217,13 @@ async def begin_update( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1363,22 +1233,18 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.DatadogMonitorResource].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } + return AsyncLROPoller[_models.DatadogMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # 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, @@ -1390,38 +1256,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/Microsoft.Datadog/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]: @@ -1434,14 +1303,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: @@ -1455,7 +1316,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, @@ -1464,11 +1325,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(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) @@ -1477,17 +1339,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/Microsoft.Datadog/monitors/{monitorName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace_async async def refresh_set_password_link( @@ -1502,12 +1360,11 @@ async def refresh_set_password_link( :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: DatadogSetPasswordLink or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogSetPasswordLink :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1521,21 +1378,19 @@ async def refresh_set_password_link( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSetPasswordLink] = kwargs.pop("cls", None) - request = build_refresh_set_password_link_request( + _request = build_refresh_set_password_link_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.refresh_set_password_link.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 @@ -1545,13 +1400,9 @@ async def refresh_set_password_link( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogSetPasswordLink", pipeline_response) + deserialized = self._deserialize("DatadogSetPasswordLink", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - refresh_set_password_link.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/refreshSetPasswordLink" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_operations.py index 9a06c2037d3e..22959b98f3a1 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,6 +5,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse @@ -19,16 +19,18 @@ map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request from ...operations._operations import build_list_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,11 +56,10 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]: - """List all operations provided by Microsoft.Datadog for the 2023-01-01 api version. + """List all operations provided by Microsoft.Datadog for the 2023-10-20 api version. - List all operations provided by Microsoft.Datadog for the 2023-01-01 api version. + List all operations provided by Microsoft.Datadog for the 2023-10-20 api version. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OperationResult or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.OperationResult] :raises ~azure.core.exceptions.HttpResponseError: @@ -69,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -80,14 +81,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationResult"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -99,13 +98,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("OperationListResult", pipeline_response) @@ -115,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/Microsoft.Datadog/operations"} diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_single_sign_on_configurations_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_single_sign_on_configurations_operations.py index b9c25fe0604b..b77e94870edb 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_single_sign_on_configurations_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_single_sign_on_configurations_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -17,12 +17,13 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict @@ -30,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_configurations_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]] @@ -73,7 +77,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 DatadogSingleSignOnResource or the result of cls(response) :rtype: @@ -86,7 +89,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSingleSignOnResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -97,17 +100,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 @@ -119,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 async def extract_data(pipeline_response): deserialized = self._deserialize("DatadogSingleSignOnResourceListResponse", pipeline_response) @@ -135,11 +135,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 @@ -152,19 +152,15 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations" - } - async def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.DatadogSingleSignOnResource, IO]] = None, + body: Optional[Union[_models.DatadogSingleSignOnResource, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogSingleSignOnResource: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -177,7 +173,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.DatadogSingleSignOnResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -190,7 +186,7 @@ async def _create_or_update_initial( else: _json = None - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -199,40 +195,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("DatadogSingleSignOnResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogSingleSignOnResource", 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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } - @overload async def begin_create_or_update( self, @@ -260,14 +251,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 DatadogSingleSignOnResource or the result of cls(response) :rtype: @@ -281,7 +264,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -298,18 +281,10 @@ async def begin_create_or_update( :param configuration_name: Configuration name. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either DatadogSingleSignOnResource or the result of cls(response) :rtype: @@ -323,7 +298,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.DatadogSingleSignOnResource, IO]] = None, + body: Optional[Union[_models.DatadogSingleSignOnResource, IO[bytes]]] = None, **kwargs: Any ) -> AsyncLROPoller[_models.DatadogSingleSignOnResource]: """Configures single-sign-on for this resource. @@ -337,19 +312,9 @@ async def begin_create_or_update( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :param body: Is either a DatadogSingleSignOnResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a DatadogSingleSignOnResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource or IO[bytes] :return: An instance of AsyncLROPoller that returns either DatadogSingleSignOnResource or the result of cls(response) :rtype: @@ -378,12 +343,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("DatadogSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DatadogSingleSignOnResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -396,17 +362,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.DatadogSingleSignOnResource].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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return AsyncLROPoller[_models.DatadogSingleSignOnResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace_async async def get( @@ -423,12 +387,11 @@ async def get( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -442,22 +405,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSingleSignOnResource] = 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 @@ -467,13 +428,9 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DatadogSingleSignOnResource", 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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_tag_rules_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_tag_rules_operations.py index 253d800b3dea..de4da201b6f2 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/aio/operations/_tag_rules_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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,6 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase +import sys from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload import urllib.parse @@ -20,17 +20,19 @@ 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.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models -from ..._vendor import _convert_request from ...operations._tag_rules_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]] @@ -67,7 +69,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 MonitoringTagRules or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.datadog.models.MonitoringTagRules] :raises ~azure.core.exceptions.HttpResponseError: @@ -78,7 +79,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoringTagRulesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -89,17 +90,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 @@ -111,13 +110,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("MonitoringTagRulesListResponse", pipeline_response) @@ -127,11 +125,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 @@ -144,10 +142,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/tagRules" - } - @overload async def create_or_update( self, @@ -175,7 +169,6 @@ async def 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 :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: @@ -187,7 +180,7 @@ async def create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -204,11 +197,10 @@ async def create_or_update( :param rule_set_name: Rule set name. Required. :type rule_set_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: @@ -220,7 +212,7 @@ async def create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - body: Optional[Union[_models.MonitoringTagRules, IO]] = None, + body: Optional[Union[_models.MonitoringTagRules, IO[bytes]]] = None, **kwargs: Any ) -> _models.MonitoringTagRules: """Create or update a tag rule set for a given monitor resource. @@ -234,17 +226,13 @@ async def create_or_update( :type monitor_name: str :param rule_set_name: Rule set name. Required. :type rule_set_name: str - :param body: Is either a MonitoringTagRules type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.MonitoringTagRules or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a MonitoringTagRules type or a IO[bytes] type. Default value is None. + :type body: ~azure.mgmt.datadog.models.MonitoringTagRules or IO[bytes] :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -270,7 +258,7 @@ async def create_or_update( else: _json = None - 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, @@ -279,16 +267,14 @@ async def create_or_update( content_type=content_type, json=_json, content=_content, - template_url=self.create_or_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 @@ -298,16 +284,12 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitoringTagRules", pipeline_response) + deserialized = self._deserialize("MonitoringTagRules", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace_async async def get( @@ -324,12 +306,11 @@ async def get( :type monitor_name: str :param rule_set_name: Rule set name. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -343,22 +324,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoringTagRules] = 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 @@ -368,13 +347,9 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitoringTagRules", pipeline_response) + deserialized = self._deserialize("MonitoringTagRules", 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/Microsoft.Datadog/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/__init__.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/__init__.py index 0e0d4530f45a..82211711725e 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/__init__.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/__init__.py @@ -5,73 +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 CreateResourceSupportedProperties -from ._models_py3 import CreateResourceSupportedResponse -from ._models_py3 import CreateResourceSupportedResponseList -from ._models_py3 import DatadogAgreementProperties -from ._models_py3 import DatadogAgreementResource -from ._models_py3 import DatadogAgreementResourceListResponse -from ._models_py3 import DatadogApiKey -from ._models_py3 import DatadogApiKeyListResponse -from ._models_py3 import DatadogHost -from ._models_py3 import DatadogHostListResponse -from ._models_py3 import DatadogHostMetadata -from ._models_py3 import DatadogInstallMethod -from ._models_py3 import DatadogLogsAgent -from ._models_py3 import DatadogMonitorResource -from ._models_py3 import DatadogMonitorResourceListResponse -from ._models_py3 import DatadogMonitorResourceUpdateParameters -from ._models_py3 import DatadogOrganizationProperties -from ._models_py3 import DatadogSetPasswordLink -from ._models_py3 import DatadogSingleSignOnProperties -from ._models_py3 import DatadogSingleSignOnResource -from ._models_py3 import DatadogSingleSignOnResourceListResponse -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 LinkedResource -from ._models_py3 import LinkedResourceListResponse -from ._models_py3 import LogRules -from ._models_py3 import MetricRules -from ._models_py3 import MonitorProperties -from ._models_py3 import MonitorUpdateProperties -from ._models_py3 import MonitoredResource -from ._models_py3 import MonitoredResourceListResponse -from ._models_py3 import MonitoredSubscription -from ._models_py3 import MonitoredSubscriptionProperties -from ._models_py3 import MonitoredSubscriptionPropertiesList -from ._models_py3 import MonitoringTagRules -from ._models_py3 import MonitoringTagRulesListResponse -from ._models_py3 import MonitoringTagRulesProperties -from ._models_py3 import OperationDisplay -from ._models_py3 import OperationListResult -from ._models_py3 import OperationResult -from ._models_py3 import ResourceSku -from ._models_py3 import SubscriptionList -from ._models_py3 import SystemData -from ._models_py3 import UserInfo +from typing import TYPE_CHECKING -from ._microsoft_datadog_client_enums import CreatedByType -from ._microsoft_datadog_client_enums import LiftrResourceCategories -from ._microsoft_datadog_client_enums import ManagedIdentityTypes -from ._microsoft_datadog_client_enums import MarketplaceSubscriptionStatus -from ._microsoft_datadog_client_enums import MonitoringStatus -from ._microsoft_datadog_client_enums import Operation -from ._microsoft_datadog_client_enums import ProvisioningState -from ._microsoft_datadog_client_enums import SingleSignOnStates -from ._microsoft_datadog_client_enums import Status -from ._microsoft_datadog_client_enums import TagAction +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models_py3 import ( # type: ignore + BillingInfoResponse, + CreateResourceSupportedProperties, + CreateResourceSupportedResponse, + DatadogAgreementProperties, + DatadogAgreementResource, + DatadogAgreementResourceListResponse, + DatadogApiKey, + DatadogApiKeyListResponse, + DatadogHost, + DatadogHostListResponse, + DatadogHostMetadata, + DatadogInstallMethod, + DatadogLogsAgent, + DatadogMonitorResource, + DatadogMonitorResourceListResponse, + DatadogMonitorResourceUpdateParameters, + DatadogOrganizationProperties, + DatadogSetPasswordLink, + DatadogSingleSignOnProperties, + DatadogSingleSignOnResource, + DatadogSingleSignOnResourceListResponse, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + FilteringTag, + IdentityProperties, + LinkedResource, + LinkedResourceListResponse, + LogRules, + MarketplaceSaaSInfo, + MetricRules, + MonitorProperties, + MonitorUpdateProperties, + MonitoredResource, + MonitoredResourceListResponse, + MonitoredSubscription, + MonitoredSubscriptionProperties, + MonitoringTagRules, + MonitoringTagRulesListResponse, + MonitoringTagRulesProperties, + OperationDisplay, + OperationListResult, + OperationResult, + PartnerBillingEntity, + ResourceSku, + SubscriptionList, + SystemData, + UserInfo, +) + +from ._microsoft_datadog_client_enums import ( # type: ignore + CreatedByType, + LiftrResourceCategories, + ManagedIdentityTypes, + MarketplaceSubscriptionStatus, + MonitoringStatus, + Operation, + ProvisioningState, + SingleSignOnStates, + Status, + TagAction, +) 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__ = [ + "BillingInfoResponse", "CreateResourceSupportedProperties", "CreateResourceSupportedResponse", - "CreateResourceSupportedResponseList", "DatadogAgreementProperties", "DatadogAgreementResource", "DatadogAgreementResourceListResponse", @@ -98,6 +110,7 @@ "LinkedResource", "LinkedResourceListResponse", "LogRules", + "MarketplaceSaaSInfo", "MetricRules", "MonitorProperties", "MonitorUpdateProperties", @@ -105,13 +118,13 @@ "MonitoredResourceListResponse", "MonitoredSubscription", "MonitoredSubscriptionProperties", - "MonitoredSubscriptionPropertiesList", "MonitoringTagRules", "MonitoringTagRulesListResponse", "MonitoringTagRulesProperties", "OperationDisplay", "OperationListResult", "OperationResult", + "PartnerBillingEntity", "ResourceSku", "SubscriptionList", "SystemData", @@ -127,5 +140,5 @@ "Status", "TagAction", ] -__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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/_models_py3.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/_models_py3.py index ea12bbd8f963..6279a348ac5a 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/models/_models_py3.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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,10 +13,41 @@ from .. import _serialization if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models +class BillingInfoResponse(_serialization.Model): + """Marketplace Subscription and Organization details to which resource gets billed into. + + :ivar marketplace_saas_info: Marketplace Subscription details. + :vartype marketplace_saas_info: ~azure.mgmt.datadog.models.MarketplaceSaaSInfo + :ivar partner_billing_entity: Partner Billing Entity details: Organization Info. + :vartype partner_billing_entity: ~azure.mgmt.datadog.models.PartnerBillingEntity + """ + + _attribute_map = { + "marketplace_saas_info": {"key": "marketplaceSaasInfo", "type": "MarketplaceSaaSInfo"}, + "partner_billing_entity": {"key": "partnerBillingEntity", "type": "PartnerBillingEntity"}, + } + + def __init__( + self, + *, + marketplace_saas_info: Optional["_models.MarketplaceSaaSInfo"] = None, + partner_billing_entity: Optional["_models.PartnerBillingEntity"] = None, + **kwargs: Any + ) -> None: + """ + :keyword marketplace_saas_info: Marketplace Subscription details. + :paramtype marketplace_saas_info: ~azure.mgmt.datadog.models.MarketplaceSaaSInfo + :keyword partner_billing_entity: Partner Billing Entity details: Organization Info. + :paramtype partner_billing_entity: ~azure.mgmt.datadog.models.PartnerBillingEntity + """ + super().__init__(**kwargs) + self.marketplace_saas_info = marketplace_saas_info + self.partner_billing_entity = partner_billing_entity + + class CreateResourceSupportedProperties(_serialization.Model): """Datadog resource can be created or not properties. @@ -69,28 +100,6 @@ def __init__( self.properties = properties -class CreateResourceSupportedResponseList(_serialization.Model): - """CreateResourceSupportedResponseList. - - :ivar value: - :vartype value: list[~azure.mgmt.datadog.models.CreateResourceSupportedResponse] - """ - - _attribute_map = { - "value": {"key": "value", "type": "[CreateResourceSupportedResponse]"}, - } - - def __init__( - self, *, value: Optional[List["_models.CreateResourceSupportedResponse"]] = None, **kwargs: Any - ) -> None: - """ - :keyword value: - :paramtype value: list[~azure.mgmt.datadog.models.CreateResourceSupportedResponse] - """ - super().__init__(**kwargs) - self.value = value - - class DatadogAgreementProperties(_serialization.Model): """Terms properties. @@ -247,7 +256,7 @@ def __init__( class DatadogApiKey(_serialization.Model): """DatadogApiKey. - 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 created_by: The user that created the API key. :vartype created_by: str @@ -501,7 +510,7 @@ class DatadogMonitorResource(_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 id: ARM id of the monitor resource. :vartype id: str @@ -776,7 +785,6 @@ class DatadogSingleSignOnProperties(_serialization.Model): """ _validation = { - "provisioning_state": {"readonly": True}, "single_sign_on_url": {"readonly": True}, } @@ -790,11 +798,15 @@ class DatadogSingleSignOnProperties(_serialization.Model): def __init__( self, *, + provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None, single_sign_on_state: Optional[Union[str, "_models.SingleSignOnStates"]] = None, enterprise_app_id: Optional[str] = None, **kwargs: Any ) -> None: """ + :keyword provisioning_state: Known values are: "Accepted", "Creating", "Updating", "Deleting", + "Succeeded", "Failed", "Canceled", "Deleted", and "NotSpecified". + :paramtype provisioning_state: str or ~azure.mgmt.datadog.models.ProvisioningState :keyword single_sign_on_state: Various states of the SSO resource. Known values are: "Initial", "Enable", "Disable", and "Existing". :paramtype single_sign_on_state: str or ~azure.mgmt.datadog.models.SingleSignOnStates @@ -802,7 +814,7 @@ def __init__( :paramtype enterprise_app_id: str """ super().__init__(**kwargs) - self.provisioning_state = None + self.provisioning_state = provisioning_state self.single_sign_on_state = single_sign_on_state self.enterprise_app_id = enterprise_app_id self.single_sign_on_url = None @@ -1061,19 +1073,31 @@ class LinkedResource(_serialization.Model): :ivar id: The ARM id of the linked resource. :vartype id: str + :ivar location: The location of the linked resource. + :vartype location: str """ _attribute_map = { "id": {"key": "id", "type": "str"}, + "location": {"key": "location", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin + def __init__( + self, + *, + id: Optional[str] = None, # pylint: disable=redefined-builtin + location: Optional[str] = None, + **kwargs: Any + ) -> None: """ :keyword id: The ARM id of the linked resource. :paramtype id: str + :keyword location: The location of the linked resource. + :paramtype location: str """ super().__init__(**kwargs) self.id = id + self.location = location class LinkedResourceListResponse(_serialization.Model): @@ -1160,6 +1184,63 @@ def __init__( self.filtering_tags = filtering_tags +class MarketplaceSaaSInfo(_serialization.Model): + """Marketplace SAAS Info of the resource. + + :ivar marketplace_subscription_id: Marketplace Subscription Id. This is a GUID-formatted + string. + :vartype marketplace_subscription_id: str + :ivar marketplace_name: Marketplace Subscription Details: SAAS Name. + :vartype marketplace_name: str + :ivar marketplace_status: Marketplace Subscription Details: SaaS Subscription Status. + :vartype marketplace_status: str + :ivar billed_azure_subscription_id: The Azure Subscription ID to which the Marketplace + Subscription belongs and gets billed into. + :vartype billed_azure_subscription_id: str + :ivar subscribed: Flag specifying if the Marketplace status is subscribed or not. + :vartype subscribed: bool + """ + + _attribute_map = { + "marketplace_subscription_id": {"key": "marketplaceSubscriptionId", "type": "str"}, + "marketplace_name": {"key": "marketplaceName", "type": "str"}, + "marketplace_status": {"key": "marketplaceStatus", "type": "str"}, + "billed_azure_subscription_id": {"key": "billedAzureSubscriptionId", "type": "str"}, + "subscribed": {"key": "subscribed", "type": "bool"}, + } + + def __init__( + self, + *, + marketplace_subscription_id: Optional[str] = None, + marketplace_name: Optional[str] = None, + marketplace_status: Optional[str] = None, + billed_azure_subscription_id: Optional[str] = None, + subscribed: Optional[bool] = None, + **kwargs: Any + ) -> None: + """ + :keyword marketplace_subscription_id: Marketplace Subscription Id. This is a GUID-formatted + string. + :paramtype marketplace_subscription_id: str + :keyword marketplace_name: Marketplace Subscription Details: SAAS Name. + :paramtype marketplace_name: str + :keyword marketplace_status: Marketplace Subscription Details: SaaS Subscription Status. + :paramtype marketplace_status: str + :keyword billed_azure_subscription_id: The Azure Subscription ID to which the Marketplace + Subscription belongs and gets billed into. + :paramtype billed_azure_subscription_id: str + :keyword subscribed: Flag specifying if the Marketplace status is subscribed or not. + :paramtype subscribed: bool + """ + super().__init__(**kwargs) + self.marketplace_subscription_id = marketplace_subscription_id + self.marketplace_name = marketplace_name + self.marketplace_status = marketplace_status + self.billed_azure_subscription_id = billed_azure_subscription_id + self.subscribed = subscribed + + class MetricRules(_serialization.Model): """Set of rules for sending metrics for the Monitor resource. @@ -1365,28 +1446,6 @@ def __init__(self, *, properties: Optional["_models.SubscriptionList"] = None, * self.properties = properties -class MonitoredSubscriptionPropertiesList(_serialization.Model): - """MonitoredSubscriptionPropertiesList. - - :ivar value: - :vartype value: list[~azure.mgmt.datadog.models.MonitoredSubscriptionProperties] - """ - - _attribute_map = { - "value": {"key": "value", "type": "[MonitoredSubscriptionProperties]"}, - } - - def __init__( - self, *, value: Optional[List["_models.MonitoredSubscriptionProperties"]] = None, **kwargs: Any - ) -> None: - """ - :keyword value: - :paramtype value: list[~azure.mgmt.datadog.models.MonitoredSubscriptionProperties] - """ - super().__init__(**kwargs) - self.value = value - - class MonitoringTagRules(_serialization.Model): """Capture logs and metrics of Azure resources based on ARM tags. @@ -1467,8 +1526,6 @@ def __init__( class MonitoringTagRulesProperties(_serialization.Model): """Definition of the properties for a TagRules resource. - Variables are only populated by the server, and will be ignored when sending a request. - :ivar provisioning_state: Known values are: "Accepted", "Creating", "Updating", "Deleting", "Succeeded", "Failed", "Canceled", "Deleted", and "NotSpecified". :vartype provisioning_state: str or ~azure.mgmt.datadog.models.ProvisioningState @@ -1478,40 +1535,49 @@ class MonitoringTagRulesProperties(_serialization.Model): :vartype metric_rules: ~azure.mgmt.datadog.models.MetricRules :ivar automuting: Configuration to enable/disable auto-muting flag. :vartype automuting: bool + :ivar custom_metrics: Configuration to enable/disable custom metrics. If enabled, custom + metrics from app insights will be sent. + :vartype custom_metrics: bool """ - _validation = { - "provisioning_state": {"readonly": True}, - } - _attribute_map = { "provisioning_state": {"key": "provisioningState", "type": "str"}, "log_rules": {"key": "logRules", "type": "LogRules"}, "metric_rules": {"key": "metricRules", "type": "MetricRules"}, "automuting": {"key": "automuting", "type": "bool"}, + "custom_metrics": {"key": "customMetrics", "type": "bool"}, } def __init__( self, *, + provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None, log_rules: Optional["_models.LogRules"] = None, metric_rules: Optional["_models.MetricRules"] = None, automuting: Optional[bool] = None, + custom_metrics: Optional[bool] = None, **kwargs: Any ) -> None: """ + :keyword provisioning_state: Known values are: "Accepted", "Creating", "Updating", "Deleting", + "Succeeded", "Failed", "Canceled", "Deleted", and "NotSpecified". + :paramtype provisioning_state: str or ~azure.mgmt.datadog.models.ProvisioningState :keyword log_rules: Set of rules for sending logs for the Monitor resource. :paramtype log_rules: ~azure.mgmt.datadog.models.LogRules :keyword metric_rules: Set of rules for sending metrics for the Monitor resource. :paramtype metric_rules: ~azure.mgmt.datadog.models.MetricRules :keyword automuting: Configuration to enable/disable auto-muting flag. :paramtype automuting: bool + :keyword custom_metrics: Configuration to enable/disable custom metrics. If enabled, custom + metrics from app insights will be sent. + :paramtype custom_metrics: bool """ super().__init__(**kwargs) - self.provisioning_state = None + self.provisioning_state = provisioning_state self.log_rules = log_rules self.metric_rules = metric_rules self.automuting = automuting + self.custom_metrics = custom_metrics class MonitorProperties(_serialization.Model): @@ -1544,7 +1610,6 @@ class MonitorProperties(_serialization.Model): """ _validation = { - "provisioning_state": {"readonly": True}, "marketplace_subscription_status": {"readonly": True}, "liftr_resource_category": {"readonly": True}, "liftr_resource_preference": {"readonly": True}, @@ -1566,12 +1631,16 @@ class MonitorProperties(_serialization.Model): def __init__( self, *, + provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None, monitoring_status: Union[str, "_models.MonitoringStatus"] = "Enabled", datadog_organization_properties: Optional["_models.DatadogOrganizationProperties"] = None, user_info: Optional["_models.UserInfo"] = None, **kwargs: Any ) -> None: """ + :keyword provisioning_state: Known values are: "Accepted", "Creating", "Updating", "Deleting", + "Succeeded", "Failed", "Canceled", "Deleted", and "NotSpecified". + :paramtype provisioning_state: str or ~azure.mgmt.datadog.models.ProvisioningState :keyword monitoring_status: Flag specifying if the resource monitoring is enabled or disabled. Known values are: "Enabled" and "Disabled". :paramtype monitoring_status: str or ~azure.mgmt.datadog.models.MonitoringStatus @@ -1584,7 +1653,7 @@ def __init__( :paramtype user_info: ~azure.mgmt.datadog.models.UserInfo """ super().__init__(**kwargs) - self.provisioning_state = None + self.provisioning_state = provisioning_state self.monitoring_status = monitoring_status self.marketplace_subscription_status = None self.datadog_organization_properties = datadog_organization_properties @@ -1744,13 +1813,52 @@ def __init__( self.is_data_action = is_data_action +class PartnerBillingEntity(_serialization.Model): + """Partner Billing details associated with the resource. + + :ivar id: The Datadog Organization Id. + :vartype id: str + :ivar name: The Datadog Organization Name. + :vartype name: str + :ivar partner_entity_uri: Link to the datadog organization page. + :vartype partner_entity_uri: str + """ + + _attribute_map = { + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "partner_entity_uri": {"key": "partnerEntityUri", "type": "str"}, + } + + def __init__( + self, + *, + id: Optional[str] = None, # pylint: disable=redefined-builtin + name: Optional[str] = None, + partner_entity_uri: Optional[str] = None, + **kwargs: Any + ) -> None: + """ + :keyword id: The Datadog Organization Id. + :paramtype id: str + :keyword name: The Datadog Organization Name. + :paramtype name: str + :keyword partner_entity_uri: Link to the datadog organization page. + :paramtype partner_entity_uri: str + """ + super().__init__(**kwargs) + self.id = id + self.name = name + self.partner_entity_uri = partner_entity_uri + + class ResourceSku(_serialization.Model): """ResourceSku. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar name: Name of the SKU in {PlanId} format. For Terraform, the only allowed value is - 'linking'. Required. + 'Linked'. Required. :vartype name: str """ @@ -1765,7 +1873,7 @@ class ResourceSku(_serialization.Model): def __init__(self, *, name: str, **kwargs: Any) -> None: """ :keyword name: Name of the SKU in {PlanId} format. For Terraform, the only allowed value is - 'linking'. Required. + 'Linked'. Required. :paramtype name: str """ super().__init__(**kwargs) diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/__init__.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/__init__.py index 8370b25c3643..661b9ecc8bec 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/__init__.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/__init__.py @@ -5,17 +5,24 @@ # 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 ._marketplace_agreements_operations import MarketplaceAgreementsOperations -from ._creation_supported_operations import CreationSupportedOperations -from ._monitors_operations import MonitorsOperations -from ._operations import Operations -from ._tag_rules_operations import TagRulesOperations -from ._single_sign_on_configurations_operations import SingleSignOnConfigurationsOperations -from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._marketplace_agreements_operations import MarketplaceAgreementsOperations # type: ignore +from ._creation_supported_operations import CreationSupportedOperations # type: ignore +from ._monitors_operations import MonitorsOperations # type: ignore +from ._operations import Operations # type: ignore +from ._billing_info_operations import BillingInfoOperations # type: ignore +from ._tag_rules_operations import TagRulesOperations # type: ignore +from ._single_sign_on_configurations_operations import SingleSignOnConfigurationsOperations # type: ignore +from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations # 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__ = [ @@ -23,9 +30,10 @@ "CreationSupportedOperations", "MonitorsOperations", "Operations", + "BillingInfoOperations", "TagRulesOperations", "SingleSignOnConfigurationsOperations", "MonitoredSubscriptionsOperations", ] -__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/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_billing_info_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_billing_info_operations.py new file mode 100644 index 000000000000..a9bc31ee20fc --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_billing_info_operations.py @@ -0,0 +1,145 @@ +# 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 sys +from typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) +from azure.core.pipeline import PipelineResponse +from azure.core.rest import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict +from azure.mgmt.core.exceptions import ARMErrorFormat + +from .. import models as _models +from .._serialization import Serializer + +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore +T = TypeVar("T") +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + + +def build_get_request(resource_group_name: str, monitor_name: str, subscription_id: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/getBillingInfo", + ) # pylint: disable=line-too-long + path_format_arguments = { + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "monitorName": _SERIALIZER.url("monitor_name", monitor_name, "str"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct parameters + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") + + # Construct headers + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +class BillingInfoOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.datadog.MicrosoftDatadogClient`'s + :attr:`billing_info` attribute. + """ + + models = _models + + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + + @distributed_trace + def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.BillingInfoResponse: + """Get marketplace and organization info mapped to the given monitor. + + Get marketplace and organization info mapped to the given monitor. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param monitor_name: Monitor resource name. Required. + :type monitor_name: str + :return: BillingInfoResponse or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.BillingInfoResponse + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.BillingInfoResponse] = kwargs.pop("cls", None) + + _request = build_get_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize("BillingInfoResponse", pipeline_response.http_response) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_creation_supported_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_creation_supported_operations.py index a0e0768bfebf..9f1fa5cd2e23 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_creation_supported_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_creation_supported_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,8 +5,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar -import urllib.parse +import sys +from typing import Any, Callable, Dict, Optional, TypeVar from azure.core.exceptions import ( ClientAuthenticationError, @@ -17,18 +16,19 @@ ResourceNotModifiedError, map_error, ) -from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -40,7 +40,7 @@ def build_list_request(subscription_id: str, *, datadog_organization_id: str, ** _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -67,7 +67,7 @@ def build_get_request(subscription_id: str, *, datadog_organization_id: str, **k _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs): self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list(self, datadog_organization_id: str, **kwargs: Any) -> Iterable["_models.CreateResourceSupportedResponse"]: + def list(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateResourceSupportedResponse: """Informs if the current subscription is being already monitored for selected Datadog organization. @@ -119,20 +119,11 @@ def list(self, datadog_organization_id: str, **kwargs: Any) -> Iterable["_models :param datadog_organization_id: Datadog Organization Id. Required. :type datadog_organization_id: str - :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either CreateResourceSupportedResponse or the result of - cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.CreateResourceSupportedResponse] + :return: CreateResourceSupportedResponse or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.CreateResourceSupportedResponse :raises ~azure.core.exceptions.HttpResponseError: """ - _headers = kwargs.pop("headers", {}) or {} - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[_models.CreateResourceSupportedResponseList] = kwargs.pop("cls", None) - - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -140,64 +131,39 @@ def list(self, datadog_organization_id: str, **kwargs: Any) -> Iterable["_models } error_map.update(kwargs.pop("error_map", {}) or {}) - def prepare_request(next_link=None): - if not next_link: - - request = build_list_request( - subscription_id=self._config.subscription_id, - datadog_organization_id=datadog_organization_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) - - else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request - - def extract_data(pipeline_response): - deserialized = self._deserialize("CreateResourceSupportedResponseList", pipeline_response) - list_of_elem = deserialized.value - if cls: - list_of_elem = cls(list_of_elem) # type: ignore - return None, iter(list_of_elem) - - def get_next(next_link=None): - request = prepare_request(next_link) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs - ) - response = pipeline_response.http_response - - if response.status_code not in [200]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - return pipeline_response - - return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/subscriptionStatuses"} + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.CreateResourceSupportedResponse] = kwargs.pop("cls", None) + + _request = build_list_request( + subscription_id=self._config.subscription_id, + datadog_organization_id=datadog_organization_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) + + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize("CreateResourceSupportedResponse", pipeline_response.http_response) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore @distributed_trace def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateResourceSupportedResponse: @@ -209,12 +175,11 @@ def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateReso :param datadog_organization_id: Datadog Organization Id. Required. :type datadog_organization_id: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: CreateResourceSupportedResponse or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.CreateResourceSupportedResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -228,20 +193,18 @@ def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateReso api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.CreateResourceSupportedResponse] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( subscription_id=self._config.subscription_id, datadog_organization_id=datadog_organization_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,11 +214,9 @@ def get(self, datadog_organization_id: str, **kwargs: Any) -> _models.CreateReso error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("CreateResourceSupportedResponse", pipeline_response) + deserialized = self._deserialize("CreateResourceSupportedResponse", 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}/providers/Microsoft.Datadog/subscriptionStatuses/default"} + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_marketplace_agreements_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_marketplace_agreements_operations.py index 5797d7b1bb7a..502ef56efba5 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_marketplace_agreements_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_marketplace_agreements_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase +import sys from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse @@ -20,16 +20,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]] @@ -41,7 +43,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -65,7 +67,7 @@ def build_create_or_update_request(subscription_id: str, **kwargs: Any) -> HttpR _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -113,7 +115,6 @@ def list(self, **kwargs: Any) -> Iterable["_models.DatadogAgreementResource"]: List Datadog marketplace agreements in the subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DatadogAgreementResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogAgreementResource] @@ -125,7 +126,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DatadogAgreementResource"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogAgreementResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -136,15 +137,13 @@ def list(self, **kwargs: Any) -> Iterable["_models.DatadogAgreementResource"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -156,13 +155,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("DatadogAgreementResourceListResponse", pipeline_response) @@ -172,11 +170,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 @@ -189,8 +187,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements"} - @overload def create_or_update( self, @@ -208,7 +204,6 @@ def 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 :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: @@ -216,18 +211,17 @@ def create_or_update( @overload def create_or_update( - self, body: Optional[IO] = None, *, content_type: str = "application/json", **kwargs: Any + self, body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> _models.DatadogAgreementResource: """Create Datadog marketplace agreement in the subscription. Create Datadog marketplace agreement in the subscription. :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: @@ -235,23 +229,20 @@ def create_or_update( @distributed_trace def create_or_update( - self, body: Optional[Union[_models.DatadogAgreementResource, IO]] = None, **kwargs: Any + self, body: Optional[Union[_models.DatadogAgreementResource, IO[bytes]]] = None, **kwargs: Any ) -> _models.DatadogAgreementResource: """Create Datadog marketplace agreement in the subscription. Create Datadog marketplace agreement in the subscription. - :param body: Is either a DatadogAgreementResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogAgreementResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a DatadogAgreementResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogAgreementResource or IO[bytes] :return: DatadogAgreementResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogAgreementResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -277,22 +268,20 @@ def create_or_update( else: _json = None - request = build_create_or_update_request( + _request = build_create_or_update_request( subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.create_or_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 @@ -302,13 +291,9 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogAgreementResource", pipeline_response) + deserialized = self._deserialize("DatadogAgreementResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/agreements/default" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitored_subscriptions_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitored_subscriptions_operations.py index e9d9855bc75b..31193f0db4b8 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitored_subscriptions_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitored_subscriptions_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,8 +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 urllib.parse +import sys +from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( ClientAuthenticationError, @@ -16,13 +15,13 @@ 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 +29,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]] @@ -43,7 +45,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -76,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -110,7 +112,7 @@ def build_createor_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -147,7 +149,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -184,7 +186,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -234,7 +236,7 @@ def __init__(self, *args, **kwargs): @distributed_trace def list( self, resource_group_name: str, monitor_name: str, **kwargs: Any - ) -> Iterable["_models.MonitoredSubscriptionProperties"]: + ) -> _models.MonitoredSubscriptionProperties: """List the subscriptions currently being monitored by the Datadog monitor resource. List the subscriptions currently being monitored by the Datadog monitor resource. @@ -244,20 +246,11 @@ 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 MonitoredSubscriptionProperties or the result of - cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.MonitoredSubscriptionProperties] + :return: MonitoredSubscriptionProperties or the result of cls(response) + :rtype: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - _headers = kwargs.pop("headers", {}) or {} - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[_models.MonitoredSubscriptionPropertiesList] = kwargs.pop("cls", None) - - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -265,67 +258,40 @@ def list( } error_map.update(kwargs.pop("error_map", {}) or {}) - def prepare_request(next_link=None): - if not next_link: - - request = build_list_request( - resource_group_name=resource_group_name, - 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) + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request - - def extract_data(pipeline_response): - deserialized = self._deserialize("MonitoredSubscriptionPropertiesList", pipeline_response) - list_of_elem = deserialized.value - if cls: - list_of_elem = cls(list_of_elem) # type: ignore - return None, iter(list_of_elem) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.MonitoredSubscriptionProperties] = kwargs.pop("cls", None) - def get_next(next_link=None): - request = prepare_request(next_link) + _request = build_list_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs - ) - response = pipeline_response.http_response + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + _request, stream=_stream, **kwargs + ) - if response.status_code not in [200]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + response = pipeline_response.http_response - return pipeline_response + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - return ItemPaged(get_next, extract_data) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions" - } + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore @distributed_trace def get( @@ -342,12 +308,11 @@ def get( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoredSubscriptionProperties or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -361,22 +326,20 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoredSubscriptionProperties] = 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 @@ -386,26 +349,22 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", 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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore def _createor_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> Optional[_models.MonitoredSubscriptionProperties]: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -418,7 +377,7 @@ def _createor_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[Optional[_models.MonitoredSubscriptionProperties]] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -431,7 +390,7 @@ def _createor_update_initial( else: _json = None - request = build_createor_update_request( + _request = build_createor_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -440,40 +399,34 @@ def _createor_update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._createor_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, 202]: + 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 = None - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - _createor_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload def begin_createor_update( @@ -502,14 +455,6 @@ def begin_createor_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 MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -523,7 +468,7 @@ def begin_createor_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -540,18 +485,10 @@ def begin_createor_update( :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -565,7 +502,7 @@ def begin_createor_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any ) -> LROPoller[_models.MonitoredSubscriptionProperties]: """Add the subscriptions that should be monitored by the Datadog monitor resource. @@ -579,20 +516,9 @@ def begin_createor_update( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a MonitoredSubscriptionProperties type or a IO[bytes] type. Default + value is None. + :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO[bytes] :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -621,12 +547,13 @@ def begin_createor_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("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -636,27 +563,25 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.MonitoredSubscriptionProperties].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_createor_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return LROPoller[_models.MonitoredSubscriptionProperties]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) def _update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> Optional[_models.MonitoredSubscriptionProperties]: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -669,7 +594,7 @@ def _update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[Optional[_models.MonitoredSubscriptionProperties]] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -682,7 +607,7 @@ def _update_initial( else: _json = None - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -691,37 +616,34 @@ def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202]: + 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 = None - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload def begin_update( @@ -750,14 +672,6 @@ def begin_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -771,7 +685,7 @@ def begin_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -788,18 +702,10 @@ def begin_update( :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -813,7 +719,7 @@ def begin_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any ) -> LROPoller[_models.MonitoredSubscriptionProperties]: """Updates the subscriptions that are being monitored by the Datadog monitor resource. @@ -827,20 +733,9 @@ def begin_update( :type monitor_name: str :param configuration_name: The configuration name. Only 'default' value is supported. Required. :type configuration_name: str - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a MonitoredSubscriptionProperties type or a IO[bytes] type. Default + value is None. + :type body: ~azure.mgmt.datadog.models.MonitoredSubscriptionProperties or IO[bytes] :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -869,12 +764,13 @@ def begin_update( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) + deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -884,22 +780,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.MonitoredSubscriptionProperties].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return LROPoller[_models.MonitoredSubscriptionProperties]( + 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, configuration_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -911,39 +805,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, configuration_name=configuration_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete( @@ -960,14 +857,6 @@ def begin_delete( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -981,7 +870,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, configuration_name=configuration_name, @@ -991,11 +880,12 @@ def begin_delete( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: - return cls(pipeline_response, None, {}) + return cls(pipeline_response, None, {}) # type: ignore if polling is True: polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) @@ -1004,14 +894,10 @@ 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/Microsoft.Datadog/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitors_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitors_operations.py index 6b84b197c7ab..7d010db68d3a 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_monitors_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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]] @@ -45,7 +50,7 @@ def build_list_api_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +83,7 @@ def build_get_default_key_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -111,7 +116,7 @@ def build_set_default_key_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -147,7 +152,7 @@ def build_list_hosts_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -180,7 +185,7 @@ def build_list_linked_resources_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -213,7 +218,7 @@ def build_list_monitored_resources_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -244,7 +249,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -268,7 +273,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -298,7 +303,7 @@ def build_get_request(resource_group_name: str, monitor_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -331,7 +336,7 @@ def build_create_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -367,7 +372,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -403,7 +408,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -436,7 +441,7 @@ def build_refresh_set_password_link_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -495,7 +500,6 @@ def list_api_keys( :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 DatadogApiKey or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogApiKey] :raises ~azure.core.exceptions.HttpResponseError: @@ -506,7 +510,7 @@ def list_api_keys( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogApiKeyListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -517,17 +521,15 @@ def list_api_keys( def prepare_request(next_link=None): if not next_link: - request = build_list_api_keys_request( + _request = build_list_api_keys_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_api_keys.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 @@ -539,13 +541,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("DatadogApiKeyListResponse", pipeline_response) @@ -555,11 +556,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 @@ -572,10 +573,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_api_keys.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listApiKeys" - } - @distributed_trace def get_default_key(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.DatadogApiKey: """Get the default api key. @@ -587,12 +584,11 @@ def get_default_key(self, resource_group_name: str, monitor_name: str, **kwargs: :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: DatadogApiKey or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogApiKey :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -606,21 +602,19 @@ def get_default_key(self, resource_group_name: str, monitor_name: str, **kwargs: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogApiKey] = kwargs.pop("cls", None) - request = build_get_default_key_request( + _request = build_get_default_key_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_default_key.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 @@ -630,19 +624,15 @@ def get_default_key(self, resource_group_name: str, monitor_name: str, **kwargs: error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogApiKey", pipeline_response) + deserialized = self._deserialize("DatadogApiKey", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_default_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/getDefaultKey" - } + return deserialized # type: ignore @overload - def set_default_key( # pylint: disable=inconsistent-return-statements + def set_default_key( self, resource_group_name: str, monitor_name: str, @@ -665,18 +655,17 @@ def set_default_key( # pylint: disable=inconsistent-return-statements :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: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ @overload - def set_default_key( # pylint: disable=inconsistent-return-statements + def set_default_key( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -691,11 +680,10 @@ def set_default_key( # pylint: disable=inconsistent-return-statements :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: @@ -706,7 +694,7 @@ def set_default_key( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogApiKey, IO]] = None, + body: Optional[Union[_models.DatadogApiKey, IO[bytes]]] = None, **kwargs: Any ) -> None: """Set the default api key. @@ -718,17 +706,13 @@ def set_default_key( # pylint: disable=inconsistent-return-statements :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogApiKey type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogApiKey or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a DatadogApiKey type or a IO[bytes] type. Default value is None. + :type body: ~azure.mgmt.datadog.models.DatadogApiKey or IO[bytes] :return: None or the result of cls(response) :rtype: None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -754,7 +738,7 @@ def set_default_key( # pylint: disable=inconsistent-return-statements else: _json = None - request = build_set_default_key_request( + _request = build_set_default_key_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -762,16 +746,14 @@ def set_default_key( # pylint: disable=inconsistent-return-statements content_type=content_type, json=_json, content=_content, - template_url=self.set_default_key.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 @@ -782,11 +764,7 @@ def set_default_key( # pylint: disable=inconsistent-return-statements raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, None, {}) - - set_default_key.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/setDefaultKey" - } + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def list_hosts(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> Iterable["_models.DatadogHost"]: @@ -799,7 +777,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 DatadogHost or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogHost] :raises ~azure.core.exceptions.HttpResponseError: @@ -810,7 +787,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.DatadogHostListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -821,17 +798,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 @@ -843,13 +818,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("DatadogHostListResponse", pipeline_response) @@ -859,11 +833,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 @@ -876,10 +850,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listHosts" - } - @distributed_trace def list_linked_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -893,7 +863,6 @@ def list_linked_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 LinkedResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.LinkedResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -904,7 +873,7 @@ def list_linked_resources( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.LinkedResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -915,17 +884,15 @@ def list_linked_resources( def prepare_request(next_link=None): if not next_link: - request = build_list_linked_resources_request( + _request = build_list_linked_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_linked_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 @@ -937,13 +904,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("LinkedResourceListResponse", pipeline_response) @@ -953,11 +919,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 @@ -970,10 +936,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_linked_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listLinkedResources" - } - @distributed_trace def list_monitored_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -987,7 +949,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.datadog.models.MonitoredResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -998,7 +959,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, @@ -1009,17 +970,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 @@ -1031,13 +990,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) @@ -1047,11 +1005,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 @@ -1064,17 +1022,12 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/listMonitoredResources" - } - @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.DatadogMonitorResource"]: """List all monitors under the specified subscription. List all monitors under the specified subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1086,7 +1039,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DatadogMonitorResource"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogMonitorResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1097,15 +1050,13 @@ def list(self, **kwargs: Any) -> Iterable["_models.DatadogMonitorResource"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -1117,13 +1068,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("DatadogMonitorResourceListResponse", pipeline_response) @@ -1133,11 +1083,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 @@ -1150,8 +1100,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Datadog/monitors"} - @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any @@ -1163,7 +1111,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 DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1175,7 +1122,7 @@ def list_by_resource_group( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogMonitorResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1186,16 +1133,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 @@ -1207,13 +1152,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("DatadogMonitorResourceListResponse", pipeline_response) @@ -1223,11 +1167,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 @@ -1240,10 +1184,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors" - } - @distributed_trace def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.DatadogMonitorResource: """Get the properties of a specific monitor resource. @@ -1255,12 +1195,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: DatadogMonitorResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogMonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1274,21 +1213,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.DatadogMonitorResource] = 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 @@ -1298,25 +1235,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("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", 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/Microsoft.Datadog/monitors/{monitorName}" - } + return deserialized # type: ignore def _create_initial( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResource, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResource, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogMonitorResource: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1329,7 +1262,7 @@ def _create_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.DatadogMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -1342,7 +1275,7 @@ def _create_initial( else: _json = None - request = build_create_request( + _request = build_create_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1350,40 +1283,35 @@ def _create_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_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("DatadogMonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogMonitorResource", 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_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } - @overload def begin_create( self, @@ -1408,14 +1336,6 @@ def begin_create( :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 DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1427,7 +1347,7 @@ def begin_create( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1442,18 +1362,10 @@ def begin_create( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1465,7 +1377,7 @@ def begin_create( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResource, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResource, IO[bytes]]] = None, **kwargs: Any ) -> LROPoller[_models.DatadogMonitorResource]: """Create a monitor resource. @@ -1477,19 +1389,9 @@ def begin_create( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogMonitorResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogMonitorResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a DatadogMonitorResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogMonitorResource or IO[bytes] :return: An instance of LROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1516,12 +1418,13 @@ def begin_create( 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("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1533,26 +1436,24 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.DatadogMonitorResource].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.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } + return LROPoller[_models.DatadogMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) def _update_initial( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogMonitorResource: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1565,7 +1466,7 @@ def _update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.DatadogMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -1578,7 +1479,7 @@ def _update_initial( else: _json = None - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1586,40 +1487,35 @@ def _update_initial( content_type=content_type, json=_json, content=_content, - template_url=self._update_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - if response.status_code == 200: - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } - @overload def begin_update( self, @@ -1644,14 +1540,6 @@ def begin_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1663,7 +1551,7 @@ def begin_update( self, resource_group_name: str, monitor_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -1678,18 +1566,10 @@ def begin_update( :param monitor_name: Monitor resource name. Required. :type monitor_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1701,7 +1581,7 @@ def begin_update( self, resource_group_name: str, monitor_name: str, - body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO]] = None, + body: Optional[Union[_models.DatadogMonitorResourceUpdateParameters, IO[bytes]]] = None, **kwargs: Any ) -> LROPoller[_models.DatadogMonitorResource]: """Update a monitor resource. @@ -1713,20 +1593,9 @@ def begin_update( :type resource_group_name: str :param monitor_name: Monitor resource name. Required. :type monitor_name: str - :param body: Is either a DatadogMonitorResourceUpdateParameters type or a IO type. Default - value is None. - :type body: ~azure.mgmt.datadog.models.DatadogMonitorResourceUpdateParameters or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + :param body: Is either a DatadogMonitorResourceUpdateParameters type or a IO[bytes] type. 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. + :type body: ~azure.mgmt.datadog.models.DatadogMonitorResourceUpdateParameters or IO[bytes] :return: An instance of LROPoller that returns either DatadogMonitorResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogMonitorResource] @@ -1753,12 +1622,13 @@ def begin_update( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("DatadogMonitorResource", pipeline_response) + deserialized = self._deserialize("DatadogMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -1768,22 +1638,18 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.DatadogMonitorResource].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}" - } + return LROPoller[_models.DatadogMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - def _delete_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, 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, @@ -1795,38 +1661,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/Microsoft.Datadog/monitors/{monitorName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> LROPoller[None]: @@ -1839,14 +1708,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: @@ -1860,7 +1721,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, @@ -1869,11 +1730,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(PollingMethod, ARMPolling(lro_delay, **kwargs)) @@ -1882,17 +1744,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/Microsoft.Datadog/monitors/{monitorName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def refresh_set_password_link( @@ -1907,12 +1765,11 @@ def refresh_set_password_link( :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: DatadogSetPasswordLink or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogSetPasswordLink :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1926,21 +1783,19 @@ def refresh_set_password_link( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSetPasswordLink] = kwargs.pop("cls", None) - request = build_refresh_set_password_link_request( + _request = build_refresh_set_password_link_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.refresh_set_password_link.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 @@ -1950,13 +1805,9 @@ def refresh_set_password_link( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogSetPasswordLink", pipeline_response) + deserialized = self._deserialize("DatadogSetPasswordLink", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - refresh_set_password_link.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/refreshSetPasswordLink" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_operations.py index ed18776511d1..8e6c79db2206 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,6 +5,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse @@ -19,16 +19,18 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -40,7 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -76,11 +78,10 @@ def __init__(self, *args, **kwargs): @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]: - """List all operations provided by Microsoft.Datadog for the 2023-01-01 api version. + """List all operations provided by Microsoft.Datadog for the 2023-10-20 api version. - List all operations provided by Microsoft.Datadog for the 2023-01-01 api version. + List all operations provided by Microsoft.Datadog for the 2023-10-20 api version. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OperationResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.OperationResult] :raises ~azure.core.exceptions.HttpResponseError: @@ -91,7 +92,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -102,14 +103,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.OperationResult"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -121,13 +120,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("OperationListResult", pipeline_response) @@ -137,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/Microsoft.Datadog/operations"} diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_single_sign_on_configurations_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_single_sign_on_configurations_operations.py index 5a88c13a00e7..e56ffc5c236a 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_single_sign_on_configurations_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_single_sign_on_configurations_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -16,13 +16,14 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat @@ -30,8 +31,11 @@ from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -43,7 +47,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -76,7 +80,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -113,7 +117,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -173,7 +177,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 DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.DatadogSingleSignOnResource] @@ -185,7 +188,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSingleSignOnResourceListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -196,17 +199,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 @@ -218,13 +219,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("DatadogSingleSignOnResourceListResponse", pipeline_response) @@ -234,11 +234,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 @@ -251,19 +251,15 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations" - } - def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.DatadogSingleSignOnResource, IO]] = None, + body: Optional[Union[_models.DatadogSingleSignOnResource, IO[bytes]]] = None, **kwargs: Any - ) -> _models.DatadogSingleSignOnResource: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -276,7 +272,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.DatadogSingleSignOnResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -289,7 +285,7 @@ def _create_or_update_initial( else: _json = None - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -298,40 +294,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("DatadogSingleSignOnResource", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("DatadogSingleSignOnResource", 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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } - @overload def begin_create_or_update( self, @@ -359,14 +350,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 DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogSingleSignOnResource] @@ -379,7 +362,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -396,18 +379,10 @@ def begin_create_or_update( :param configuration_name: Configuration name. Required. :type configuration_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogSingleSignOnResource] @@ -420,7 +395,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, configuration_name: str, - body: Optional[Union[_models.DatadogSingleSignOnResource, IO]] = None, + body: Optional[Union[_models.DatadogSingleSignOnResource, IO[bytes]]] = None, **kwargs: Any ) -> LROPoller[_models.DatadogSingleSignOnResource]: """Configures single-sign-on for this resource. @@ -434,19 +409,9 @@ def begin_create_or_update( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :param body: Is either a DatadogSingleSignOnResource type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param body: Is either a DatadogSingleSignOnResource type or a IO[bytes] type. Default value is + None. + :type body: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource or IO[bytes] :return: An instance of LROPoller that returns either DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.datadog.models.DatadogSingleSignOnResource] @@ -474,12 +439,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("DatadogSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DatadogSingleSignOnResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -491,17 +457,15 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.DatadogSingleSignOnResource].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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return LROPoller[_models.DatadogSingleSignOnResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace def get( @@ -518,12 +482,11 @@ def get( :type monitor_name: str :param configuration_name: Configuration name. Required. :type configuration_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: DatadogSingleSignOnResource or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.DatadogSingleSignOnResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -537,22 +500,20 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.DatadogSingleSignOnResource] = 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 @@ -562,13 +523,9 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("DatadogSingleSignOnResource", pipeline_response) + deserialized = self._deserialize("DatadogSingleSignOnResource", 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/Microsoft.Datadog/monitors/{monitorName}/singleSignOnConfigurations/{configurationName}" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_tag_rules_operations.py b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_tag_rules_operations.py index d1fd49468820..5831c288d55d 100644 --- a/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/operations/_tag_rules_operations.py +++ b/sdk/datadog/azure-mgmt-datadog/azure/mgmt/datadog/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,6 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase +import sys from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload import urllib.parse @@ -20,16 +20,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]] @@ -41,7 +43,7 @@ def build_list_request(resource_group_name: str, monitor_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -74,7 +76,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -111,7 +113,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-10-20")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -171,7 +173,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 MonitoringTagRules or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.datadog.models.MonitoringTagRules] :raises ~azure.core.exceptions.HttpResponseError: @@ -182,7 +183,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoringTagRulesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -193,17 +194,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 @@ -215,13 +214,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("MonitoringTagRulesListResponse", pipeline_response) @@ -231,11 +229,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 @@ -248,10 +246,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/tagRules" - } - @overload def create_or_update( self, @@ -279,7 +273,6 @@ def 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 :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: @@ -291,7 +284,7 @@ def create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -308,11 +301,10 @@ def create_or_update( :param rule_set_name: Rule set name. Required. :type rule_set_name: str :param body: Default value is None. - :type body: IO + :type body: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: @@ -324,7 +316,7 @@ def create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - body: Optional[Union[_models.MonitoringTagRules, IO]] = None, + body: Optional[Union[_models.MonitoringTagRules, IO[bytes]]] = None, **kwargs: Any ) -> _models.MonitoringTagRules: """Create or update a tag rule set for a given monitor resource. @@ -338,17 +330,13 @@ def create_or_update( :type monitor_name: str :param rule_set_name: Rule set name. Required. :type rule_set_name: str - :param body: Is either a MonitoringTagRules type or a IO type. Default value is None. - :type body: ~azure.mgmt.datadog.models.MonitoringTagRules or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param body: Is either a MonitoringTagRules type or a IO[bytes] type. Default value is None. + :type body: ~azure.mgmt.datadog.models.MonitoringTagRules or IO[bytes] :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -374,7 +362,7 @@ def create_or_update( else: _json = None - 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, @@ -383,16 +371,14 @@ def create_or_update( content_type=content_type, json=_json, content=_content, - template_url=self.create_or_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 @@ -402,16 +388,12 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitoringTagRules", pipeline_response) + deserialized = self._deserialize("MonitoringTagRules", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Datadog/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace def get( @@ -428,12 +410,11 @@ def get( :type monitor_name: str :param rule_set_name: Rule set name. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MonitoringTagRules or the result of cls(response) :rtype: ~azure.mgmt.datadog.models.MonitoringTagRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -447,22 +428,20 @@ def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.MonitoringTagRules] = 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 @@ -472,13 +451,9 @@ def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MonitoringTagRules", pipeline_response) + deserialized = self._deserialize("MonitoringTagRules", 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/Microsoft.Datadog/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_get_default_key.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_get_default_key.py index fd6958a4a4c2..fb598576d8ee 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_get_default_key.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_get_default_key.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/ApiKeys_GetDefaultKey.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/ApiKeys_GetDefaultKey.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_list.py index 1b5aa8bb182c..251c6ab7706d 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/ApiKeys_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/ApiKeys_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_set_default_key.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_set_default_key.py index 89432f4efc8b..a01f687f51da 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_set_default_key.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/api_keys_set_default_key.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -35,6 +36,6 @@ def main(): ) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/ApiKeys_SetDefaultKey.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/ApiKeys_SetDefaultKey.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/billing_info_get.py similarity index 83% rename from sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_list.py rename to sdk/datadog/azure-mgmt-datadog/generated_samples/billing_info_get.py index e798940790f7..f3123c36353d 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/billing_info_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -14,7 +15,7 @@ pip install azure-identity pip install azure-mgmt-datadog # USAGE - python creation_supported_list.py + python billing_info_get.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -29,13 +30,13 @@ def main(): subscription_id="00000000-0000-0000-0000-000000000000", ) - response = client.creation_supported.list( - datadog_organization_id="00000000-0000-0000-0000", + response = client.billing_info.get( + resource_group_name="myResourceGroup", + monitor_name="myMonitor", ) - for item in response: - print(item) + print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/CreationSupported_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/BillingInfo_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_get.py index 1479d121e4c9..cb4a105a31c3 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/creation_supported_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -35,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/CreationSupported_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/CreationSupported_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/hosts_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/hosts_list.py index e03f314d03f6..f86a1980d300 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/hosts_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/hosts_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Hosts_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Hosts_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/linked_resources_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/linked_resources_list.py index 5fb9f7c45d8b..6d8547197bca 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/linked_resources_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/linked_resources_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/LinkedResources_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/LinkedResources_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_create.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_create.py index 8acc7b69ae0f..6e7219bf0172 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_create.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_create.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -33,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MarketplaceAgreements_Create.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MarketplaceAgreements_Create.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_list.py index 26d36b5b2d89..c588bf093fbd 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/marketplace_agreements_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MarketplaceAgreements_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MarketplaceAgreements_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_resources_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_resources_list.py index 5588abb17136..f631fb7baa53 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_resources_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_resources_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredResources_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredResources_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_createor_update.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_createor_update.py index aa507e4eb18a..930c08ebb0ee 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_createor_update.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_createor_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredSubscriptions_CreateorUpdate.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredSubscriptions_CreateorUpdate.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_delete.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_delete.py index f195c109b9ef..b46b1e677498 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_delete.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredSubscriptions_Delete.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredSubscriptions_Delete.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_get.py index a95ad9747585..4ad0fc47f842 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredSubscriptions_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredSubscriptions_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_list.py index cf5dc87d42fb..8d03998f9bd7 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -33,10 +34,9 @@ def main(): resource_group_name="myResourceGroup", monitor_name="myMonitor", ) - for item in response: - print(item) + print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredSubscriptions_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredSubscriptions_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_update.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_update.py index 411acdf9cd8c..3ab6107672e0 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_update.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitored_subscriptions_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/MonitoredSubscriptions_Update.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/MonitoredSubscriptions_Update.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_create.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_create.py index a6ff3e6116ce..9f3d6a125b23 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_create.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_create.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_Create.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_Create.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_delete.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_delete.py index 33f2b01de4c9..3d3b977fe8f5 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_delete.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -35,6 +36,6 @@ def main(): ).result() -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_Delete.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_Delete.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_get.py index c41fcdeebc04..02b998494c83 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list.py index 14028bbad6c5..b635d1afe3c0 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list_by_resource_group.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list_by_resource_group.py index fde140500fe5..1071c04ab840 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list_by_resource_group.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_list_by_resource_group.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_ListByResourceGroup.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_ListByResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_update.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_update.py index de9a94f8acb7..d036b115ecbb 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_update.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/monitors_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Monitors_Update.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Monitors_Update.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/operations_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/operations_list.py index a21ad41e0296..d9278dee288f 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/operations_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/operations_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/Operations_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/Operations_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/refresh_set_password_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/refresh_set_password_get.py index 9d64da5e82f3..c26676151ec1 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/refresh_set_password_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/refresh_set_password_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/RefreshSetPassword_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/RefreshSetPassword_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_create_or_update.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_create_or_update.py index ee33ccae0ed1..2ced89dbfcf6 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_create_or_update.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_create_or_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/SingleSignOnConfigurations_CreateOrUpdate.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/SingleSignOnConfigurations_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_get.py index aba00f1a0e65..14dda6d7951a 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/SingleSignOnConfigurations_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/SingleSignOnConfigurations_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_list.py index 0a81274ca5a7..17e5b8557b82 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/single_sign_on_configurations_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/SingleSignOnConfigurations_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/SingleSignOnConfigurations_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_create_or_update.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_create_or_update.py index 486ce2fc5caf..77b2b3d6394d 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_create_or_update.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_create_or_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/TagRules_CreateOrUpdate.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/TagRules_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_get.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_get.py index cbc5df996daa..ebe52fe731d5 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_get.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/TagRules_Get.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/TagRules_Get.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_list.py b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_list.py index b5d83b8a09c3..9c3257345d28 100644 --- a/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_list.py +++ b/sdk/datadog/azure-mgmt-datadog/generated_samples/tag_rules_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.datadog import MicrosoftDatadogClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-01-01/examples/TagRules_List.json +# x-ms-original-file: specification/datadog/resource-manager/Microsoft.Datadog/stable/2023-10-20/examples/TagRules_List.json if __name__ == "__main__": main() diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/conftest.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/conftest.py new file mode 100644 index 000000000000..004562d84049 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# For security, please avoid record sensitive identity information in recordings +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + microsoftdatadog_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + microsoftdatadog_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + microsoftdatadog_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + microsoftdatadog_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=microsoftdatadog_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=microsoftdatadog_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=microsoftdatadog_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=microsoftdatadog_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/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations.py new file mode 100644 index 000000000000..b102a2840b0c --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations.py @@ -0,0 +1,31 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogBillingInfoOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_billing_info_get(self, resource_group): + response = self.client.billing_info.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations_async.py new file mode 100644 index 000000000000..198bda3b4f39 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_billing_info_operations_async.py @@ -0,0 +1,32 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogBillingInfoOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_billing_info_get(self, resource_group): + response = await self.client.billing_info.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations.py new file mode 100644 index 000000000000..97ed0fbd513a --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations.py @@ -0,0 +1,41 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogCreationSupportedOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_creation_supported_list(self, resource_group): + response = self.client.creation_supported.list( + datadog_organization_id="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_creation_supported_get(self, resource_group): + response = self.client.creation_supported.get( + datadog_organization_id="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations_async.py new file mode 100644 index 000000000000..23948d803066 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_creation_supported_operations_async.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogCreationSupportedOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_creation_supported_list(self, resource_group): + response = await self.client.creation_supported.list( + datadog_organization_id="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_creation_supported_get(self, resource_group): + response = await self.client.creation_supported.get( + datadog_organization_id="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations.py new file mode 100644 index 000000000000..558ded3b12d2 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations.py @@ -0,0 +1,39 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMarketplaceAgreementsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_marketplace_agreements_list(self, resource_group): + response = self.client.marketplace_agreements.list( + api_version="2023-10-20", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_marketplace_agreements_create_or_update(self, resource_group): + response = self.client.marketplace_agreements.create_or_update( + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations_async.py new file mode 100644 index 000000000000..e8e57bc6ddda --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_marketplace_agreements_operations_async.py @@ -0,0 +1,40 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMarketplaceAgreementsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_marketplace_agreements_list(self, resource_group): + response = self.client.marketplace_agreements.list( + api_version="2023-10-20", + ) + 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_marketplace_agreements_create_or_update(self, resource_group): + response = await self.client.marketplace_agreements.create_or_update( + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations.py new file mode 100644 index 000000000000..14015721004d --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations.py @@ -0,0 +1,83 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMonitoredSubscriptionsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitored_subscriptions_list(self, resource_group): + response = self.client.monitored_subscriptions.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitored_subscriptions_get(self, resource_group): + response = self.client.monitored_subscriptions.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitored_subscriptions_begin_createor_update(self, resource_group): + response = self.client.monitored_subscriptions.begin_createor_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ).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_monitored_subscriptions_begin_update(self, resource_group): + response = self.client.monitored_subscriptions.begin_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ).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_monitored_subscriptions_begin_delete(self, resource_group): + response = self.client.monitored_subscriptions.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations_async.py new file mode 100644 index 000000000000..d8615949e81f --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitored_subscriptions_operations_async.py @@ -0,0 +1,90 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMonitoredSubscriptionsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitored_subscriptions_list(self, resource_group): + response = await self.client.monitored_subscriptions.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitored_subscriptions_get(self, resource_group): + response = await self.client.monitored_subscriptions.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitored_subscriptions_begin_createor_update(self, resource_group): + response = await ( + await self.client.monitored_subscriptions.begin_createor_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + ).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_monitored_subscriptions_begin_update(self, resource_group): + response = await ( + await self.client.monitored_subscriptions.begin_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + ).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_monitored_subscriptions_begin_delete(self, resource_group): + response = await ( + await self.client.monitored_subscriptions.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations.py new file mode 100644 index 000000000000..85a1b47cc61b --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations.py @@ -0,0 +1,172 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMonitorsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_api_keys(self, resource_group): + response = self.client.monitors.list_api_keys( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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_default_key(self, resource_group): + response = self.client.monitors.get_default_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_set_default_key(self, resource_group): + response = self.client.monitors.set_default_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # 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-10-20", + ) + 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_linked_resources(self, resource_group): + response = self.client.monitors.list_linked_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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_monitored_resources(self, resource_group): + response = self.client.monitors.list_monitored_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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(self, resource_group): + response = self.client.monitors.list( + api_version="2023-10-20", + ) + 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-10-20", + ) + 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(self, resource_group): + response = self.client.monitors.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_begin_create(self, resource_group): + response = self.client.monitors.begin_create( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ).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_begin_update(self, resource_group): + response = self.client.monitors.begin_update( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ).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_begin_delete(self, resource_group): + response = self.client.monitors.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ).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_refresh_set_password_link(self, resource_group): + response = self.client.monitors.refresh_set_password_link( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations_async.py new file mode 100644 index 000000000000..60c387cb417d --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_monitors_operations_async.py @@ -0,0 +1,179 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogMonitorsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_api_keys(self, resource_group): + response = self.client.monitors.list_api_keys( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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_default_key(self, resource_group): + response = await self.client.monitors.get_default_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_set_default_key(self, resource_group): + response = await self.client.monitors.set_default_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # 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-10-20", + ) + 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_linked_resources(self, resource_group): + response = self.client.monitors.list_linked_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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_monitored_resources(self, resource_group): + response = self.client.monitors.list_monitored_resources( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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(self, resource_group): + response = self.client.monitors.list( + api_version="2023-10-20", + ) + 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-10-20", + ) + 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(self, resource_group): + response = await self.client.monitors.get( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_begin_create(self, resource_group): + response = await ( + await self.client.monitors.begin_create( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + ).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_begin_update(self, resource_group): + response = await ( + await self.client.monitors.begin_update( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + ).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_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-10-20", + ) + ).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_refresh_set_password_link(self, resource_group): + response = await self.client.monitors.refresh_set_password_link( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_operations.py new file mode 100644 index 000000000000..bb63472c6ceb --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2023-10-20", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_operations_async.py new file mode 100644 index 000000000000..b50fa43f91d2 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, 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-10-20", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations.py new file mode 100644 index 000000000000..47a50303d28f --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations.py @@ -0,0 +1,57 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogSingleSignOnConfigurationsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_single_sign_on_configurations_list(self, resource_group): + response = self.client.single_sign_on_configurations.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_single_sign_on_configurations_begin_create_or_update(self, resource_group): + response = self.client.single_sign_on_configurations.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ).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_configurations_get(self, resource_group): + response = self.client.single_sign_on_configurations.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations_async.py new file mode 100644 index 000000000000..d029b0b77cb5 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_single_sign_on_configurations_operations_async.py @@ -0,0 +1,60 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogSingleSignOnConfigurationsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_single_sign_on_configurations_list(self, resource_group): + response = self.client.single_sign_on_configurations.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2023-10-20", + ) + 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_single_sign_on_configurations_begin_create_or_update(self, resource_group): + response = await ( + await self.client.single_sign_on_configurations.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + ).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_configurations_get(self, resource_group): + response = await self.client.single_sign_on_configurations.get( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations.py new file mode 100644 index 000000000000..a1787b692606 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations.py @@ -0,0 +1,57 @@ +# 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.datadog import MicrosoftDatadogClient + +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 TestMicrosoftDatadogTagRulesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient) + + @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-10-20", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_create_or_update(self, resource_group): + response = self.client.tag_rules.create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @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-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations_async.py b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations_async.py new file mode 100644 index 000000000000..6cfb31f33e17 --- /dev/null +++ b/sdk/datadog/azure-mgmt-datadog/generated_tests/test_microsoft_datadog_tag_rules_operations_async.py @@ -0,0 +1,58 @@ +# 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.datadog.aio import MicrosoftDatadogClient + +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 TestMicrosoftDatadogTagRulesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(MicrosoftDatadogClient, is_async=True) + + @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-10-20", + ) + 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_tag_rules_create_or_update(self, resource_group): + response = await self.client.tag_rules.create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2023-10-20", + ) + + # please add some check logic here by yourself + # ... + + @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-10-20", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/datadog/azure-mgmt-datadog/setup.py b/sdk/datadog/azure-mgmt-datadog/setup.py index 679dc3b1c5d7..ae2cf0fa87fe 100644 --- a/sdk/datadog/azure-mgmt-datadog/setup.py +++ b/sdk/datadog/azure-mgmt-datadog/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", )