diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/CHANGELOG.md b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/CHANGELOG.md index a7bb10a15f68..f98ed3450d0a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/CHANGELOG.md +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/CHANGELOG.md @@ -1,5 +1,38 @@ # Release History +## 2.0.0 (2025-04-09) + +### Features Added + + - Model `MarketplaceSaaSInfo` added property `publisher_id` + - Model `MarketplaceSaaSInfo` added property `offer_id` + - Added model `ResubscribeProperties` + - Model `MonitoredSubscriptionsOperations` added method `begin_create_or_update` + - Model `MonitorsOperations` added method `begin_resubscribe` + - Model `MonitorsOperations` added method `begin_update` + - Model `MonitorsOperations` added method `refresh_ingestion_key` + - Method `MonitoredSubscriptionsOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, monitor_name: str, configuration_name: Union[str, ConfigurationName], body: Optional[IO[bytes]], content_type: str)` + - Method `MonitoredSubscriptionsOperations.begin_create_or_update` has a new overload `def begin_create_or_update(self: None, resource_group_name: str, monitor_name: str, configuration_name: Union[str, ConfigurationName], body: Optional[MonitoredSubscriptionProperties], content_type: str)` + - Method `MonitoredSubscriptionsOperations.begin_create_or_update` has a new overload `def begin_create_or_update(self: None, resource_group_name: str, monitor_name: str, configuration_name: Union[str, ConfigurationName], body: Optional[IO[bytes]], content_type: str)` + - Method `MonitorsOperations.begin_create_or_update` has a new overload `def begin_create_or_update(self: None, resource_group_name: str, monitor_name: str, resource: IO[bytes], content_type: str)` + - Method `MonitorsOperations.get_metric_rules` has a new overload `def get_metric_rules(self: None, resource_group_name: str, monitor_name: str, request: IO[bytes], content_type: str)` + - Method `MonitorsOperations.get_metric_status` has a new overload `def get_metric_status(self: None, resource_group_name: str, monitor_name: str, request: IO[bytes], content_type: str)` + - Method `MonitorsOperations.list_app_services` has a new overload `def list_app_services(self: None, resource_group_name: str, monitor_name: str, request: IO[bytes], content_type: str)` + - Method `MonitorsOperations.list_hosts` has a new overload `def list_hosts(self: None, resource_group_name: str, monitor_name: str, request: IO[bytes], content_type: str)` + - Method `MonitorsOperations.switch_billing` has a new overload `def switch_billing(self: None, resource_group_name: str, monitor_name: str, request: IO[bytes], content_type: str)` + - Method `MonitorsOperations.begin_resubscribe` has a new overload `def begin_resubscribe(self: None, resource_group_name: str, monitor_name: str, body: Optional[ResubscribeProperties], content_type: str)` + - Method `MonitorsOperations.begin_resubscribe` has a new overload `def begin_resubscribe(self: None, resource_group_name: str, monitor_name: str, body: Optional[IO[bytes]], content_type: str)` + - Method `MonitorsOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, monitor_name: str, properties: NewRelicMonitorResourceUpdate, content_type: str)` + - Method `MonitorsOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, monitor_name: str, properties: IO[bytes], content_type: str)` + - Method `TagRulesOperations.begin_create_or_update` has a new overload `def begin_create_or_update(self: None, resource_group_name: str, monitor_name: str, rule_set_name: str, resource: IO[bytes], content_type: str)` + - Method `TagRulesOperations.update` has a new overload `def update(self: None, resource_group_name: str, monitor_name: str, rule_set_name: str, properties: IO[bytes], content_type: str)` + +### Breaking Changes + + - Deleted or renamed model `BillingCycle` + - Deleted or renamed method `MonitoredSubscriptionsOperations.begin_createor_update` + - Deleted or renamed method `MonitorsOperations.update` + ## 1.1.0 (2024-03-18) ### Features Added diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/README.md b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/README.md index 0a28c3e6a8c6..f67be82fba48 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/README.md +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/README.md @@ -24,7 +24,7 @@ pip install azure-identity ### Authentication -By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables. +By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables. - `AZURE_CLIENT_ID` for Azure client ID. - `AZURE_TENANT_ID` for Azure tenant ID. diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/_meta.json b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/_meta.json index 0789c1c08fff..11d00cc52d78 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/_meta.json +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/_meta.json @@ -1,11 +1,11 @@ { - "commit": "859afd79c1b0366691481b6c1add072a2f948c4e", + "commit": "e9870a55a1599f6f6015aa114682376b4f720139", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest": "3.9.7", + "autorest": "3.10.2", "use": [ - "@autorest/python@6.7.1", - "@autorest/modelerfour@4.26.2" + "@autorest/python@6.27.4", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/newrelic/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/newrelic/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/newrelic/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/__init__.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/__init__.py index a5bce1946f47..281e5f0098a6 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/__init__.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/__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 ._new_relic_observability_mgmt_client import NewRelicObservabilityMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._new_relic_observability_mgmt_client import NewRelicObservabilityMgmtClient # 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__ = [ "NewRelicObservabilityMgmtClient", ] -__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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_configuration.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_configuration.py index 61d754b8452e..ec04e88db830 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_configuration.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_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 NewRelicObservabilityMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class NewRelicObservabilityMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for NewRelicObservabilityMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +27,13 @@ class NewRelicObservabilityMgmtClientConfiguration(Configuration): # pylint: di :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 "2024-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-10-01". 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(NewRelicObservabilityMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2024-01-01") + api_version: str = kwargs.pop("api_version", "2024-10-01") 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-newrelicobservability/{}".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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_new_relic_observability_mgmt_client.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_new_relic_observability_mgmt_client.py index ee4c02f7a9df..1466698f3401 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_new_relic_observability_mgmt_client.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_new_relic_observability_mgmt_client.py @@ -8,9 +8,12 @@ from copy import deepcopy from typing import Any, TYPE_CHECKING +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse from azure.mgmt.core import ARMPipelineClient +from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy from . import models as _models from ._configuration import NewRelicObservabilityMgmtClientConfiguration @@ -28,11 +31,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class NewRelicObservabilityMgmtClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes +class NewRelicObservabilityMgmtClient: # pylint: disable=too-many-instance-attributes """NewRelicObservabilityMgmtClient. :ivar operations: Operations operations @@ -61,7 +63,7 @@ class NewRelicObservabilityMgmtClient: # pylint: disable=client-accepts-api-ver :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-10-01". 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 @@ -78,7 +80,25 @@ def __init__( self._config = NewRelicObservabilityMgmtClientConfiguration( 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) @@ -98,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 @@ -118,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) -> "NewRelicObservabilityMgmtClient": + def __enter__(self) -> Self: self._client.__enter__() return self diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_serialization.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_serialization.py index 4bae2292227b..b24ab2885450 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_serialization.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_serialization.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # -------------------------------------------------------------------------- # # Copyright (c) Microsoft Corporation. All rights reserved. @@ -24,7 +25,6 @@ # # -------------------------------------------------------------------------- -# pylint: skip-file # pyright: reportUnnecessaryTypeIgnoreComment=false from base64 import b64decode, b64encode @@ -52,7 +52,6 @@ MutableMapping, Type, List, - Mapping, ) try: @@ -63,8 +62,8 @@ import isodate # type: ignore -from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback -from azure.core.serialization import NULL as AzureCoreNull +from azure.core.exceptions import DeserializationError, SerializationError +from azure.core.serialization import NULL as CoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") @@ -91,6 +90,8 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: :param data: Input, could be bytes or stream (will be decoded with UTF8) or text :type data: str or bytes or IO :param str content_type: The content type. + :return: The deserialized data. + :rtype: object """ if hasattr(data, "read"): # Assume a stream @@ -112,7 +113,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: try: return json.loads(data_as_str) except ValueError as err: - raise DeserializationError("JSON is invalid: {}".format(err), err) + raise DeserializationError("JSON is invalid: {}".format(err), err) from err elif "xml" in (content_type or []): try: @@ -124,7 +125,7 @@ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: pass return ET.fromstring(data_as_str) # nosec - except ET.ParseError: + except ET.ParseError as err: # It might be because the server has an issue, and returned JSON with # content-type XML.... # So let's try a JSON load, and if it's still broken @@ -143,7 +144,9 @@ def _json_attemp(data): # The function hack is because Py2.7 messes up with exception # context otherwise. _LOGGER.critical("Wasn't XML not JSON, failing") - raise_with_traceback(DeserializationError, "XML is invalid") + raise DeserializationError("XML is invalid") from err + elif content_type.startswith("text/"): + return data_as_str raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) @classmethod @@ -153,6 +156,11 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], Use bytes and headers to NOT use any requests/aiohttp or whatever specific implementation. Headers will tested for "content-type" + + :param bytes body_bytes: The body of the response. + :param dict headers: The headers of the response. + :returns: The deserialized data. + :rtype: object """ # Try to use content-type from headers if available content_type = None @@ -170,13 +178,6 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], return None -try: - basestring # type: ignore - unicode_str = unicode # type: ignore -except NameError: - basestring = str - unicode_str = str - _LOGGER = logging.getLogger(__name__) try: @@ -189,15 +190,30 @@ class UTC(datetime.tzinfo): """Time Zone info for handling UTC""" def utcoffset(self, dt): - """UTF offset for UTC is 0.""" + """UTF offset for UTC is 0. + + :param datetime.datetime dt: The datetime + :returns: The offset + :rtype: datetime.timedelta + """ return datetime.timedelta(0) def tzname(self, dt): - """Timestamp representation.""" + """Timestamp representation. + + :param datetime.datetime dt: The datetime + :returns: The timestamp representation + :rtype: str + """ return "Z" def dst(self, dt): - """No daylight saving for UTC.""" + """No daylight saving for UTC. + + :param datetime.datetime dt: The datetime + :returns: The daylight saving time + :rtype: datetime.timedelta + """ return datetime.timedelta(hours=1) @@ -211,7 +227,7 @@ class _FixedOffset(datetime.tzinfo): # type: ignore :param datetime.timedelta offset: offset in timedelta format """ - def __init__(self, offset): + def __init__(self, offset) -> None: self.__offset = offset def utcoffset(self, dt): @@ -240,24 +256,26 @@ def __getinitargs__(self): _FLATTEN = re.compile(r"(? None: - self.additional_properties: Dict[str, Any] = {} - for k in kwargs: + self.additional_properties: Optional[Dict[str, Any]] = {} + for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) elif k in self._validation and self._validation[k].get("readonly", False): @@ -305,13 +330,23 @@ def __init__(self, **kwargs: Any) -> None: setattr(self, k, kwargs[k]) def __eq__(self, other: Any) -> bool: - """Compare objects by comparing all attributes.""" + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are equal + :rtype: bool + """ if isinstance(other, self.__class__): return self.__dict__ == other.__dict__ return False def __ne__(self, other: Any) -> bool: - """Compare objects by comparing all attributes.""" + """Compare objects by comparing all attributes. + + :param object other: The object to compare + :returns: True if objects are not equal + :rtype: bool + """ return not self.__eq__(other) def __str__(self) -> str: @@ -331,7 +366,11 @@ def is_xml_model(cls) -> bool: @classmethod def _create_xml_node(cls): - """Create XML node.""" + """Create XML node. + + :returns: The XML node + :rtype: xml.etree.ElementTree.Element + """ try: xml_map = cls._xml_map # type: ignore except AttributeError: @@ -340,7 +379,7 @@ def _create_xml_node(cls): return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: - """Return the JSON that would be sent to azure from this model. + """Return the JSON that would be sent to server from this model. This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. @@ -351,7 +390,9 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, keep_readonly=keep_readonly, **kwargs + ) def as_dict( self, @@ -385,12 +426,15 @@ def my_key_transformer(key, attr_desc, value): If you want XML serialization, you can pass the kwargs is_xml=True. + :param bool keep_readonly: If you want to serialize the readonly attributes :param function key_transformer: A key transformer function. :returns: A dict JSON compatible object :rtype: dict """ serializer = Serializer(self._infer_class_models()) - return serializer._serialize(self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs) + return serializer._serialize( # type: ignore # pylint: disable=protected-access + self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs + ) @classmethod def _infer_class_models(cls): @@ -400,7 +444,7 @@ def _infer_class_models(cls): client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} if cls.__name__ not in client_models: raise ValueError("Not Autorest generated code") - except Exception: + except Exception: # pylint: disable=broad-exception-caught # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. client_models = {cls.__name__: cls} return client_models @@ -413,9 +457,10 @@ def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = N :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model :raises: DeserializationError if something went wrong + :rtype: ModelType """ deserializer = Deserializer(cls._infer_class_models()) - return deserializer(cls.__name__, data, content_type=content_type) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore @classmethod def from_dict( @@ -431,9 +476,11 @@ def from_dict( and last_rest_key_case_insensitive_extractor) :param dict data: A dict using RestAPI structure + :param function key_extractors: A key extractor function. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model :raises: DeserializationError if something went wrong + :rtype: ModelType """ deserializer = Deserializer(cls._infer_class_models()) deserializer.key_extractors = ( # type: ignore @@ -445,7 +492,7 @@ def from_dict( if key_extractors is None else key_extractors ) - return deserializer(cls.__name__, data, content_type=content_type) + return deserializer(cls.__name__, data, content_type=content_type) # type: ignore @classmethod def _flatten_subtype(cls, key, objects): @@ -453,21 +500,25 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) + result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access return result @classmethod def _classify(cls, response, objects): """Check the class _subtype_map for any child classes. We want to ignore any inherited _subtype_maps. - Remove the polymorphic key from the initial data. + + :param dict response: The initial data + :param dict objects: The class objects + :returns: The class to be used + :rtype: class """ for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): subtype_value = None if not isinstance(response, ET.Element): rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.pop(rest_api_response_key, None) or response.pop(subtype_key, None) + subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) else: subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) if subtype_value: @@ -506,11 +557,13 @@ def _decode_attribute_map_key(key): inside the received data. :param str key: A key string from the generated code + :returns: The decoded key + :rtype: str """ return key.replace("\\.", ".") -class Serializer(object): +class Serializer: # pylint: disable=too-many-public-methods """Request object model serializer.""" basic_types = {str: "str", int: "int", bool: "bool", float: "float"} @@ -545,7 +598,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -561,17 +614,20 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} + self.dependencies: Dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True - def _serialize(self, target_obj, data_type=None, **kwargs): + def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals + self, target_obj, data_type=None, **kwargs + ): """Serialize data into a string according to type. - :param target_obj: The data to be serialized. + :param object target_obj: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str, dict :raises: SerializationError if serialization fails. + :returns: The serialized data. """ key_transformer = kwargs.get("key_transformer", self.key_transformer) keep_readonly = kwargs.get("keep_readonly", False) @@ -597,12 +653,14 @@ def _serialize(self, target_obj, data_type=None, **kwargs): serialized = {} if is_xml_model_serialization: - serialized = target_obj._create_xml_node() + serialized = target_obj._create_xml_node() # pylint: disable=protected-access try: - attributes = target_obj._attribute_map + attributes = target_obj._attribute_map # pylint: disable=protected-access for attr, attr_desc in attributes.items(): attr_name = attr - if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False): + if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access + attr_name, {} + ).get("readonly", False): continue if attr_name == "additional_properties" and attr_desc["key"] == "": @@ -638,7 +696,8 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if isinstance(new_attr, list): serialized.extend(new_attr) # type: ignore elif isinstance(new_attr, ET.Element): - # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces. + # If the down XML has no XML/Name, + # we MUST replace the tag with the local tag. But keeping the namespaces. if "name" not in getattr(orig_attr, "_xml_map", {}): splitted_tag = new_attr.tag.split("}") if len(splitted_tag) == 2: # Namespace @@ -649,7 +708,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): else: # That's a basic type # Integrate namespace if necessary local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = unicode_str(new_attr) + local_node.text = str(new_attr) serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore @@ -668,18 +727,18 @@ def _serialize(self, target_obj, data_type=None, **kwargs): except (AttributeError, KeyError, TypeError) as err: msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) - raise_with_traceback(SerializationError, msg, err) - else: - return serialized + raise SerializationError(msg) from err + return serialized def body(self, data, data_type, **kwargs): """Serialize data intended for a request body. - :param data: The data to be serialized. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: dict :raises: SerializationError if serialization fails. :raises: ValueError if data is None + :returns: The serialized request body """ # Just in case this is a dict @@ -708,18 +767,20 @@ def body(self, data, data_type, **kwargs): attribute_key_case_insensitive_extractor, last_rest_key_case_insensitive_extractor, ] - data = deserializer._deserialize(data_type, data) + data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access except DeserializationError as err: - raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err) + raise SerializationError("Unable to build a model: " + str(err)) from err return self._serialize(data, data_type, **kwargs) def url(self, name, data, data_type, **kwargs): """Serialize data intended for a URL path. - :param data: The data to be serialized. + :param str name: The name of the URL path parameter. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str + :returns: The serialized URL path :raises: TypeError if serialization fails. :raises: ValueError if data is None """ @@ -730,30 +791,30 @@ def url(self, name, data, data_type, **kwargs): if kwargs.get("skip_quote") is True: output = str(output) + output = output.replace("{", quote("{")).replace("}", quote("}")) else: output = quote(str(output), safe="") - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return output + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return output def query(self, name, data, data_type, **kwargs): """Serialize data intended for a URL query. - :param data: The data to be serialized. + :param str name: The name of the query parameter. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. - :keyword bool skip_quote: Whether to skip quote the serialized result. - Defaults to False. - :rtype: str + :rtype: str, list :raises: TypeError if serialization fails. :raises: ValueError if data is None + :returns: The serialized query parameter """ try: # Treat the list aside, since we don't want to encode the div separator if data_type.startswith("["): internal_data_type = data_type[1:-1] do_quote = not kwargs.get("skip_quote", False) - return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)) + return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) # Not a list, regular serialization output = self.serialize_data(data, data_type, **kwargs) @@ -763,19 +824,20 @@ def query(self, name, data, data_type, **kwargs): output = str(output) else: output = quote(str(output), safe="") - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return str(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) def header(self, name, data, data_type, **kwargs): """Serialize data intended for a request header. - :param data: The data to be serialized. + :param str name: The name of the header. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. :rtype: str :raises: TypeError if serialization fails. :raises: ValueError if data is None + :returns: The serialized header """ try: if data_type in ["[str]"]: @@ -784,32 +846,31 @@ def header(self, name, data, data_type, **kwargs): output = self.serialize_data(data, data_type, **kwargs) if data_type == "bool": output = json.dumps(output) - except SerializationError: - raise TypeError("{} must be type {}.".format(name, data_type)) - else: - return str(output) + except SerializationError as exc: + raise TypeError("{} must be type {}.".format(name, data_type)) from exc + return str(output) def serialize_data(self, data, data_type, **kwargs): """Serialize generic data according to supplied data type. - :param data: The data to be serialized. + :param object data: The data to be serialized. :param str data_type: The type to be serialized from. - :param bool required: Whether it's essential that the data not be - empty or None :raises: AttributeError if required data is None. :raises: ValueError if data is None :raises: SerializationError if serialization fails. + :returns: The serialized data. + :rtype: str, int, float, bool, dict, list """ if data is None: raise ValueError("No value for given attribute") try: - if data is AzureCoreNull: + if data is CoreNull: return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) - elif data_type in self.serialize_type: + if data_type in self.serialize_type: return self.serialize_type[data_type](data, **kwargs) # If dependencies is empty, try with current data class @@ -824,12 +885,11 @@ def serialize_data(self, data, data_type, **kwargs): except (ValueError, TypeError) as err: msg = "Unable to serialize value: {!r} as type: {!r}." - raise_with_traceback(SerializationError, msg.format(data, data_type), err) - else: - return self._serialize(data, **kwargs) + raise SerializationError(msg.format(data, data_type)) from err + return self._serialize(data, **kwargs) @classmethod - def _get_custom_serializers(cls, data_type, **kwargs): + def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) if custom_serializer: return custom_serializer @@ -845,23 +905,26 @@ def serialize_basic(cls, data, data_type, **kwargs): - basic_types_serializers dict[str, callable] : If set, use the callable as serializer - is_xml bool : If set, use xml_basic_types_serializers - :param data: Object to be serialized. + :param obj data: Object to be serialized. :param str data_type: Type of object in the iterable. + :rtype: str, int, float, bool + :return: serialized object """ custom_serializer = cls._get_custom_serializers(data_type, **kwargs) if custom_serializer: return custom_serializer(data) if data_type == "str": return cls.serialize_unicode(data) - return eval(data_type)(data) # nosec + return eval(data_type)(data) # nosec # pylint: disable=eval-used @classmethod def serialize_unicode(cls, data): """Special handling for serializing unicode strings in Py2. Encode to UTF-8 if unicode, otherwise handle as a str. - :param data: Object to be serialized. + :param str data: Object to be serialized. :rtype: str + :return: serialized object """ try: # If I received an enum, return its value return data.value @@ -875,8 +938,7 @@ def serialize_unicode(cls, data): return data except NameError: return str(data) - else: - return str(data) + return str(data) def serialize_iter(self, data, iter_type, div=None, **kwargs): """Serialize iterable. @@ -886,15 +948,13 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs): serialization_ctxt['type'] should be same as data_type. - is_xml bool : If set, serialize as XML - :param list attr: Object to be serialized. + :param list data: Object to be serialized. :param str iter_type: Type of object in the iterable. - :param bool required: Whether the objects in the iterable must - not be None or empty. :param str div: If set, this str will be used to combine the elements in the iterable into a combined string. Default is 'None'. - :keyword bool do_quote: Whether to quote the serialized result of each iterable element. Defaults to False. :rtype: list, str + :return: serialized iterable """ if isinstance(data, str): raise SerializationError("Refuse str type as a valid iter type.") @@ -949,9 +1009,8 @@ def serialize_dict(self, attr, dict_type, **kwargs): :param dict attr: Object to be serialized. :param str dict_type: Type of object in the dictionary. - :param bool required: Whether the objects in the dictionary must - not be None or empty. :rtype: dict + :return: serialized dictionary """ serialization_ctxt = kwargs.get("serialization_ctxt", {}) serialized = {} @@ -975,7 +1034,7 @@ def serialize_dict(self, attr, dict_type, **kwargs): return serialized - def serialize_object(self, attr, **kwargs): + def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements """Serialize a generic object. This will be handled as a dictionary. If object passed in is not a basic type (str, int, float, dict, list) it will simply be @@ -983,6 +1042,7 @@ def serialize_object(self, attr, **kwargs): :param dict attr: Object to be serialized. :rtype: dict or str + :return: serialized object """ if attr is None: return None @@ -993,7 +1053,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) if obj_type is _long_type: return self.serialize_long(attr) - if obj_type is unicode_str: + if obj_type is str: return self.serialize_unicode(attr) if obj_type is datetime.datetime: return self.serialize_iso(attr) @@ -1007,7 +1067,7 @@ def serialize_object(self, attr, **kwargs): return self.serialize_decimal(attr) # If it's a model or I know this dependency, serialize as a Model - elif obj_type in self.dependencies.values() or isinstance(attr, Model): + if obj_type in self.dependencies.values() or isinstance(attr, Model): return self._serialize(attr) if obj_type == dict: @@ -1038,56 +1098,61 @@ def serialize_enum(attr, enum_obj=None): try: enum_obj(result) # type: ignore return result - except ValueError: + except ValueError as exc: for enum_value in enum_obj: # type: ignore if enum_value.value.lower() == str(attr).lower(): return enum_value.value error = "{!r} is not valid value for enum {!r}" - raise SerializationError(error.format(attr, enum_obj)) + raise SerializationError(error.format(attr, enum_obj)) from exc @staticmethod - def serialize_bytearray(attr, **kwargs): + def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument """Serialize bytearray into base-64 string. - :param attr: Object to be serialized. + :param str attr: Object to be serialized. :rtype: str + :return: serialized base64 """ return b64encode(attr).decode() @staticmethod - def serialize_base64(attr, **kwargs): + def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument """Serialize str into base-64 string. - :param attr: Object to be serialized. + :param str attr: Object to be serialized. :rtype: str + :return: serialized base64 """ encoded = b64encode(attr).decode("ascii") return encoded.strip("=").replace("+", "-").replace("/", "_") @staticmethod - def serialize_decimal(attr, **kwargs): + def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument """Serialize Decimal object to float. - :param attr: Object to be serialized. + :param decimal attr: Object to be serialized. :rtype: float + :return: serialized decimal """ return float(attr) @staticmethod - def serialize_long(attr, **kwargs): + def serialize_long(attr, **kwargs): # pylint: disable=unused-argument """Serialize long (Py2) or int (Py3). - :param attr: Object to be serialized. + :param int attr: Object to be serialized. :rtype: int/long + :return: serialized long """ return _long_type(attr) @staticmethod - def serialize_date(attr, **kwargs): + def serialize_date(attr, **kwargs): # pylint: disable=unused-argument """Serialize Date object into ISO-8601 formatted string. :param Date attr: Object to be serialized. :rtype: str + :return: serialized date """ if isinstance(attr, str): attr = isodate.parse_date(attr) @@ -1095,11 +1160,12 @@ def serialize_date(attr, **kwargs): return t @staticmethod - def serialize_time(attr, **kwargs): + def serialize_time(attr, **kwargs): # pylint: disable=unused-argument """Serialize Time object into ISO-8601 formatted string. :param datetime.time attr: Object to be serialized. :rtype: str + :return: serialized time """ if isinstance(attr, str): attr = isodate.parse_time(attr) @@ -1109,30 +1175,32 @@ def serialize_time(attr, **kwargs): return t @staticmethod - def serialize_duration(attr, **kwargs): + def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument """Serialize TimeDelta object into ISO-8601 formatted string. :param TimeDelta attr: Object to be serialized. :rtype: str + :return: serialized duration """ if isinstance(attr, str): attr = isodate.parse_duration(attr) return isodate.duration_isoformat(attr) @staticmethod - def serialize_rfc(attr, **kwargs): + def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into RFC-1123 formatted string. :param Datetime attr: Object to be serialized. :rtype: str :raises: TypeError if format invalid. + :return: serialized rfc """ try: if not attr.tzinfo: _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") utc = attr.utctimetuple() - except AttributeError: - raise TypeError("RFC1123 object must be valid Datetime object.") + except AttributeError as exc: + raise TypeError("RFC1123 object must be valid Datetime object.") from exc return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( Serializer.days[utc.tm_wday], @@ -1145,12 +1213,13 @@ def serialize_rfc(attr, **kwargs): ) @staticmethod - def serialize_iso(attr, **kwargs): + def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into ISO-8601 formatted string. :param Datetime attr: Object to be serialized. :rtype: str :raises: SerializationError if format invalid. + :return: serialized iso """ if isinstance(attr, str): attr = isodate.parse_datetime(attr) @@ -1170,19 +1239,20 @@ def serialize_iso(attr, **kwargs): return date + microseconds + "Z" except (ValueError, OverflowError) as err: msg = "Unable to serialize datetime object." - raise_with_traceback(SerializationError, msg, err) + raise SerializationError(msg) from err except AttributeError as err: msg = "ISO-8601 object must be valid Datetime object." - raise_with_traceback(TypeError, msg, err) + raise TypeError(msg) from err @staticmethod - def serialize_unix(attr, **kwargs): + def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument """Serialize Datetime object into IntTime format. This is represented as seconds. :param Datetime attr: Object to be serialized. :rtype: int :raises: SerializationError if format invalid + :return: serialied unix """ if isinstance(attr, int): return attr @@ -1190,11 +1260,11 @@ def serialize_unix(attr, **kwargs): if not attr.tzinfo: _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") return int(calendar.timegm(attr.utctimetuple())) - except AttributeError: - raise TypeError("Unix time object must be valid Datetime object.") + except AttributeError as exc: + raise TypeError("Unix time object must be valid Datetime object.") from exc -def rest_key_extractor(attr, attr_desc, data): +def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument key = attr_desc["key"] working_data = data @@ -1209,14 +1279,15 @@ def rest_key_extractor(attr, attr_desc, data): if working_data is None: # If at any point while following flatten JSON path see None, it means # that all properties under are None as well - # https://github.com/Azure/msrest-for-python/issues/197 return None key = ".".join(dict_keys[1:]) return working_data.get(key) -def rest_key_case_insensitive_extractor(attr, attr_desc, data): +def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements + attr, attr_desc, data +): key = attr_desc["key"] working_data = data @@ -1230,7 +1301,6 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data): if working_data is None: # If at any point while following flatten JSON path see None, it means # that all properties under are None as well - # https://github.com/Azure/msrest-for-python/issues/197 return None key = ".".join(dict_keys[1:]) @@ -1238,17 +1308,29 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, data): return attribute_key_case_insensitive_extractor(key, None, working_data) -def last_rest_key_extractor(attr, attr_desc, data): - """Extract the attribute in "data" based on the last part of the JSON path key.""" +def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument + """Extract the attribute in "data" based on the last part of the JSON path key. + + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute + """ key = attr_desc["key"] dict_keys = _FLATTEN.split(key) return attribute_key_extractor(dict_keys[-1], None, data) -def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument """Extract the attribute in "data" based on the last part of the JSON path key. This is the case insensitive version of "last_rest_key_extractor" + :param str attr: The attribute to extract + :param dict attr_desc: The attribute description + :param dict data: The data to extract from + :rtype: object + :returns: The extracted attribute """ key = attr_desc["key"] dict_keys = _FLATTEN.split(key) @@ -1285,7 +1367,7 @@ def _extract_name_from_internal_type(internal_type): return xml_name -def xml_key_extractor(attr, attr_desc, data): +def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements if isinstance(data, dict): return None @@ -1337,22 +1419,21 @@ def xml_key_extractor(attr, attr_desc, data): if is_iter_type: if is_wrapped: return None # is_wrapped no node, we want None - else: - return [] # not wrapped, assume empty list + return [] # not wrapped, assume empty list return None # Assume it's not there, maybe an optional node. # If is_iter_type and not wrapped, return all found children if is_iter_type: if not is_wrapped: return children - else: # Iter and wrapped, should have found one node only (the wrap one) - if len(children) != 1: - raise DeserializationError( - "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( - xml_name - ) + # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( # pylint: disable=line-too-long + xml_name ) - return list(children[0]) # Might be empty list and that's ok. + ) + return list(children[0]) # Might be empty list and that's ok. # Here it's not a itertype, we should have found one element only or empty if len(children) > 1: @@ -1360,7 +1441,7 @@ def xml_key_extractor(attr, attr_desc, data): return children[0] -class Deserializer(object): +class Deserializer: """Response object model deserializer. :param dict classes: Class type dictionary for deserializing complex types. @@ -1369,9 +1450,9 @@ class Deserializer(object): basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): + def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1391,7 +1472,7 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} + self.dependencies: Dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1409,11 +1490,12 @@ def __call__(self, target_obj, response_data, content_type=None): :param str content_type: Swagger "produces" if available. :raises: DeserializationError if deserialization fails. :return: Deserialized object. + :rtype: object """ data = self._unpack_content(response_data, content_type) return self._deserialize(target_obj, data) - def _deserialize(self, target_obj, data): + def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements """Call the deserializer on a model. Data needs to be already deserialized as JSON or XML ElementTree @@ -1422,12 +1504,13 @@ def _deserialize(self, target_obj, data): :param object data: Object to deserialize. :raises: DeserializationError if deserialization fails. :return: Deserialized object. + :rtype: object """ # This is already a model, go recursive just in case if hasattr(data, "_attribute_map"): constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] try: - for attr, mapconfig in data._attribute_map.items(): + for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access if attr in constants: continue value = getattr(data, attr) @@ -1444,15 +1527,15 @@ def _deserialize(self, target_obj, data): response, class_name = self._classify_target(target_obj, data) - if isinstance(response, basestring): + if isinstance(response, str): return self.deserialize_data(data, response) - elif isinstance(response, type) and issubclass(response, Enum): + if isinstance(response, type) and issubclass(response, Enum): return self.deserialize_enum(data, response) - if data is None: + if data is None or data is CoreNull: return data try: - attributes = response._attribute_map # type: ignore + attributes = response._attribute_map # type: ignore # pylint: disable=protected-access d_attrs = {} for attr, attr_desc in attributes.items(): # Check empty string. If it's not empty, someone has a real "additionalProperties"... @@ -1481,10 +1564,9 @@ def _deserialize(self, target_obj, data): d_attrs[attr] = value except (AttributeError, TypeError, KeyError) as err: msg = "Unable to deserialize to object: " + class_name # type: ignore - raise_with_traceback(DeserializationError, msg, err) - else: - additional_properties = self._build_additional_properties(attributes, data) - return self._instantiate_model(response, d_attrs, additional_properties) + raise DeserializationError(msg) from err + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) def _build_additional_properties(self, attribute_map, data): if not self.additional_properties_detection: @@ -1511,18 +1593,20 @@ def _classify_target(self, target, data): :param str target: The target object type to deserialize to. :param str/dict data: The response data to deserialize. + :return: The classified target object and its class name. + :rtype: tuple """ if target is None: return None, None - if isinstance(target, basestring): + if isinstance(target, str): try: target = self.dependencies[target] except KeyError: return target, target try: - target = target._classify(data, self.dependencies) + target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access except AttributeError: pass # Target is not a Model, no classify return target, target.__class__.__name__ # type: ignore @@ -1537,10 +1621,12 @@ def failsafe_deserialize(self, target_obj, data, content_type=None): :param str target_obj: The target object type to deserialize to. :param str/dict data: The response data to deserialize. :param str content_type: Swagger "produces" if available. + :return: Deserialized object. + :rtype: object """ try: return self(target_obj, data, content_type=content_type) - except: + except: # pylint: disable=bare-except _LOGGER.debug( "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True ) @@ -1558,10 +1644,12 @@ def _unpack_content(raw_data, content_type=None): If raw_data is something else, bypass all logic and return it directly. - :param raw_data: Data to be processed. - :param content_type: How to parse if raw_data is a string/bytes. + :param obj raw_data: Data to be processed. + :param str content_type: How to parse if raw_data is a string/bytes. :raises JSONDecodeError: If JSON is requested and parsing is impossible. :raises UnicodeDecodeError: If bytes is not UTF8 + :rtype: object + :return: Unpacked content. """ # Assume this is enough to detect a Pipeline Response without importing it context = getattr(raw_data, "context", {}) @@ -1578,31 +1666,42 @@ def _unpack_content(raw_data, content_type=None): if hasattr(raw_data, "_content_consumed"): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): + if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data def _instantiate_model(self, response, attrs, additional_properties=None): """Instantiate a response model passing in deserialized args. - :param response: The response model class. - :param d_attrs: The deserialized response attributes. + :param Response response: The response model class. + :param dict attrs: The deserialized response attributes. + :param dict additional_properties: Additional properties to be set. + :rtype: Response + :return: The instantiated response model. """ if callable(response): subtype = getattr(response, "_subtype_map", {}) try: - readonly = [k for k, v in response._validation.items() if v.get("readonly")] - const = [k for k, v in response._validation.items() if v.get("constant")] + readonly = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") + ] + const = [ + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") + ] kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} response_obj = response(**kwargs) for attr in readonly: setattr(response_obj, attr, attrs.get(attr)) if additional_properties: - response_obj.additional_properties = additional_properties + response_obj.additional_properties = additional_properties # type: ignore return response_obj except TypeError as err: msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore - raise DeserializationError(msg + str(err)) + raise DeserializationError(msg + str(err)) from err else: try: for attr, value in attrs.items(): @@ -1611,15 +1710,16 @@ def _instantiate_model(self, response, attrs, additional_properties=None): except Exception as exp: msg = "Unable to populate response model. " msg += "Type: {}, Error: {}".format(type(response), exp) - raise DeserializationError(msg) + raise DeserializationError(msg) from exp - def deserialize_data(self, data, data_type): + def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements """Process data for deserialization according to data type. :param str data: The response string to be deserialized. :param str data_type: The type to deserialize to. :raises: DeserializationError if deserialization fails. :return: Deserialized object. + :rtype: object """ if data is None: return data @@ -1633,7 +1733,11 @@ def deserialize_data(self, data, data_type): if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): return data - is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"] + is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment + "object", + "[]", + r"{}", + ] if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: return None data_val = self.deserialize_type[data_type](data) @@ -1652,15 +1756,15 @@ def deserialize_data(self, data, data_type): except (ValueError, TypeError, AttributeError) as err: msg = "Unable to deserialize response data." msg += " Data: {}, {}".format(data, data_type) - raise_with_traceback(DeserializationError, msg, err) - else: - return self._deserialize(obj_type, data) + raise DeserializationError(msg) from err + return self._deserialize(obj_type, data) def deserialize_iter(self, attr, iter_type): """Deserialize an iterable. :param list attr: Iterable to be deserialized. :param str iter_type: The type of object in the iterable. + :return: Deserialized iterable. :rtype: list """ if attr is None: @@ -1677,6 +1781,7 @@ def deserialize_dict(self, attr, dict_type): :param dict/list attr: Dictionary to be deserialized. Also accepts a list of key, value pairs. :param str dict_type: The object type of the items in the dictionary. + :return: Deserialized dictionary. :rtype: dict """ if isinstance(attr, list): @@ -1687,11 +1792,12 @@ def deserialize_dict(self, attr, dict_type): attr = {el.tag: el.text for el in attr} return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} - def deserialize_object(self, attr, **kwargs): + def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements """Deserialize a generic object. This will be handled as a dictionary. :param dict attr: Dictionary to be deserialized. + :return: Deserialized object. :rtype: dict :raises: TypeError if non-builtin datatype encountered. """ @@ -1700,7 +1806,7 @@ def deserialize_object(self, attr, **kwargs): if isinstance(attr, ET.Element): # Do no recurse on XML, just return the tree as-is return attr - if isinstance(attr, basestring): + if isinstance(attr, str): return self.deserialize_basic(attr, "str") obj_type = type(attr) if obj_type in self.basic_types: @@ -1726,11 +1832,10 @@ def deserialize_object(self, attr, **kwargs): pass return deserialized - else: - error = "Cannot deserialize generic object with type: " - raise TypeError(error + str(obj_type)) + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) - def deserialize_basic(self, attr, data_type): + def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements """Deserialize basic builtin data type from string. Will attempt to convert to str, int, float and bool. This function will also accept '1', '0', 'true' and 'false' as @@ -1738,6 +1843,7 @@ def deserialize_basic(self, attr, data_type): :param str attr: response string to be deserialized. :param str data_type: deserialization data type. + :return: Deserialized basic type. :rtype: str, int, float or bool :raises: TypeError if string format is not valid. """ @@ -1749,24 +1855,23 @@ def deserialize_basic(self, attr, data_type): if data_type == "str": # None or '', node is empty string. return "" - else: - # None or '', node with a strong type is None. - # Don't try to model "empty bool" or "empty int" - return None + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None if data_type == "bool": if attr in [True, False, 1, 0]: return bool(attr) - elif isinstance(attr, basestring): + if isinstance(attr, str): if attr.lower() in ["true", "1"]: return True - elif attr.lower() in ["false", "0"]: + if attr.lower() in ["false", "0"]: return False raise TypeError("Invalid boolean value: {}".format(attr)) if data_type == "str": return self.deserialize_unicode(attr) - return eval(data_type)(attr) # nosec + return eval(data_type)(attr) # nosec # pylint: disable=eval-used @staticmethod def deserialize_unicode(data): @@ -1774,6 +1879,7 @@ def deserialize_unicode(data): as a string. :param str data: response string to be deserialized. + :return: Deserialized string. :rtype: str or unicode """ # We might be here because we have an enum modeled as string, @@ -1787,8 +1893,7 @@ def deserialize_unicode(data): return data except NameError: return str(data) - else: - return str(data) + return str(data) @staticmethod def deserialize_enum(data, enum_obj): @@ -1800,6 +1905,7 @@ def deserialize_enum(data, enum_obj): :param str data: Response string to be deserialized. If this value is None or invalid it will be returned as-is. :param Enum enum_obj: Enum object to deserialize to. + :return: Deserialized enum object. :rtype: Enum """ if isinstance(data, enum_obj) or data is None: @@ -1808,12 +1914,11 @@ def deserialize_enum(data, enum_obj): data = data.value if isinstance(data, int): # Workaround. We might consider remove it in the future. - # https://github.com/Azure/azure-rest-api-specs/issues/141 try: return list(enum_obj.__members__.values())[data] - except IndexError: + except IndexError as exc: error = "{!r} is not a valid index for enum {!r}" - raise DeserializationError(error.format(data, enum_obj)) + raise DeserializationError(error.format(data, enum_obj)) from exc try: return enum_obj(str(data)) except ValueError: @@ -1829,6 +1934,7 @@ def deserialize_bytearray(attr): """Deserialize string into bytearray. :param str attr: response string to be deserialized. + :return: Deserialized bytearray :rtype: bytearray :raises: TypeError if string format invalid. """ @@ -1841,6 +1947,7 @@ def deserialize_base64(attr): """Deserialize base64 encoded string into string. :param str attr: response string to be deserialized. + :return: Deserialized base64 string :rtype: bytearray :raises: TypeError if string format invalid. """ @@ -1856,22 +1963,24 @@ def deserialize_decimal(attr): """Deserialize string into Decimal object. :param str attr: response string to be deserialized. - :rtype: Decimal + :return: Deserialized decimal :raises: DeserializationError if string format invalid. + :rtype: decimal """ if isinstance(attr, ET.Element): attr = attr.text try: - return decimal.Decimal(attr) # type: ignore + return decimal.Decimal(str(attr)) # type: ignore except decimal.DecimalException as err: msg = "Invalid decimal {}".format(attr) - raise_with_traceback(DeserializationError, msg, err) + raise DeserializationError(msg) from err @staticmethod def deserialize_long(attr): """Deserialize string into long (Py2) or int (Py3). :param str attr: response string to be deserialized. + :return: Deserialized int :rtype: long or int :raises: ValueError if string format invalid. """ @@ -1884,6 +1993,7 @@ def deserialize_duration(attr): """Deserialize ISO-8601 formatted string into TimeDelta object. :param str attr: response string to be deserialized. + :return: Deserialized duration :rtype: TimeDelta :raises: DeserializationError if string format invalid. """ @@ -1893,15 +2003,15 @@ def deserialize_duration(attr): duration = isodate.parse_duration(attr) except (ValueError, OverflowError, AttributeError) as err: msg = "Cannot deserialize duration object." - raise_with_traceback(DeserializationError, msg, err) - else: - return duration + raise DeserializationError(msg) from err + return duration @staticmethod def deserialize_date(attr): """Deserialize ISO-8601 formatted string into Date object. :param str attr: response string to be deserialized. + :return: Deserialized date :rtype: Date :raises: DeserializationError if string format invalid. """ @@ -1910,13 +2020,14 @@ def deserialize_date(attr): if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore raise DeserializationError("Date must have only digits and -. Received: %s" % attr) # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - return isodate.parse_date(attr, defaultmonth=None, defaultday=None) + return isodate.parse_date(attr, defaultmonth=0, defaultday=0) @staticmethod def deserialize_time(attr): """Deserialize ISO-8601 formatted string into time object. :param str attr: response string to be deserialized. + :return: Deserialized time :rtype: datetime.time :raises: DeserializationError if string format invalid. """ @@ -1931,6 +2042,7 @@ def deserialize_rfc(attr): """Deserialize RFC-1123 formatted string into Datetime object. :param str attr: response string to be deserialized. + :return: Deserialized RFC datetime :rtype: Datetime :raises: DeserializationError if string format invalid. """ @@ -1945,15 +2057,15 @@ def deserialize_rfc(attr): date_obj = date_obj.astimezone(tz=TZ_UTC) except ValueError as err: msg = "Cannot deserialize to rfc datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj @staticmethod def deserialize_iso(attr): """Deserialize ISO-8601 formatted string into Datetime object. :param str attr: response string to be deserialized. + :return: Deserialized ISO datetime :rtype: Datetime :raises: DeserializationError if string format invalid. """ @@ -1982,9 +2094,8 @@ def deserialize_iso(attr): raise OverflowError("Hit max or min date") except (ValueError, OverflowError, AttributeError) as err: msg = "Cannot deserialize datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj @staticmethod def deserialize_unix(attr): @@ -1992,15 +2103,16 @@ def deserialize_unix(attr): This is represented as seconds. :param int attr: Object to be serialized. + :return: Deserialized datetime :rtype: Datetime :raises: DeserializationError if format invalid """ if isinstance(attr, ET.Element): attr = int(attr.text) # type: ignore try: + attr = int(attr) date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) except ValueError as err: msg = "Cannot deserialize to unix datetime object." - raise_with_traceback(DeserializationError, msg, err) - else: - return date_obj + raise DeserializationError(msg) from err + return date_obj diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_vendor.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_vendor.py deleted file mode 100644 index 0dafe0e287ff..000000000000 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_version.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_version.py index 59deb8c7263b..48944bf3938a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_version.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.0" +VERSION = "2.0.0" diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/__init__.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/__init__.py index a91e842fb598..af4129c8654b 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/__init__.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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 ._new_relic_observability_mgmt_client import NewRelicObservabilityMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._new_relic_observability_mgmt_client import NewRelicObservabilityMgmtClient # 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__ = [ "NewRelicObservabilityMgmtClient", ] -__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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_configuration.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_configuration.py index d89523564308..fc8d1231f1ba 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_configuration.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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 NewRelicObservabilityMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class NewRelicObservabilityMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long """Configuration for NewRelicObservabilityMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -29,14 +27,13 @@ class NewRelicObservabilityMgmtClientConfiguration(Configuration): # pylint: di :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 "2024-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-10-01". 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(NewRelicObservabilityMgmtClientConfiguration, self).__init__(**kwargs) - api_version: str = kwargs.pop("api_version", "2024-01-01") + api_version: str = kwargs.pop("api_version", "2024-10-01") 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-newrelicobservability/{}".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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_new_relic_observability_mgmt_client.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_new_relic_observability_mgmt_client.py index a5b3e69f5302..c89cb84ac171 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_new_relic_observability_mgmt_client.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/_new_relic_observability_mgmt_client.py @@ -8,9 +8,12 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient +from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy from .. import models as _models from .._serialization import Deserializer, Serializer @@ -28,11 +31,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class NewRelicObservabilityMgmtClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes +class NewRelicObservabilityMgmtClient: # pylint: disable=too-many-instance-attributes """NewRelicObservabilityMgmtClient. :ivar operations: Operations operations @@ -61,7 +63,7 @@ class NewRelicObservabilityMgmtClient: # pylint: disable=client-accepts-api-ver :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2024-10-01". 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 @@ -78,7 +80,25 @@ def __init__( self._config = NewRelicObservabilityMgmtClientConfiguration( 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) @@ -98,7 +118,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 @@ -118,12 +140,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) -> "NewRelicObservabilityMgmtClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/__init__.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/__init__.py index 187704a663a4..d718a21b2351 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/__init__.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/__init__.py @@ -5,19 +5,25 @@ # 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 ._operations import Operations -from ._accounts_operations import AccountsOperations -from ._monitors_operations import MonitorsOperations -from ._organizations_operations import OrganizationsOperations -from ._plans_operations import PlansOperations -from ._billing_info_operations import BillingInfoOperations -from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations -from ._tag_rules_operations import TagRulesOperations -from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._accounts_operations import AccountsOperations # type: ignore +from ._monitors_operations import MonitorsOperations # type: ignore +from ._organizations_operations import OrganizationsOperations # type: ignore +from ._plans_operations import PlansOperations # type: ignore +from ._billing_info_operations import BillingInfoOperations # type: ignore +from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations # type: ignore +from ._tag_rules_operations import TagRulesOperations # 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__ = [ @@ -31,5 +37,5 @@ "TagRulesOperations", "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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_accounts_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_accounts_operations.py index 4a57f41f0275..e589b4f925fb 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_accounts_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_accounts_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._accounts_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]] @@ -60,7 +62,6 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" :type user_email: str :param location: Location for NewRelic. Required. :type location: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AccountResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.AccountResource] @@ -72,7 +73,7 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AccountsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -83,17 +84,15 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, user_email=user_email, location=location, 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 @@ -105,13 +104,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("AccountsListResponse", pipeline_response) @@ -121,11 +119,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,5 +135,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/accounts"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_billing_info_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_billing_info_operations.py index ebf5b9bd3008..d7bc6da10032 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_billing_info_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_billing_info_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, Optional, TypeVar from azure.core.exceptions import ( @@ -17,16 +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.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._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]] @@ -61,12 +63,11 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: BillingInfoResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.BillingInfoResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -80,21 +81,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.BillingInfoResponse] = 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 @@ -104,13 +103,9 @@ 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("BillingInfoResponse", pipeline_response) + deserialized = self._deserialize("BillingInfoResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getBillingInfo" - } + return deserialized # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_connected_partner_resources_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_connected_partner_resources_operations.py index f3838d7911d7..d8b3d9ca9971 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_connected_partner_resources_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_connected_partner_resources_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._connected_partner_resources_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]] @@ -56,6 +58,7 @@ def __init__(self, *args, **kwargs) -> None: def list( self, resource_group_name: str, monitor_name: str, body: Optional[str] = None, **kwargs: Any ) -> AsyncIterable["_models.ConnectedPartnerResourcesListFormat"]: + # pylint: disable=line-too-long """List of all active deployments that are associated with the marketplace subscription linked to the given monitor. @@ -69,7 +72,6 @@ def list( :type monitor_name: str :param body: Email Id of the user. Default value is None. :type body: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ConnectedPartnerResourcesListFormat or the result of cls(response) :rtype: @@ -83,7 +85,7 @@ def list( content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/json")) cls: ClsType[_models.ConnectedPartnerResourcesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -98,19 +100,17 @@ def prepare_request(next_link=None): else: _content = None - 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, content_type=content_type, content=_content, - 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 @@ -122,13 +122,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("ConnectedPartnerResourcesListResponse", pipeline_response) @@ -138,11 +137,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 @@ -154,7 +153,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listConnectedPartnerResources" - } diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitored_subscriptions_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitored_subscriptions_operations.py index 9607777f6b24..afa466fc02f8 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitored_subscriptions_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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,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,15 +31,18 @@ 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_create_or_update_request, build_delete_request, build_get_request, build_list_request, 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]] @@ -66,6 +70,7 @@ def __init__(self, *args, **kwargs) -> None: def list( self, resource_group_name: str, monitor_name: str, **kwargs: Any ) -> AsyncIterable["_models.MonitoredSubscriptionProperties"]: + # pylint: disable=line-too-long """List the subscriptions currently being monitored by the NewRelic monitor resource. List the subscriptions currently being monitored by the NewRelic monitor resource. @@ -75,7 +80,6 @@ def list( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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: @@ -88,7 +92,7 @@ def list( 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, @@ -99,17 +103,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 @@ -121,13 +123,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("MonitoredSubscriptionPropertiesList", pipeline_response) @@ -137,11 +138,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 @@ -154,10 +155,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions" - } - @distributed_trace_async async def get( self, @@ -178,12 +175,11 @@ async def get( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :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.newrelicobservability.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -197,22 +193,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 @@ -222,26 +216,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/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore - async def _createor_update_initial( + async def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> _models.MonitoredSubscriptionProperties: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -254,7 +244,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[_models.MonitoredSubscriptionProperties] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -267,7 +257,7 @@ async def _createor_update_initial( else: _json = None - request = build_createor_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -276,42 +266,37 @@ 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]: + 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("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, {}) # type: ignore return deserialized # type: ignore - _createor_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } - @overload - async def begin_createor_update( + async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, @@ -338,14 +323,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,12 +331,12 @@ async def begin_createor_update( """ @overload - async def begin_createor_update( + async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -377,18 +354,10 @@ async def begin_createor_update( Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName :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: @@ -397,12 +366,12 @@ async def begin_createor_update( """ @distributed_trace_async - async def begin_createor_update( + async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - 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 NewRelic monitor resource. @@ -417,20 +386,10 @@ async def begin_createor_update( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.newrelicobservability.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.newrelicobservability.models.MonitoredSubscriptionProperties or + IO[bytes] :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -447,7 +406,7 @@ async def begin_createor_update( 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._createor_update_initial( + raw_result = await self._create_or_update_initial( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -459,12 +418,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: @@ -474,27 +434,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/NewRelic.Observability/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: Union[str, _models.ConfigurationName], - 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, @@ -507,7 +465,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 @@ -520,7 +478,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, @@ -529,41 +487,38 @@ 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 response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) - if response.status_code == 202: response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) - if cls: - return cls(pipeline_response, deserialized, response_headers) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) - return deserialized + if cls: + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload async def begin_update( @@ -593,14 +548,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: @@ -614,7 +561,7 @@ async def begin_update( resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -632,18 +579,10 @@ async def begin_update( Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName :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: @@ -657,7 +596,7 @@ async def begin_update( resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - 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 NewRelic monitor resource. @@ -672,20 +611,10 @@ async def begin_update( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.newrelicobservability.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.newrelicobservability.models.MonitoredSubscriptionProperties or + IO[bytes] :return: An instance of AsyncLROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -714,12 +643,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: @@ -729,26 +659,24 @@ 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/NewRelic.Observability/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: Union[str, _models.ConfigurationName], **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -760,29 +688,32 @@ 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 [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) @@ -791,12 +722,12 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -818,14 +749,6 @@ async def begin_delete( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :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: @@ -839,7 +762,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, @@ -849,11 +772,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)) @@ -862,14 +786,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/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitors_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitors_operations.py index be6faf20c9f7..2611d4b568b3 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitors_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_monitors_operations.py @@ -7,7 +7,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -17,12 +18,13 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict @@ -30,7 +32,6 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._monitors_operations import ( build_create_or_update_request, build_delete_request, @@ -43,11 +44,17 @@ build_list_hosts_request, build_list_linked_resources_request, build_list_monitored_resources_request, + build_refresh_ingestion_key_request, + build_resubscribe_request, build_switch_billing_request, build_update_request, build_vm_host_payload_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]] @@ -75,7 +82,6 @@ def __init__(self, *args, **kwargs) -> None: def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.NewRelicMonitorResource"]: """List NewRelicMonitorResource resources by subscription ID. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -88,7 +94,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.NewRelic api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.NewRelicMonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -99,15 +105,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.NewRelic def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.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 +123,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("NewRelicMonitorResourceListResult", pipeline_response) @@ -135,11 +138,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,8 +155,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/monitors"} - @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any @@ -163,7 +164,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 NewRelicMonitorResource or the result of cls(response) :rtype: @@ -176,7 +176,7 @@ def list_by_resource_group( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.NewRelicMonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -187,16 +187,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 @@ -208,13 +206,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("NewRelicMonitorResourceListResult", pipeline_response) @@ -224,11 +221,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 @@ -241,10 +238,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/NewRelic.Observability/monitors" - } - @distributed_trace_async async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.NewRelicMonitorResource: """Get a NewRelicMonitorResource. @@ -254,12 +247,11 @@ async def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: NewRelicMonitorResource or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -273,21 +265,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.NewRelicMonitorResource] = 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 @@ -297,25 +287,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("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", 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/NewRelic.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore async def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.NewRelicMonitorResource, IO], + resource: Union[_models.NewRelicMonitorResource, IO[bytes]], **kwargs: Any - ) -> _models.NewRelicMonitorResource: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -328,7 +314,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.NewRelicMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -338,7 +324,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(resource, "NewRelicMonitorResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -346,43 +332,39 @@ 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) response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) - if response.status_code == 201: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, response_headers) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } - @overload async def begin_create_or_update( self, @@ -405,14 +387,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 NewRelicMonitorResource or the result of cls(response) :rtype: @@ -425,7 +399,7 @@ async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -438,18 +412,10 @@ async def begin_create_or_update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -462,7 +428,7 @@ async def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.NewRelicMonitorResource, IO], + resource: Union[_models.NewRelicMonitorResource, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: """Create a NewRelicMonitorResource. @@ -472,20 +438,9 @@ async def begin_create_or_update( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :param resource: Resource create parameters. Is either a NewRelicMonitorResource type or a IO - type. Required. - :type resource: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param resource: Resource create parameters. Is either a NewRelicMonitorResource type or a + IO[bytes] type. Required. + :type resource: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or IO[bytes] :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -513,12 +468,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("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -531,20 +487,89 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.NewRelicMonitorResource].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 + return AsyncLROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) + + async def _update_initial( + self, + resource_group_name: str, + monitor_name: str, + properties: Union[_models.NewRelicMonitorResourceUpdate, IO[bytes]], + **kwargs: Any + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(properties, (IOBase, bytes)): + _content = properties + else: + _json = self._serialize.body(properties, "NewRelicMonitorResourceUpdate") + + _request = build_update_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + content_type=content_type, + json=_json, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _decompress = kwargs.pop("decompress", True) + _stream = True + 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, 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) + + response_headers = {} + if response.status_code == 202: + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } + if cls: + return cls(pipeline_response, deserialized, response_headers) # type: ignore + + return deserialized # type: ignore @overload - async def update( + async def begin_update( self, resource_group_name: str, monitor_name: str, @@ -552,7 +577,7 @@ async def update( *, content_type: str = "application/json", **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -565,22 +590,23 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :return: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ @overload - async def update( + async def begin_update( self, resource_group_name: str, monitor_name: str, - properties: IO, + properties: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -589,24 +615,25 @@ async def update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param properties: The resource properties to be updated. Required. - :type properties: IO + :type properties: 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: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ @distributed_trace_async - async def update( + async def begin_update( self, resource_group_name: str, monitor_name: str, - properties: Union[_models.NewRelicMonitorResourceUpdate, IO], + properties: Union[_models.NewRelicMonitorResourceUpdate, IO[bytes]], **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -615,81 +642,66 @@ async def update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param properties: The resource properties to be updated. Is either a - NewRelicMonitorResourceUpdate type or a IO type. Required. - :type properties: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResourceUpdate 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 - :return: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + NewRelicMonitorResourceUpdate type or a IO[bytes] type. Required. + :type properties: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResourceUpdate or + IO[bytes] + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.NewRelicMonitorResource] = kwargs.pop("cls", None) + polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token: Optional[str] = kwargs.pop("continuation_token", None) + if cont_token is None: + raw_result = await self._update_initial( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + properties=properties, + api_version=api_version, + content_type=content_type, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, + **kwargs + ) + await raw_result.http_response.read() # type: ignore + kwargs.pop("error_map", None) - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(properties, (IOBase, bytes)): - _content = properties - else: - _json = self._serialize.body(properties, "NewRelicMonitorResourceUpdate") - - request = build_update_request( - resource_group_name=resource_group_name, - monitor_name=monitor_name, - subscription_id=self._config.subscription_id, - api_version=api_version, - content_type=content_type, - json=_json, - content=_content, - template_url=self.update.metadata["url"], - headers=_headers, - params=_params, - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + def get_long_running_output(pipeline_response): + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + return deserialized - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + if polling is True: + polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling + if cont_token: + return AsyncLROPoller[_models.NewRelicMonitorResource].from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output, + ) + return AsyncLROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore ) - 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("NewRelicMonitorResource", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } - - async def _delete_initial( # pylint: disable=inconsistent-return-statements + async def _delete_initial( self, resource_group_name: str, user_email: str, monitor_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -701,29 +713,32 @@ 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, user_email=user_email, 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) @@ -732,12 +747,12 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -752,14 +767,6 @@ async def begin_delete( :type user_email: str :param monitor_name: Name of the Monitors resource. 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: @@ -773,7 +780,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, user_email=user_email, monitor_name=monitor_name, @@ -783,11 +790,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( @@ -799,17 +807,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/NewRelic.Observability/monitors/{monitorName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @overload async def get_metric_rules( @@ -833,7 +837,6 @@ async def get_metric_rules( :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: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: @@ -844,7 +847,7 @@ async def get_metric_rules( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -857,11 +860,10 @@ async def get_metric_rules( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: @@ -869,7 +871,11 @@ async def get_metric_rules( @distributed_trace_async async def get_metric_rules( - self, resource_group_name: str, monitor_name: str, request: Union[_models.MetricsRequest, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + request: Union[_models.MetricsRequest, IO[bytes]], + **kwargs: Any ) -> _models.MetricRules: """Get metric rules. @@ -879,17 +885,13 @@ async def get_metric_rules( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Is either a MetricsRequest type - or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.MetricsRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.MetricsRequest or IO[bytes] :return: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -912,7 +914,7 @@ async def get_metric_rules( else: _json = self._serialize.body(request, "MetricsRequest") - request = build_get_metric_rules_request( + _request = build_get_metric_rules_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -920,16 +922,14 @@ async def get_metric_rules( content_type=content_type, json=_json, content=_content, - template_url=self.get_metric_rules.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 @@ -939,16 +939,12 @@ async def get_metric_rules( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricRules", pipeline_response) + deserialized = self._deserialize("MetricRules", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_rules.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getMetricRules" - } + return deserialized # type: ignore @overload async def get_metric_status( @@ -972,7 +968,6 @@ async def get_metric_status( :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: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -983,7 +978,7 @@ async def get_metric_status( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -996,11 +991,10 @@ async def get_metric_status( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1011,7 +1005,7 @@ async def get_metric_status( self, resource_group_name: str, monitor_name: str, - request: Union[_models.MetricsStatusRequest, IO], + request: Union[_models.MetricsStatusRequest, IO[bytes]], **kwargs: Any ) -> _models.MetricsStatusResponse: """Get metric status. @@ -1022,17 +1016,13 @@ async def get_metric_status( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Is either a MetricsStatusRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.MetricsStatusRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.MetricsStatusRequest or IO[bytes] :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1055,7 +1045,7 @@ async def get_metric_status( else: _json = self._serialize.body(request, "MetricsStatusRequest") - request = build_get_metric_status_request( + _request = build_get_metric_status_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1063,16 +1053,14 @@ async def get_metric_status( content_type=content_type, json=_json, content=_content, - template_url=self.get_metric_status.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1082,16 +1070,12 @@ async def get_metric_status( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricsStatusResponse", pipeline_response) + deserialized = self._deserialize("MetricsStatusResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_status.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getMetricStatus" - } + return deserialized # type: ignore @overload def list_app_services( @@ -1115,7 +1099,6 @@ def list_app_services( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] @@ -1127,7 +1110,7 @@ def list_app_services( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1140,11 +1123,10 @@ def list_app_services( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the app services get request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] @@ -1156,7 +1138,7 @@ def list_app_services( self, resource_group_name: str, monitor_name: str, - request: Union[_models.AppServicesGetRequest, IO], + request: Union[_models.AppServicesGetRequest, IO[bytes]], **kwargs: Any ) -> AsyncIterable["_models.AppServiceInfo"]: """List the app service resources currently being monitored by the NewRelic resource. @@ -1167,12 +1149,8 @@ def list_app_services( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the app services get request. Is either a AppServicesGetRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.AppServicesGetRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.AppServicesGetRequest or IO[bytes] :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] @@ -1185,7 +1163,7 @@ def list_app_services( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AppServicesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1203,7 +1181,7 @@ def list_app_services( def prepare_request(next_link=None): if not next_link: - request = build_list_app_services_request( + _request = build_list_app_services_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1211,12 +1189,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - template_url=self.list_app_services.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -1228,13 +1204,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("AppServicesListResponse", pipeline_response) @@ -1244,11 +1219,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 @@ -1261,10 +1236,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_app_services.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listAppServices" - } - @overload async def switch_billing( self, @@ -1287,7 +1258,6 @@ async def switch_billing( :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: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: @@ -1298,7 +1268,7 @@ async def switch_billing( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1311,11 +1281,10 @@ async def switch_billing( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the switch billing request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: @@ -1326,7 +1295,7 @@ async def switch_billing( self, resource_group_name: str, monitor_name: str, - request: Union[_models.SwitchBillingRequest, IO], + request: Union[_models.SwitchBillingRequest, IO[bytes]], **kwargs: Any ) -> Optional[_models.NewRelicMonitorResource]: """Switches the billing for NewRelic monitor resource. @@ -1337,17 +1306,13 @@ async def switch_billing( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the switch billing request. Is either a SwitchBillingRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.SwitchBillingRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.SwitchBillingRequest or IO[bytes] :return: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1370,7 +1335,7 @@ async def switch_billing( else: _json = self._serialize.body(request, "SwitchBillingRequest") - request = build_switch_billing_request( + _request = build_switch_billing_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1378,16 +1343,14 @@ async def switch_billing( content_type=content_type, json=_json, content=_content, - template_url=self.switch_billing.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 @@ -1400,19 +1363,15 @@ async def switch_billing( deserialized = None response_headers = {} if response.status_code == 200: - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) if cls: - return cls(pipeline_response, deserialized, response_headers) - - return deserialized + return cls(pipeline_response, deserialized, response_headers) # type: ignore - switch_billing.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/switchBilling" - } + return deserialized # type: ignore @overload def list_hosts( @@ -1436,7 +1395,6 @@ def list_hosts( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] @@ -1448,7 +1406,7 @@ def list_hosts( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1461,11 +1419,10 @@ def list_hosts( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the Hosts get request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] @@ -1474,7 +1431,11 @@ def list_hosts( @distributed_trace def list_hosts( - self, resource_group_name: str, monitor_name: str, request: Union[_models.HostsGetRequest, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + request: Union[_models.HostsGetRequest, IO[bytes]], + **kwargs: Any ) -> AsyncIterable["_models.VMInfo"]: """List the compute vm resources currently being monitored by the NewRelic resource. @@ -1483,13 +1444,9 @@ def list_hosts( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :param request: The details of the Hosts get request. Is either a HostsGetRequest type or a IO - type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.HostsGetRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param request: The details of the Hosts get request. Is either a HostsGetRequest type or a + IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.HostsGetRequest or IO[bytes] :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] @@ -1502,7 +1459,7 @@ def list_hosts( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VMHostsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1520,7 +1477,7 @@ 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, @@ -1528,12 +1485,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - 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 @@ -1545,13 +1500,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("VMHostsListResponse", pipeline_response) @@ -1561,11 +1515,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 @@ -1578,9 +1532,58 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listHosts" - } + @distributed_trace_async + async def refresh_ingestion_key(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> None: + """Refreshes the ingestion key for all monitors linked to the same account associated to this + 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: Name of the Monitors resource. Required. + :type monitor_name: str + :return: None or the result of cls(response) + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_refresh_ingestion_key_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 [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def list_monitored_resources( @@ -1593,7 +1596,6 @@ def list_monitored_resources( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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.newrelicobservability.models.MonitoredResource] @@ -1605,7 +1607,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, @@ -1616,17 +1618,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 @@ -1638,13 +1638,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) @@ -1654,11 +1653,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 @@ -1671,10 +1670,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredResources" - } - @distributed_trace def list_linked_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -1690,7 +1685,6 @@ def list_linked_resources( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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.newrelicobservability.models.LinkedResource] @@ -1702,7 +1696,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, @@ -1713,17 +1707,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 @@ -1735,13 +1727,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) @@ -1751,11 +1742,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 @@ -1768,10 +1759,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_linked_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listLinkedResources" - } - @distributed_trace_async async def vm_host_payload( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -1784,12 +1771,11 @@ async def vm_host_payload( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: VMExtensionPayload or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.VMExtensionPayload :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1803,21 +1789,19 @@ async def vm_host_payload( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.VMExtensionPayload] = kwargs.pop("cls", None) - request = build_vm_host_payload_request( + _request = build_vm_host_payload_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.vm_host_payload.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1827,13 +1811,221 @@ async def vm_host_payload( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("VMExtensionPayload", pipeline_response) + deserialized = self._deserialize("VMExtensionPayload", pipeline_response.http_response) + + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + + return deserialized # type: ignore + + async def _resubscribe_initial( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None, + **kwargs: Any + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + if body is not None: + _json = self._serialize.body(body, "ResubscribeProperties") + else: + _json = None + + _request = build_resubscribe_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + content_type=content_type, + json=_json, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _decompress = kwargs.pop("decompress", True) + _stream = True + 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, 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) + + response_headers = {} + if response.status_code == 202: + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, response_headers) # type: ignore + + return deserialized # type: ignore + + @overload + async def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[_models.ResubscribeProperties] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. - return deserialized + Resubscribe the NewRelic Organization. - vm_host_payload.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/vmHostPayloads" - } + :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 + :param body: Resubscribe Properties. Default value is None. + :type body: ~azure.mgmt.newrelicobservability.models.ResubscribeProperties + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[IO[bytes]] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. + + Resubscribe the NewRelic Organization. + + :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 + :param body: Resubscribe Properties. Default value is None. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None, + **kwargs: Any + ) -> AsyncLROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. + + Resubscribe the NewRelic Organization. + + :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 + :param body: Resubscribe Properties. Is either a ResubscribeProperties type or a IO[bytes] + type. Default value is None. + :type body: ~azure.mgmt.newrelicobservability.models.ResubscribeProperties or IO[bytes] + :return: An instance of AsyncLROPoller that returns either NewRelicMonitorResource or the + result of cls(response) + :rtype: + ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.NewRelicMonitorResource] = kwargs.pop("cls", None) + polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token: Optional[str] = kwargs.pop("continuation_token", None) + if cont_token is None: + raw_result = await self._resubscribe_initial( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + body=body, + api_version=api_version, + content_type=content_type, + cls=lambda x, y, z: x, + headers=_headers, + 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("NewRelicMonitorResource", pipeline_response.http_response) + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + return deserialized + + if polling is True: + polling_method: AsyncPollingMethod = cast( + AsyncPollingMethod, + AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs), + ) + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling + if cont_token: + return AsyncLROPoller[_models.NewRelicMonitorResource].from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output, + ) + return AsyncLROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_operations.py index 5fa1bd42b25b..41edab06fde6 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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]] @@ -56,7 +58,6 @@ def __init__(self, *args, **kwargs) -> None: def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: """List the operations for the provider. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.Operation] @@ -68,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -79,14 +80,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -98,13 +97,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) @@ -114,11 +112,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 @@ -130,5 +128,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/NewRelic.Observability/operations"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_organizations_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_organizations_operations.py index e09f48c9ceb5..da7a16d85af3 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_organizations_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_organizations_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._organizations_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]] @@ -60,7 +62,6 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" :type user_email: str :param location: Location for NewRelic. Required. :type location: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OrganizationResource or the result of cls(response) :rtype: @@ -73,7 +74,7 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OrganizationsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -84,17 +85,15 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> AsyncIterable[" def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, user_email=user_email, location=location, 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 @@ -106,13 +105,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("OrganizationsListResponse", pipeline_response) @@ -122,11 +120,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 @@ -138,5 +136,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/organizations"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_plans_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_plans_operations.py index 5ae4d19d1bff..b20871e8899c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_plans_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_plans_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._plans_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]] @@ -62,7 +64,6 @@ def list( :type account_id: str :param organization_id: Organization Id. Default value is None. :type 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 PlanDataResource or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.PlanDataResource] @@ -74,7 +75,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.PlanDataListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -85,17 +86,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, account_id=account_id, organization_id=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) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -107,13 +106,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("PlanDataListResponse", pipeline_response) @@ -123,11 +121,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 @@ -139,5 +137,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/plans"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_tag_rules_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_tag_rules_operations.py index 0fd59032db91..4ae821f59c1d 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_tag_rules_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/aio/operations/_tag_rules_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -17,12 +17,13 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod -from azure.core.rest import HttpRequest +from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async from azure.core.utils import case_insensitive_dict @@ -30,7 +31,6 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request from ...operations._tag_rules_operations import ( build_create_or_update_request, build_delete_request, @@ -39,6 +39,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]] @@ -73,7 +77,6 @@ def list_by_new_relic_monitor_resource( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TagRule or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.newrelicobservability.models.TagRule] @@ -85,7 +88,7 @@ def list_by_new_relic_monitor_resource( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRuleListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -96,17 +99,15 @@ def list_by_new_relic_monitor_resource( def prepare_request(next_link=None): if not next_link: - request = build_list_by_new_relic_monitor_resource_request( + _request = build_list_by_new_relic_monitor_resource_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_by_new_relic_monitor_resource.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 @@ -118,13 +119,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request async def extract_data(pipeline_response): deserialized = self._deserialize("TagRuleListResult", pipeline_response) @@ -134,11 +134,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 @@ -151,10 +151,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_new_relic_monitor_resource.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules" - } - @distributed_trace_async async def get( self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any @@ -168,12 +164,11 @@ async def get( :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -187,22 +182,20 @@ async def get( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -212,26 +205,22 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore async def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any - ) -> _models.TagRule: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -244,7 +233,7 @@ async def _create_or_update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -254,7 +243,7 @@ async def _create_or_update_initial( else: _json = self._serialize.body(resource, "TagRule") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -263,43 +252,39 @@ 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) response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("TagRule", pipeline_response) - if response.status_code == 201: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, response_headers) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } - @overload async def begin_create_or_update( self, @@ -325,14 +310,6 @@ async def begin_create_or_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.TagRule] @@ -345,7 +322,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -360,18 +337,10 @@ async def begin_create_or_update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.TagRule] @@ -384,7 +353,7 @@ async def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.TagRule]: """Create a TagRule. @@ -396,19 +365,9 @@ async def begin_create_or_update( :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :param resource: Resource create parameters. Is either a TagRule type or a IO type. Required. - :type resource: ~azure.mgmt.newrelicobservability.models.TagRule or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param resource: Resource create parameters. Is either a TagRule type or a IO[bytes] type. + Required. + :type resource: ~azure.mgmt.newrelicobservability.models.TagRule or IO[bytes] :return: An instance of AsyncLROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.newrelicobservability.models.TagRule] @@ -436,12 +395,13 @@ async def begin_create_or_update( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -454,22 +414,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.TagRule].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return AsyncLROPoller[_models.TagRule]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - async def _delete_initial( # pylint: disable=inconsistent-return-statements + async def _delete_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -481,29 +439,32 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: + try: + await response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) @@ -512,12 +473,12 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -532,14 +493,6 @@ async def begin_delete( :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -553,7 +506,7 @@ async def begin_delete( lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._delete_initial( # type: ignore + raw_result = await self._delete_initial( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -563,11 +516,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( @@ -579,17 +533,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/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @overload async def update( @@ -616,7 +566,6 @@ async def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: @@ -628,7 +577,7 @@ async def update( resource_group_name: str, monitor_name: str, rule_set_name: str, - properties: IO, + properties: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -643,11 +592,10 @@ async def update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param properties: The resource properties to be updated. Required. - :type properties: IO + :type properties: 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: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: @@ -659,7 +607,7 @@ async def update( resource_group_name: str, monitor_name: str, rule_set_name: str, - properties: Union[_models.TagRuleUpdate, IO], + properties: Union[_models.TagRuleUpdate, IO[bytes]], **kwargs: Any ) -> _models.TagRule: """Update a TagRule. @@ -672,17 +620,13 @@ async def update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param properties: The resource properties to be updated. Is either a TagRuleUpdate type or a - IO type. Required. - :type properties: ~azure.mgmt.newrelicobservability.models.TagRuleUpdate 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 + IO[bytes] type. Required. + :type properties: ~azure.mgmt.newrelicobservability.models.TagRuleUpdate or IO[bytes] :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -705,7 +649,7 @@ async def update( else: _json = self._serialize.body(properties, "TagRuleUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -714,16 +658,14 @@ async def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -733,13 +675,9 @@ async def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/__init__.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/__init__.py index f20c90207aa0..9fd863f5ad8c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/__init__.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/__init__.py @@ -5,98 +5,109 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._models_py3 import AccountInfo -from ._models_py3 import AccountResource -from ._models_py3 import AccountsListResponse -from ._models_py3 import AppServiceInfo -from ._models_py3 import AppServicesGetParameter -from ._models_py3 import AppServicesGetRequest -from ._models_py3 import AppServicesListResponse -from ._models_py3 import BillingInfoResponse -from ._models_py3 import ConnectedPartnerResourceProperties -from ._models_py3 import ConnectedPartnerResourcesListFormat -from ._models_py3 import ConnectedPartnerResourcesListResponse -from ._models_py3 import ErrorAdditionalInfo -from ._models_py3 import ErrorDetail -from ._models_py3 import ErrorResponse -from ._models_py3 import FilteringTag -from ._models_py3 import HostsGetParameter -from ._models_py3 import HostsGetRequest -from ._models_py3 import LinkedResource -from ._models_py3 import LinkedResourceListResponse -from ._models_py3 import LogRules -from ._models_py3 import ManagedServiceIdentity -from ._models_py3 import MarketplaceSaaSInfo -from ._models_py3 import MetricRules -from ._models_py3 import MetricsRequest -from ._models_py3 import MetricsRequestParameter -from ._models_py3 import MetricsStatusRequest -from ._models_py3 import MetricsStatusRequestParameter -from ._models_py3 import MetricsStatusResponse -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 MonitoringTagRulesProperties -from ._models_py3 import NewRelicAccountProperties -from ._models_py3 import NewRelicMonitorResource -from ._models_py3 import NewRelicMonitorResourceListResult -from ._models_py3 import NewRelicMonitorResourceUpdate -from ._models_py3 import NewRelicSingleSignOnProperties -from ._models_py3 import Operation -from ._models_py3 import OperationDisplay -from ._models_py3 import OperationListResult -from ._models_py3 import OrganizationInfo -from ._models_py3 import OrganizationResource -from ._models_py3 import OrganizationsListResponse -from ._models_py3 import PartnerBillingEntity -from ._models_py3 import PlanData -from ._models_py3 import PlanDataListResponse -from ._models_py3 import PlanDataResource -from ._models_py3 import ProxyResource -from ._models_py3 import Resource -from ._models_py3 import SubscriptionList -from ._models_py3 import SwitchBillingParameter -from ._models_py3 import SwitchBillingRequest -from ._models_py3 import SystemData -from ._models_py3 import TagRule -from ._models_py3 import TagRuleListResult -from ._models_py3 import TagRuleUpdate -from ._models_py3 import TrackedResource -from ._models_py3 import UserAssignedIdentity -from ._models_py3 import UserInfo -from ._models_py3 import VMExtensionPayload -from ._models_py3 import VMHostsListResponse -from ._models_py3 import VMInfo +from typing import TYPE_CHECKING -from ._new_relic_observability_mgmt_client_enums import AccountCreationSource -from ._new_relic_observability_mgmt_client_enums import ActionType -from ._new_relic_observability_mgmt_client_enums import BillingCycle -from ._new_relic_observability_mgmt_client_enums import BillingSource -from ._new_relic_observability_mgmt_client_enums import ConfigurationName -from ._new_relic_observability_mgmt_client_enums import CreatedByType -from ._new_relic_observability_mgmt_client_enums import LiftrResourceCategories -from ._new_relic_observability_mgmt_client_enums import ManagedServiceIdentityType -from ._new_relic_observability_mgmt_client_enums import MarketplaceSubscriptionStatus -from ._new_relic_observability_mgmt_client_enums import MonitoringStatus -from ._new_relic_observability_mgmt_client_enums import OrgCreationSource -from ._new_relic_observability_mgmt_client_enums import Origin -from ._new_relic_observability_mgmt_client_enums import PatchOperation -from ._new_relic_observability_mgmt_client_enums import ProvisioningState -from ._new_relic_observability_mgmt_client_enums import SendAadLogsStatus -from ._new_relic_observability_mgmt_client_enums import SendActivityLogsStatus -from ._new_relic_observability_mgmt_client_enums import SendMetricsStatus -from ._new_relic_observability_mgmt_client_enums import SendSubscriptionLogsStatus -from ._new_relic_observability_mgmt_client_enums import SendingLogsStatus -from ._new_relic_observability_mgmt_client_enums import SendingMetricsStatus -from ._new_relic_observability_mgmt_client_enums import SingleSignOnStates -from ._new_relic_observability_mgmt_client_enums import Status -from ._new_relic_observability_mgmt_client_enums import TagAction -from ._new_relic_observability_mgmt_client_enums import UsageType +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models_py3 import ( # type: ignore + AccountInfo, + AccountResource, + AccountsListResponse, + AppServiceInfo, + AppServicesGetParameter, + AppServicesGetRequest, + AppServicesListResponse, + BillingInfoResponse, + ConnectedPartnerResourceProperties, + ConnectedPartnerResourcesListFormat, + ConnectedPartnerResourcesListResponse, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + FilteringTag, + HostsGetParameter, + HostsGetRequest, + LinkedResource, + LinkedResourceListResponse, + LogRules, + ManagedServiceIdentity, + MarketplaceSaaSInfo, + MetricRules, + MetricsRequest, + MetricsRequestParameter, + MetricsStatusRequest, + MetricsStatusRequestParameter, + MetricsStatusResponse, + MonitoredResource, + MonitoredResourceListResponse, + MonitoredSubscription, + MonitoredSubscriptionProperties, + MonitoredSubscriptionPropertiesList, + MonitoringTagRulesProperties, + NewRelicAccountProperties, + NewRelicMonitorResource, + NewRelicMonitorResourceListResult, + NewRelicMonitorResourceUpdate, + NewRelicSingleSignOnProperties, + Operation, + OperationDisplay, + OperationListResult, + OrganizationInfo, + OrganizationResource, + OrganizationsListResponse, + PartnerBillingEntity, + PlanData, + PlanDataListResponse, + PlanDataResource, + ProxyResource, + Resource, + ResubscribeProperties, + SubscriptionList, + SwitchBillingParameter, + SwitchBillingRequest, + SystemData, + TagRule, + TagRuleListResult, + TagRuleUpdate, + TrackedResource, + UserAssignedIdentity, + UserInfo, + VMExtensionPayload, + VMHostsListResponse, + VMInfo, +) + +from ._new_relic_observability_mgmt_client_enums import ( # type: ignore + AccountCreationSource, + ActionType, + BillingSource, + ConfigurationName, + CreatedByType, + LiftrResourceCategories, + ManagedServiceIdentityType, + MarketplaceSubscriptionStatus, + MonitoringStatus, + OrgCreationSource, + Origin, + PatchOperation, + ProvisioningState, + SendAadLogsStatus, + SendActivityLogsStatus, + SendMetricsStatus, + SendSubscriptionLogsStatus, + SendingLogsStatus, + SendingMetricsStatus, + SingleSignOnStates, + Status, + TagAction, + UsageType, +) 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__ = [ @@ -151,6 +162,7 @@ "PlanDataResource", "ProxyResource", "Resource", + "ResubscribeProperties", "SubscriptionList", "SwitchBillingParameter", "SwitchBillingRequest", @@ -166,7 +178,6 @@ "VMInfo", "AccountCreationSource", "ActionType", - "BillingCycle", "BillingSource", "ConfigurationName", "CreatedByType", @@ -189,5 +200,5 @@ "TagAction", "UsageType", ] -__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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_models_py3.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_models_py3.py index 3edaa99e9955..a4f6a33433da 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_models_py3.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_models_py3.py @@ -1,5 +1,5 @@ -# coding=utf-8 # pylint: disable=too-many-lines +# coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. @@ -13,7 +13,6 @@ from .. import _serialization if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models @@ -62,7 +61,7 @@ class Resource(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -104,7 +103,7 @@ class ProxyResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -116,24 +115,6 @@ class ProxyResource(Resource): :vartype system_data: ~azure.mgmt.newrelicobservability.models.SystemData """ - _validation = { - "id": {"readonly": True}, - "name": {"readonly": True}, - "type": {"readonly": True}, - "system_data": {"readonly": True}, - } - - _attribute_map = { - "id": {"key": "id", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "type": {"key": "type", "type": "str"}, - "system_data": {"key": "systemData", "type": "SystemData"}, - } - - def __init__(self, **kwargs: Any) -> None: - """ """ - super().__init__(**kwargs) - class AccountResource(ProxyResource): """The details of a account resource. @@ -141,7 +122,7 @@ class AccountResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -208,7 +189,7 @@ def __init__( class AccountsListResponse(_serialization.Model): """Response of get all accounts Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The AccountResource items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.AccountResource] @@ -281,7 +262,7 @@ def __init__( class AppServicesGetParameter(_serialization.Model): """App services Get Parameter specification. - 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 request: The details of the app services get request. Required. :vartype request: ~azure.mgmt.newrelicobservability.models.AppServicesGetRequest @@ -307,7 +288,7 @@ def __init__(self, *, request: "_models.AppServicesGetRequest", **kwargs: Any) - class AppServicesGetRequest(_serialization.Model): """Request of a app services get Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar azure_resource_ids: Azure resource IDs. :vartype azure_resource_ids: list[str] @@ -339,7 +320,7 @@ def __init__(self, *, user_email: str, azure_resource_ids: Optional[List[str]] = class AppServicesListResponse(_serialization.Model): """Response of a list app services Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The AppServiceInfo items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.AppServiceInfo] @@ -644,7 +625,7 @@ def __init__( class HostsGetParameter(_serialization.Model): """Host Get Parameter specification. - 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 request: The details of the Hosts get request. Required. :vartype request: ~azure.mgmt.newrelicobservability.models.HostsGetRequest @@ -670,7 +651,7 @@ def __init__(self, *, request: "_models.HostsGetRequest", **kwargs: Any) -> None class HostsGetRequest(_serialization.Model): """Request of a Hosts get Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar vm_ids: VM resource IDs. :vartype vm_ids: list[str] @@ -816,7 +797,7 @@ class ManagedServiceIdentity(_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 principal_id: The service principal ID of the system assigned identity. This property will only be provided for a system assigned identity. @@ -830,7 +811,7 @@ class ManagedServiceIdentity(_serialization.Model): :vartype type: str or ~azure.mgmt.newrelicobservability.models.ManagedServiceIdentityType :ivar user_assigned_identities: The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: - '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. # pylint: disable=line-too-long The dictionary values can be empty objects ({}) in requests. :vartype user_assigned_identities: dict[str, ~azure.mgmt.newrelicobservability.models.UserAssignedIdentity] @@ -863,7 +844,7 @@ def __init__( :paramtype type: str or ~azure.mgmt.newrelicobservability.models.ManagedServiceIdentityType :keyword user_assigned_identities: The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: - '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. # pylint: disable=line-too-long The dictionary values can be empty objects ({}) in requests. :paramtype user_assigned_identities: dict[str, ~azure.mgmt.newrelicobservability.models.UserAssignedIdentity] @@ -890,6 +871,10 @@ class MarketplaceSaaSInfo(_serialization.Model): :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 publisher_id: Publisher Id of the Marketplace offer. + :vartype publisher_id: str + :ivar offer_id: Offer Id of the Marketplace offer,. + :vartype offer_id: str """ _attribute_map = { @@ -898,6 +883,8 @@ class MarketplaceSaaSInfo(_serialization.Model): "marketplace_resource_id": {"key": "marketplaceResourceId", "type": "str"}, "marketplace_status": {"key": "marketplaceStatus", "type": "str"}, "billed_azure_subscription_id": {"key": "billedAzureSubscriptionId", "type": "str"}, + "publisher_id": {"key": "publisherId", "type": "str"}, + "offer_id": {"key": "offerId", "type": "str"}, } def __init__( @@ -908,6 +895,8 @@ def __init__( marketplace_resource_id: Optional[str] = None, marketplace_status: Optional[str] = None, billed_azure_subscription_id: Optional[str] = None, + publisher_id: Optional[str] = None, + offer_id: Optional[str] = None, **kwargs: Any ) -> None: """ @@ -923,6 +912,10 @@ def __init__( :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 publisher_id: Publisher Id of the Marketplace offer. + :paramtype publisher_id: str + :keyword offer_id: Offer Id of the Marketplace offer,. + :paramtype offer_id: str """ super().__init__(**kwargs) self.marketplace_subscription_id = marketplace_subscription_id @@ -930,6 +923,8 @@ def __init__( self.marketplace_resource_id = marketplace_resource_id self.marketplace_status = marketplace_status self.billed_azure_subscription_id = billed_azure_subscription_id + self.publisher_id = publisher_id + self.offer_id = offer_id class MetricRules(_serialization.Model): @@ -980,7 +975,7 @@ def __init__( class MetricsRequest(_serialization.Model): """Request of get metrics Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar user_email: User Email. Required. :vartype user_email: str @@ -1006,7 +1001,7 @@ def __init__(self, *, user_email: str, **kwargs: Any) -> None: class MetricsRequestParameter(_serialization.Model): """Get Metrics Status Parameter specification. - 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 request: The details of the get metrics status request. Required. :vartype request: ~azure.mgmt.newrelicobservability.models.MetricsRequest @@ -1032,7 +1027,7 @@ def __init__(self, *, request: "_models.MetricsRequest", **kwargs: Any) -> None: class MetricsStatusRequest(_serialization.Model): """Request of get metrics status Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar azure_resource_ids: Azure resource IDs. :vartype azure_resource_ids: list[str] @@ -1064,7 +1059,7 @@ def __init__(self, *, user_email: str, azure_resource_ids: Optional[List[str]] = class MetricsStatusRequestParameter(_serialization.Model): """Get Metrics Status Parameter specification. - 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 request: The details of the get metrics status request. Required. :vartype request: ~azure.mgmt.newrelicobservability.models.MetricsStatusRequest @@ -1172,7 +1167,7 @@ def __init__( class MonitoredResourceListResponse(_serialization.Model): """List of all the resources being monitored by NewRelic monitor resource. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The MonitoredResource items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.MonitoredResource] @@ -1424,10 +1419,10 @@ class TrackedResource(Resource): Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1472,15 +1467,15 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw self.location = location -class NewRelicMonitorResource(TrackedResource): # pylint: disable=too-many-instance-attributes +class NewRelicMonitorResource(TrackedResource): """A Monitor Resource by NewRelic. Variables are only populated by the server, and will be ignored when sending a request. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -1637,7 +1632,7 @@ def __init__( class NewRelicMonitorResourceListResult(_serialization.Model): """The response of a NewRelicMonitorResource list operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The NewRelicMonitorResource items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] @@ -1945,7 +1940,7 @@ class OrganizationResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -2005,7 +2000,7 @@ def __init__( class OrganizationsListResponse(_serialization.Model): """Response of get all organizations Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The OrganizationResource items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.OrganizationResource] @@ -2070,9 +2065,8 @@ class PlanData(_serialization.Model): :ivar usage_type: Different usage type like PAYG/COMMITTED. this could be enum. Known values are: "PAYG" and "COMMITTED". :vartype usage_type: str or ~azure.mgmt.newrelicobservability.models.UsageType - :ivar billing_cycle: Different billing cycles like MONTHLY/WEEKLY. this could be enum. Known - values are: "YEARLY", "MONTHLY", and "WEEKLY". - :vartype billing_cycle: str or ~azure.mgmt.newrelicobservability.models.BillingCycle + :ivar billing_cycle: Different billing cycles like Monthly/Weekly. + :vartype billing_cycle: str :ivar plan_details: plan id as published by NewRelic. :vartype plan_details: str :ivar effective_date: date when plan was applied. @@ -2090,7 +2084,7 @@ def __init__( self, *, usage_type: Optional[Union[str, "_models.UsageType"]] = None, - billing_cycle: Optional[Union[str, "_models.BillingCycle"]] = None, + billing_cycle: Optional[str] = None, plan_details: Optional[str] = None, effective_date: Optional[datetime.datetime] = None, **kwargs: Any @@ -2099,9 +2093,8 @@ def __init__( :keyword usage_type: Different usage type like PAYG/COMMITTED. this could be enum. Known values are: "PAYG" and "COMMITTED". :paramtype usage_type: str or ~azure.mgmt.newrelicobservability.models.UsageType - :keyword billing_cycle: Different billing cycles like MONTHLY/WEEKLY. this could be enum. Known - values are: "YEARLY", "MONTHLY", and "WEEKLY". - :paramtype billing_cycle: str or ~azure.mgmt.newrelicobservability.models.BillingCycle + :keyword billing_cycle: Different billing cycles like Monthly/Weekly. + :paramtype billing_cycle: str :keyword plan_details: plan id as published by NewRelic. :paramtype plan_details: str :keyword effective_date: date when plan was applied. @@ -2117,7 +2110,7 @@ def __init__( class PlanDataListResponse(_serialization.Model): """Response of get all plan data Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The PlanDataResource items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.PlanDataResource] @@ -2154,7 +2147,7 @@ class PlanDataResource(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -2216,6 +2209,83 @@ def __init__( self.account_creation_source = account_creation_source +class ResubscribeProperties(_serialization.Model): + """Resubscribe Properties. + + :ivar plan_id: Newly selected plan Id to create the new Marketplace subscription for + Resubscribe. + :vartype plan_id: str + :ivar term_id: Newly selected term Id to create the new Marketplace subscription for + Resubscribe. + :vartype term_id: str + :ivar subscription_id: Newly selected Azure Subscription Id in which the new Marketplace + subscription will be created for Resubscribe. + :vartype subscription_id: str + :ivar resource_group: Newly selected Azure resource group in which the new Marketplace + subscription will be created for Resubscribe. + :vartype resource_group: str + :ivar organization_id: Organization Id of the NewRelic Organization that needs to be + resubscribed. + :vartype organization_id: str + :ivar publisher_id: Publisher Id of the NewRelic offer that needs to be resubscribed. + :vartype publisher_id: str + :ivar offer_id: Offer Id of the NewRelic offer that needs to be resubscribed. + :vartype offer_id: str + """ + + _attribute_map = { + "plan_id": {"key": "planId", "type": "str"}, + "term_id": {"key": "termId", "type": "str"}, + "subscription_id": {"key": "subscriptionId", "type": "str"}, + "resource_group": {"key": "resourceGroup", "type": "str"}, + "organization_id": {"key": "organizationId", "type": "str"}, + "publisher_id": {"key": "publisherId", "type": "str"}, + "offer_id": {"key": "offerId", "type": "str"}, + } + + def __init__( + self, + *, + plan_id: Optional[str] = None, + term_id: Optional[str] = None, + subscription_id: Optional[str] = None, + resource_group: Optional[str] = None, + organization_id: Optional[str] = None, + publisher_id: Optional[str] = None, + offer_id: Optional[str] = None, + **kwargs: Any + ) -> None: + """ + :keyword plan_id: Newly selected plan Id to create the new Marketplace subscription for + Resubscribe. + :paramtype plan_id: str + :keyword term_id: Newly selected term Id to create the new Marketplace subscription for + Resubscribe. + :paramtype term_id: str + :keyword subscription_id: Newly selected Azure Subscription Id in which the new Marketplace + subscription will be created for Resubscribe. + :paramtype subscription_id: str + :keyword resource_group: Newly selected Azure resource group in which the new Marketplace + subscription will be created for Resubscribe. + :paramtype resource_group: str + :keyword organization_id: Organization Id of the NewRelic Organization that needs to be + resubscribed. + :paramtype organization_id: str + :keyword publisher_id: Publisher Id of the NewRelic offer that needs to be resubscribed. + :paramtype publisher_id: str + :keyword offer_id: Offer Id of the NewRelic offer that needs to be resubscribed. + :paramtype offer_id: str + """ + super().__init__(**kwargs) + self.plan_id = plan_id + self.term_id = term_id + self.subscription_id = subscription_id + self.resource_group = resource_group + self.organization_id = organization_id + self.publisher_id = publisher_id + self.offer_id = offer_id + + class SubscriptionList(_serialization.Model): """The request to update subscriptions needed to be monitored by the NewRelic monitor resource. @@ -2267,7 +2337,7 @@ def __init__( class SwitchBillingParameter(_serialization.Model): """Switch Billing Parameter specification. - 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 request: The details of the switch billing request. Required. :vartype request: ~azure.mgmt.newrelicobservability.models.SwitchBillingRequest @@ -2293,7 +2363,7 @@ def __init__(self, *, request: "_models.SwitchBillingRequest", **kwargs: Any) -> class SwitchBillingRequest(_serialization.Model): """Request of a switch billing Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar azure_resource_id: Azure resource Id. :vartype azure_resource_id: str @@ -2412,7 +2482,7 @@ class TagRule(ProxyResource): Variables are only populated by the server, and will be ignored when sending a request. :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long :vartype id: str :ivar name: The name of the resource. :vartype name: str @@ -2472,7 +2542,7 @@ def __init__( class TagRuleListResult(_serialization.Model): """The response of a TagRule list operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The TagRule items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.TagRule] @@ -2644,7 +2714,7 @@ def __init__(self, *, ingestion_key: Optional[str] = None, **kwargs: Any) -> Non class VMHostsListResponse(_serialization.Model): """Response of a list VM Host Operation. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar value: The VMInfo items on this page. Required. :vartype value: list[~azure.mgmt.newrelicobservability.models.VMInfo] diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_new_relic_observability_mgmt_client_enums.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_new_relic_observability_mgmt_client_enums.py index 65cf3f48589d..3af6bcb36d5e 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_new_relic_observability_mgmt_client_enums.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/models/_new_relic_observability_mgmt_client_enums.py @@ -25,17 +25,6 @@ class ActionType(str, Enum, metaclass=CaseInsensitiveEnumMeta): INTERNAL = "Internal" -class BillingCycle(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """Different usage type like YEARLY/MONTHLY.""" - - YEARLY = "YEARLY" - """Billing cycle is YEARLY""" - MONTHLY = "MONTHLY" - """Billing cycle is MONTHLY""" - WEEKLY = "WEEKLY" - """Billing cycle is WEEKLY""" - - class BillingSource(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Billing source.""" diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/__init__.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/__init__.py index 187704a663a4..d718a21b2351 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/__init__.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/__init__.py @@ -5,19 +5,25 @@ # 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 ._operations import Operations -from ._accounts_operations import AccountsOperations -from ._monitors_operations import MonitorsOperations -from ._organizations_operations import OrganizationsOperations -from ._plans_operations import PlansOperations -from ._billing_info_operations import BillingInfoOperations -from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations -from ._tag_rules_operations import TagRulesOperations -from ._monitored_subscriptions_operations import MonitoredSubscriptionsOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._accounts_operations import AccountsOperations # type: ignore +from ._monitors_operations import MonitorsOperations # type: ignore +from ._organizations_operations import OrganizationsOperations # type: ignore +from ._plans_operations import PlansOperations # type: ignore +from ._billing_info_operations import BillingInfoOperations # type: ignore +from ._connected_partner_resources_operations import ConnectedPartnerResourcesOperations # type: ignore +from ._tag_rules_operations import TagRulesOperations # 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__ = [ @@ -31,5 +37,5 @@ "TagRulesOperations", "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/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_accounts_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_accounts_operations.py index 635cba28090c..1ade5615c102 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_accounts_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_accounts_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(subscription_id: str, *, user_email: str, location: 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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -89,7 +91,6 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode :type user_email: str :param location: Location for NewRelic. Required. :type location: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AccountResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.AccountResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -100,7 +101,7 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.AccountsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -111,17 +112,15 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, user_email=user_email, location=location, 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 @@ -133,13 +132,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("AccountsListResponse", pipeline_response) @@ -149,11 +147,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 @@ -165,5 +163,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/accounts"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_billing_info_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_billing_info_operations.py index db093bc9f6c5..3a94ea4a1df8 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_billing_info_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_billing_info_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, Optional, TypeVar from azure.core.exceptions import ( @@ -17,16 +17,18 @@ map_error, ) 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]] @@ -38,7 +40,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,12 +97,11 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: BillingInfoResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.BillingInfoResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -114,21 +115,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.BillingInfoResponse] = 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 @@ -138,13 +137,9 @@ 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("BillingInfoResponse", pipeline_response) + deserialized = self._deserialize("BillingInfoResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getBillingInfo" - } + return deserialized # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_connected_partner_resources_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_connected_partner_resources_operations.py index ee558915d5c2..a13e394848c1 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_connected_partner_resources_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_connected_partner_resources_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]] @@ -42,7 +44,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -108,7 +110,6 @@ def list( :type monitor_name: str :param body: Email Id of the user. Default value is None. :type body: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ConnectedPartnerResourcesListFormat or the result of cls(response) :rtype: @@ -122,7 +123,7 @@ def list( content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/json")) cls: ClsType[_models.ConnectedPartnerResourcesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -137,19 +138,17 @@ def prepare_request(next_link=None): else: _content = None - 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, content_type=content_type, content=_content, - 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 @@ -161,13 +160,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("ConnectedPartnerResourcesListResponse", pipeline_response) @@ -177,11 +175,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 @@ -193,7 +191,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listConnectedPartnerResources" - } diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitored_subscriptions_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitored_subscriptions_operations.py index 8d58b14d0070..64d2cdb87bbf 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitored_subscriptions_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,7 +84,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -108,7 +112,7 @@ def build_get_request( return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_createor_update_request( +def build_create_or_update_request( resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], @@ -118,7 +122,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -159,7 +163,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -200,7 +204,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -260,7 +264,6 @@ def list( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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: @@ -273,7 +276,7 @@ def list( 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, @@ -284,17 +287,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 @@ -306,13 +307,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("MonitoredSubscriptionPropertiesList", pipeline_response) @@ -322,11 +322,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 @@ -339,10 +339,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions" - } - @distributed_trace def get( self, @@ -363,12 +359,11 @@ def get( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :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.newrelicobservability.models.MonitoredSubscriptionProperties :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -382,22 +377,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 @@ -407,26 +400,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/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore - def _createor_update_initial( + def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[Union[_models.MonitoredSubscriptionProperties, IO]] = None, + body: Optional[Union[_models.MonitoredSubscriptionProperties, IO[bytes]]] = None, **kwargs: Any - ) -> _models.MonitoredSubscriptionProperties: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -439,7 +428,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[_models.MonitoredSubscriptionProperties] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -452,7 +441,7 @@ def _createor_update_initial( else: _json = None - request = build_createor_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -461,42 +450,37 @@ 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]: + 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("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, {}) # type: ignore return deserialized # type: ignore - _createor_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } - @overload - def begin_createor_update( + def begin_create_or_update( self, resource_group_name: str, monitor_name: str, @@ -523,14 +507,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: @@ -539,12 +515,12 @@ def begin_createor_update( """ @overload - def begin_createor_update( + def begin_create_or_update( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -562,18 +538,10 @@ def begin_createor_update( Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName :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: @@ -582,12 +550,12 @@ def begin_createor_update( """ @distributed_trace - def begin_createor_update( + def begin_create_or_update( self, resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - 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 NewRelic monitor resource. @@ -602,20 +570,10 @@ def begin_createor_update( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.newrelicobservability.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.newrelicobservability.models.MonitoredSubscriptionProperties or + IO[bytes] :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -632,7 +590,7 @@ def begin_createor_update( 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._createor_update_initial( + raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, monitor_name=monitor_name, configuration_name=configuration_name, @@ -644,12 +602,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: @@ -659,27 +618,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/NewRelic.Observability/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: Union[str, _models.ConfigurationName], - 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, @@ -692,7 +649,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 @@ -705,7 +662,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, @@ -714,41 +671,38 @@ 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 response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("MonitoredSubscriptionProperties", pipeline_response) - if response.status_code == 202: response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) - if cls: - return cls(pipeline_response, deserialized, response_headers) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) - return deserialized + if cls: + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @overload def begin_update( @@ -778,14 +732,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: @@ -799,7 +745,7 @@ def begin_update( resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - body: Optional[IO] = None, + body: Optional[IO[bytes]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -817,18 +763,10 @@ def begin_update( Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName :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: @@ -842,7 +780,7 @@ def begin_update( resource_group_name: str, monitor_name: str, configuration_name: Union[str, _models.ConfigurationName], - 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 NewRelic monitor resource. @@ -857,20 +795,10 @@ def begin_update( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :param body: Is either a MonitoredSubscriptionProperties type or a IO type. Default value is - None. - :type body: ~azure.mgmt.newrelicobservability.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.newrelicobservability.models.MonitoredSubscriptionProperties or + IO[bytes] :return: An instance of LROPoller that returns either MonitoredSubscriptionProperties or the result of cls(response) :rtype: @@ -899,12 +827,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: @@ -914,26 +843,24 @@ 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/NewRelic.Observability/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: Union[str, _models.ConfigurationName], **kwargs: Any - ) -> None: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -945,29 +872,32 @@ 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 [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) @@ -976,12 +906,12 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete( @@ -1003,14 +933,6 @@ def begin_delete( :param configuration_name: The configuration name. Only 'default' value is supported. "default" Required. :type configuration_name: str or ~azure.mgmt.newrelicobservability.models.ConfigurationName - :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: @@ -1024,7 +946,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, @@ -1034,11 +956,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)) @@ -1047,14 +970,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/NewRelic.Observability/monitors/{monitorName}/monitoredSubscriptions/{configurationName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitors_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitors_operations.py index 9fca5c509d4a..e5bfc9756805 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_monitors_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/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]] @@ -43,7 +48,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -67,7 +72,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -97,7 +102,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -130,7 +135,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -166,7 +171,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -202,7 +207,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -236,7 +241,7 @@ def build_get_metric_rules_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -272,7 +277,7 @@ def build_get_metric_status_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -308,7 +313,7 @@ def build_list_app_services_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -344,7 +349,7 @@ def build_switch_billing_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -380,7 +385,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -410,13 +415,46 @@ def build_list_hosts_request( return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) +def build_refresh_ingestion_key_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", "2024-10-01")) + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/refreshIngestionKey", + ) # 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) + + def build_list_monitored_resources_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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -449,7 +487,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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -482,7 +520,7 @@ def build_vm_host_payload_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -509,6 +547,42 @@ def build_vm_host_payload_request( return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) +def build_resubscribe_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", "2024-10-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + accept = _headers.pop("Accept", "application/json") + + # Construct URL + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/resubscribe", + ) # 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", pattern=r"^.*$"), + } + + _url: str = _url.format(**path_format_arguments) # type: ignore + + # Construct parameters + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") + + # Construct headers + if content_type is not None: + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + class MonitorsOperations: """ .. warning:: @@ -532,7 +606,6 @@ def __init__(self, *args, **kwargs): def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.NewRelicMonitorResource"]: """List NewRelicMonitorResource resources by subscription ID. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -545,7 +618,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.NewRelicMonit api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.NewRelicMonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -556,15 +629,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.NewRelicMonit def prepare_request(next_link=None): if not next_link: - request = build_list_by_subscription_request( + _request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.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 @@ -576,13 +647,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("NewRelicMonitorResourceListResult", pipeline_response) @@ -592,11 +662,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 @@ -609,8 +679,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/monitors"} - @distributed_trace def list_by_resource_group( self, resource_group_name: str, **kwargs: Any @@ -620,7 +688,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 NewRelicMonitorResource or the result of cls(response) :rtype: @@ -633,7 +700,7 @@ def list_by_resource_group( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.NewRelicMonitorResourceListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -644,16 +711,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 @@ -665,13 +730,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("NewRelicMonitorResourceListResult", pipeline_response) @@ -681,11 +745,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 @@ -698,10 +762,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors" - } - @distributed_trace def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.NewRelicMonitorResource: """Get a NewRelicMonitorResource. @@ -711,12 +771,11 @@ def get(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _mo :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: NewRelicMonitorResource or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -730,21 +789,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.NewRelicMonitorResource] = 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 @@ -754,25 +811,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("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.NewRelicMonitorResource, IO], + resource: Union[_models.NewRelicMonitorResource, IO[bytes]], **kwargs: Any - ) -> _models.NewRelicMonitorResource: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -785,7 +838,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.NewRelicMonitorResource] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -795,7 +848,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(resource, "NewRelicMonitorResource") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -803,43 +856,39 @@ 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) response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) - if response.status_code == 201: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, response_headers) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } - @overload def begin_create_or_update( self, @@ -862,14 +911,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 NewRelicMonitorResource or the result of cls(response) :rtype: @@ -882,7 +923,7 @@ def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -895,18 +936,10 @@ def begin_create_or_update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -919,7 +952,7 @@ def begin_create_or_update( self, resource_group_name: str, monitor_name: str, - resource: Union[_models.NewRelicMonitorResource, IO], + resource: Union[_models.NewRelicMonitorResource, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.NewRelicMonitorResource]: """Create a NewRelicMonitorResource. @@ -929,20 +962,9 @@ def begin_create_or_update( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :param resource: Resource create parameters. Is either a NewRelicMonitorResource type or a IO - type. Required. - :type resource: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param resource: Resource create parameters. Is either a NewRelicMonitorResource type or a + IO[bytes] type. Required. + :type resource: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or IO[bytes] :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of cls(response) :rtype: @@ -970,12 +992,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("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -987,20 +1010,89 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.NewRelicMonitorResource].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 + return LROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } + def _update_initial( + self, + resource_group_name: str, + monitor_name: str, + properties: Union[_models.NewRelicMonitorResourceUpdate, IO[bytes]], + **kwargs: Any + ) -> Iterator[bytes]: + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(properties, (IOBase, bytes)): + _content = properties + else: + _json = self._serialize.body(properties, "NewRelicMonitorResourceUpdate") + + _request = build_update_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + content_type=content_type, + json=_json, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _decompress = kwargs.pop("decompress", True) + _stream = True + 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, 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) + + response_headers = {} + if response.status_code == 202: + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + + if cls: + return cls(pipeline_response, deserialized, response_headers) # type: ignore + + return deserialized # type: ignore @overload - def update( + def begin_update( self, resource_group_name: str, monitor_name: str, @@ -1008,7 +1100,7 @@ def update( *, content_type: str = "application/json", **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> LROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1021,22 +1113,23 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :return: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ @overload - def update( + def begin_update( self, resource_group_name: str, monitor_name: str, - properties: IO, + properties: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> LROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1045,24 +1138,25 @@ def update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param properties: The resource properties to be updated. Required. - :type properties: IO + :type properties: 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: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ @distributed_trace - def update( + def begin_update( self, resource_group_name: str, monitor_name: str, - properties: Union[_models.NewRelicMonitorResourceUpdate, IO], + properties: Union[_models.NewRelicMonitorResourceUpdate, IO[bytes]], **kwargs: Any - ) -> _models.NewRelicMonitorResource: + ) -> LROPoller[_models.NewRelicMonitorResource]: """Update a NewRelicMonitorResource. :param resource_group_name: The name of the resource group. The name is case insensitive. @@ -1071,81 +1165,66 @@ def update( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param properties: The resource properties to be updated. Is either a - NewRelicMonitorResourceUpdate type or a IO type. Required. - :type properties: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResourceUpdate 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 - :return: NewRelicMonitorResource or the result of cls(response) - :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource + NewRelicMonitorResourceUpdate type or a IO[bytes] type. Required. + :type properties: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResourceUpdate or + IO[bytes] + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.NewRelicMonitorResource] = kwargs.pop("cls", None) + polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token: Optional[str] = kwargs.pop("continuation_token", None) + if cont_token is None: + raw_result = self._update_initial( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + properties=properties, + api_version=api_version, + content_type=content_type, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, + **kwargs + ) + raw_result.http_response.read() # type: ignore + kwargs.pop("error_map", None) - content_type = content_type or "application/json" - _json = None - _content = None - if isinstance(properties, (IOBase, bytes)): - _content = properties - else: - _json = self._serialize.body(properties, "NewRelicMonitorResourceUpdate") - - request = build_update_request( - resource_group_name=resource_group_name, - monitor_name=monitor_name, - subscription_id=self._config.subscription_id, - api_version=api_version, - content_type=content_type, - json=_json, - content=_content, - template_url=self.update.metadata["url"], - headers=_headers, - params=_params, - ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + def get_long_running_output(pipeline_response): + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + return deserialized - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + if polling is True: + polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling + if cont_token: + return LROPoller[_models.NewRelicMonitorResource].from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output, + ) + return LROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore ) - 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("NewRelicMonitorResource", pipeline_response) - - if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } - - def _delete_initial( # pylint: disable=inconsistent-return-statements + def _delete_initial( self, resource_group_name: str, user_email: str, monitor_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1157,29 +1236,32 @@ 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, user_email=user_email, 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) @@ -1188,12 +1270,12 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete( @@ -1208,14 +1290,6 @@ def begin_delete( :type user_email: str :param monitor_name: Name of the Monitors resource. 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: @@ -1229,7 +1303,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, user_email=user_email, monitor_name=monitor_name, @@ -1239,11 +1313,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( @@ -1254,17 +1329,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/NewRelic.Observability/monitors/{monitorName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @overload def get_metric_rules( @@ -1288,7 +1359,6 @@ def get_metric_rules( :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: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: @@ -1299,7 +1369,7 @@ def get_metric_rules( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1312,11 +1382,10 @@ def get_metric_rules( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: @@ -1324,7 +1393,11 @@ def get_metric_rules( @distributed_trace def get_metric_rules( - self, resource_group_name: str, monitor_name: str, request: Union[_models.MetricsRequest, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + request: Union[_models.MetricsRequest, IO[bytes]], + **kwargs: Any ) -> _models.MetricRules: """Get metric rules. @@ -1334,17 +1407,13 @@ def get_metric_rules( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Is either a MetricsRequest type - or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.MetricsRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.MetricsRequest or IO[bytes] :return: MetricRules or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricRules :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1367,7 +1436,7 @@ def get_metric_rules( else: _json = self._serialize.body(request, "MetricsRequest") - request = build_get_metric_rules_request( + _request = build_get_metric_rules_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1375,16 +1444,14 @@ def get_metric_rules( content_type=content_type, json=_json, content=_content, - template_url=self.get_metric_rules.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 @@ -1394,16 +1461,12 @@ def get_metric_rules( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricRules", pipeline_response) + deserialized = self._deserialize("MetricRules", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_rules.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getMetricRules" - } + return deserialized # type: ignore @overload def get_metric_status( @@ -1427,7 +1490,6 @@ def get_metric_status( :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: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1438,7 +1500,7 @@ def get_metric_status( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1451,11 +1513,10 @@ def get_metric_status( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: @@ -1466,7 +1527,7 @@ def get_metric_status( self, resource_group_name: str, monitor_name: str, - request: Union[_models.MetricsStatusRequest, IO], + request: Union[_models.MetricsStatusRequest, IO[bytes]], **kwargs: Any ) -> _models.MetricsStatusResponse: """Get metric status. @@ -1477,17 +1538,13 @@ def get_metric_status( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the get metrics status request. Is either a MetricsStatusRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.MetricsStatusRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.MetricsStatusRequest or IO[bytes] :return: MetricsStatusResponse or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.MetricsStatusResponse :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1510,7 +1567,7 @@ def get_metric_status( else: _json = self._serialize.body(request, "MetricsStatusRequest") - request = build_get_metric_status_request( + _request = build_get_metric_status_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1518,16 +1575,14 @@ def get_metric_status( content_type=content_type, json=_json, content=_content, - template_url=self.get_metric_status.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1537,16 +1592,12 @@ def get_metric_status( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("MetricsStatusResponse", pipeline_response) + deserialized = self._deserialize("MetricsStatusResponse", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get_metric_status.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/getMetricStatus" - } + return deserialized # type: ignore @overload def list_app_services( @@ -1570,7 +1621,6 @@ def list_app_services( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1581,7 +1631,7 @@ def list_app_services( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1594,11 +1644,10 @@ def list_app_services( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the app services get request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1609,7 +1658,7 @@ def list_app_services( self, resource_group_name: str, monitor_name: str, - request: Union[_models.AppServicesGetRequest, IO], + request: Union[_models.AppServicesGetRequest, IO[bytes]], **kwargs: Any ) -> Iterable["_models.AppServiceInfo"]: """List the app service resources currently being monitored by the NewRelic resource. @@ -1620,12 +1669,8 @@ def list_app_services( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the app services get request. Is either a AppServicesGetRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.AppServicesGetRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.AppServicesGetRequest or IO[bytes] :return: An iterator like instance of either AppServiceInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.AppServiceInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1637,7 +1682,7 @@ def list_app_services( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AppServicesListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1655,7 +1700,7 @@ def list_app_services( def prepare_request(next_link=None): if not next_link: - request = build_list_app_services_request( + _request = build_list_app_services_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1663,12 +1708,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - template_url=self.list_app_services.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -1680,13 +1723,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("AppServicesListResponse", pipeline_response) @@ -1696,11 +1738,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 @@ -1713,10 +1755,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_app_services.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listAppServices" - } - @overload def switch_billing( self, @@ -1739,7 +1777,6 @@ def switch_billing( :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: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: @@ -1750,7 +1787,7 @@ def switch_billing( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1763,11 +1800,10 @@ def switch_billing( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the switch billing request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: @@ -1778,7 +1814,7 @@ def switch_billing( self, resource_group_name: str, monitor_name: str, - request: Union[_models.SwitchBillingRequest, IO], + request: Union[_models.SwitchBillingRequest, IO[bytes]], **kwargs: Any ) -> Optional[_models.NewRelicMonitorResource]: """Switches the billing for NewRelic monitor resource. @@ -1789,17 +1825,13 @@ def switch_billing( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the switch billing request. Is either a SwitchBillingRequest - type or a IO type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.SwitchBillingRequest 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 + type or a IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.SwitchBillingRequest or IO[bytes] :return: NewRelicMonitorResource or None or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource or None :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1822,7 +1854,7 @@ def switch_billing( else: _json = self._serialize.body(request, "SwitchBillingRequest") - request = build_switch_billing_request( + _request = build_switch_billing_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, @@ -1830,16 +1862,14 @@ def switch_billing( content_type=content_type, json=_json, content=_content, - template_url=self.switch_billing.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 @@ -1852,19 +1882,15 @@ def switch_billing( deserialized = None response_headers = {} if response.status_code == 200: - deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response) + deserialized = self._deserialize("NewRelicMonitorResource", pipeline_response.http_response) if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) if cls: - return cls(pipeline_response, deserialized, response_headers) - - return deserialized + return cls(pipeline_response, deserialized, response_headers) # type: ignore - switch_billing.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/switchBilling" - } + return deserialized # type: ignore @overload def list_hosts( @@ -1888,7 +1914,6 @@ def list_hosts( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1899,7 +1924,7 @@ def list_hosts( self, resource_group_name: str, monitor_name: str, - request: IO, + request: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -1912,11 +1937,10 @@ def list_hosts( :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str :param request: The details of the Hosts get request. Required. - :type request: IO + :type request: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1924,7 +1948,11 @@ def list_hosts( @distributed_trace def list_hosts( - self, resource_group_name: str, monitor_name: str, request: Union[_models.HostsGetRequest, IO], **kwargs: Any + self, + resource_group_name: str, + monitor_name: str, + request: Union[_models.HostsGetRequest, IO[bytes]], + **kwargs: Any ) -> Iterable["_models.VMInfo"]: """List the compute vm resources currently being monitored by the NewRelic resource. @@ -1933,13 +1961,9 @@ def list_hosts( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :param request: The details of the Hosts get request. Is either a HostsGetRequest type or a IO - type. Required. - :type request: ~azure.mgmt.newrelicobservability.models.HostsGetRequest or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param request: The details of the Hosts get request. Is either a HostsGetRequest type or a + IO[bytes] type. Required. + :type request: ~azure.mgmt.newrelicobservability.models.HostsGetRequest or IO[bytes] :return: An iterator like instance of either VMInfo or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.VMInfo] :raises ~azure.core.exceptions.HttpResponseError: @@ -1951,7 +1975,7 @@ def list_hosts( content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VMHostsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1969,7 +1993,7 @@ 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, @@ -1977,12 +2001,10 @@ def prepare_request(next_link=None): content_type=content_type, json=_json, content=_content, - 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 @@ -1994,13 +2016,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("VMHostsListResponse", pipeline_response) @@ -2010,11 +2031,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 @@ -2027,9 +2048,60 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_hosts.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listHosts" - } + @distributed_trace + def refresh_ingestion_key( # pylint: disable=inconsistent-return-statements + self, resource_group_name: str, monitor_name: str, **kwargs: Any + ) -> None: + """Refreshes the ingestion key for all monitors linked to the same account associated to this + 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: Name of the Monitors resource. Required. + :type monitor_name: str + :return: None or the result of cls(response) + :rtype: None + :raises ~azure.core.exceptions.HttpResponseError: + """ + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) + + _request = build_refresh_ingestion_key_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 [204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) # type: ignore @distributed_trace def list_monitored_resources( @@ -2042,7 +2114,6 @@ def list_monitored_resources( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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.newrelicobservability.models.MonitoredResource] @@ -2054,7 +2125,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, @@ -2065,17 +2136,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 @@ -2087,13 +2156,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) @@ -2103,11 +2171,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 @@ -2120,10 +2188,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_monitored_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/monitoredResources" - } - @distributed_trace def list_linked_resources( self, resource_group_name: str, monitor_name: str, **kwargs: Any @@ -2139,7 +2203,6 @@ def list_linked_resources( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. 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.newrelicobservability.models.LinkedResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -2150,7 +2213,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, @@ -2161,17 +2224,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 @@ -2183,13 +2244,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) @@ -2199,11 +2259,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 @@ -2216,10 +2276,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_linked_resources.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/listLinkedResources" - } - @distributed_trace def vm_host_payload(self, resource_group_name: str, monitor_name: str, **kwargs: Any) -> _models.VMExtensionPayload: """Returns the payload that needs to be passed in the request body for installing NewRelic agent @@ -2230,12 +2286,11 @@ def vm_host_payload(self, resource_group_name: str, monitor_name: str, **kwargs: :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: VMExtensionPayload or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.VMExtensionPayload :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -2249,21 +2304,19 @@ def vm_host_payload(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.VMExtensionPayload] = kwargs.pop("cls", None) - request = build_vm_host_payload_request( + _request = build_vm_host_payload_request( resource_group_name=resource_group_name, monitor_name=monitor_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.vm_host_payload.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -2273,13 +2326,220 @@ def vm_host_payload(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("VMExtensionPayload", pipeline_response) + deserialized = self._deserialize("VMExtensionPayload", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized + return deserialized # type: ignore - vm_host_payload.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/vmHostPayloads" - } + def _resubscribe_initial( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None, + **kwargs: Any + ) -> Iterator[bytes]: + error_map: MutableMapping = { + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + } + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(body, (IOBase, bytes)): + _content = body + else: + if body is not None: + _json = self._serialize.body(body, "ResubscribeProperties") + else: + _json = None + + _request = build_resubscribe_request( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + subscription_id=self._config.subscription_id, + api_version=api_version, + content_type=content_type, + json=_json, + content=_content, + headers=_headers, + params=_params, + ) + _request.url = self._client.format_url(_request.url) + + _decompress = kwargs.pop("decompress", True) + _stream = True + 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, 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) + + response_headers = {} + if response.status_code == 202: + response_headers["Location"] = self._deserialize("str", response.headers.get("Location")) + + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + + if cls: + return cls(pipeline_response, deserialized, response_headers) # type: ignore + + return deserialized # type: ignore + + @overload + def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[_models.ResubscribeProperties] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. + + Resubscribe the NewRelic Organization. + + :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 + :param body: Resubscribe Properties. Default value is None. + :type body: ~azure.mgmt.newrelicobservability.models.ResubscribeProperties + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[IO[bytes]] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. + + Resubscribe the NewRelic Organization. + + :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 + :param body: Resubscribe Properties. Default value is None. + :type body: IO[bytes] + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def begin_resubscribe( + self, + resource_group_name: str, + monitor_name: str, + body: Optional[Union[_models.ResubscribeProperties, IO[bytes]]] = None, + **kwargs: Any + ) -> LROPoller[_models.NewRelicMonitorResource]: + """Resubscribe the NewRelic Organization. + + Resubscribe the NewRelic Organization. + + :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 + :param body: Resubscribe Properties. Is either a ResubscribeProperties type or a IO[bytes] + type. Default value is None. + :type body: ~azure.mgmt.newrelicobservability.models.ResubscribeProperties or IO[bytes] + :return: An instance of LROPoller that returns either NewRelicMonitorResource or the result of + cls(response) + :rtype: + ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.NewRelicMonitorResource] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.NewRelicMonitorResource] = kwargs.pop("cls", None) + polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token: Optional[str] = kwargs.pop("continuation_token", None) + if cont_token is None: + raw_result = self._resubscribe_initial( + resource_group_name=resource_group_name, + monitor_name=monitor_name, + body=body, + api_version=api_version, + content_type=content_type, + cls=lambda x, y, z: x, + headers=_headers, + 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("NewRelicMonitorResource", pipeline_response.http_response) + if cls: + return cls(pipeline_response, deserialized, {}) # type: ignore + return deserialized + + if polling is True: + polling_method: PollingMethod = cast( + PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs) + ) + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling + if cont_token: + return LROPoller[_models.NewRelicMonitorResource].from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output, + ) + return LROPoller[_models.NewRelicMonitorResource]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_operations.py index fa546e7adc6c..a23119642f88 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,6 +5,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse @@ -19,16 +19,18 @@ ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -40,7 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +80,6 @@ def __init__(self, *args, **kwargs): def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: """List the operations for the provider. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either Operation or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -89,7 +90,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -100,14 +101,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( api_version=api_version, - template_url=self.list.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -119,13 +118,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) @@ -135,11 +133,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 @@ -151,5 +149,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/NewRelic.Observability/operations"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_organizations_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_organizations_operations.py index fb9900d6e6e8..9b264e52ff1c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_organizations_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_organizations_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(subscription_id: str, *, user_email: str, location: 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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -89,7 +91,6 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode :type user_email: str :param location: Location for NewRelic. Required. :type location: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either OrganizationResource or the result of cls(response) :rtype: @@ -102,7 +103,7 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OrganizationsListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -113,17 +114,15 @@ def list(self, user_email: str, location: str, **kwargs: Any) -> Iterable["_mode def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, user_email=user_email, location=location, 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 @@ -135,13 +134,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("OrganizationsListResponse", pipeline_response) @@ -151,11 +149,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 @@ -167,5 +165,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/organizations"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_plans_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_plans_operations.py index d8be3bb86293..47eab4eb8716 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_plans_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_plans_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]] @@ -42,7 +44,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,7 +97,6 @@ def list( :type account_id: str :param organization_id: Organization Id. Default value is None. :type 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 PlanDataResource or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.PlanDataResource] :raises ~azure.core.exceptions.HttpResponseError: @@ -106,7 +107,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.PlanDataListResponse] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -117,17 +118,15 @@ def list( def prepare_request(next_link=None): if not next_link: - request = build_list_request( + _request = build_list_request( subscription_id=self._config.subscription_id, account_id=account_id, organization_id=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) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -139,13 +138,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("PlanDataListResponse", pipeline_response) @@ -155,11 +153,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 @@ -171,5 +169,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/NewRelic.Observability/plans"} diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_tag_rules_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_tag_rules_operations.py index 6a38cdea3e17..797589ada3e6 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_tag_rules_operations.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/azure/mgmt/newrelicobservability/operations/_tag_rules_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,7 +6,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +import sys +from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core.exceptions import ( @@ -16,13 +16,14 @@ ResourceExistsError, ResourceNotFoundError, ResourceNotModifiedError, + StreamClosedError, + StreamConsumedError, map_error, ) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse -from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod -from azure.core.rest import HttpRequest +from azure.core.rest import HttpRequest, HttpResponse from azure.core.tracing.decorator import distributed_trace from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat @@ -30,8 +31,11 @@ from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request +if sys.version_info >= (3, 9): + from collections.abc import MutableMapping +else: + from typing import MutableMapping # type: ignore T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -39,13 +43,13 @@ _SERIALIZER.client_side_validation = False -def build_list_by_new_relic_monitor_resource_request( +def build_list_by_new_relic_monitor_resource_request( # pylint: disable=name-too-long 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", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,7 +82,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -112,7 +116,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -149,7 +153,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -183,7 +187,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-10-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -244,7 +248,6 @@ def list_by_new_relic_monitor_resource( :type resource_group_name: str :param monitor_name: Name of the Monitors resource. Required. :type monitor_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either TagRule or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.newrelicobservability.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -255,7 +258,7 @@ def list_by_new_relic_monitor_resource( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRuleListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -266,17 +269,15 @@ def list_by_new_relic_monitor_resource( def prepare_request(next_link=None): if not next_link: - request = build_list_by_new_relic_monitor_resource_request( + _request = build_list_by_new_relic_monitor_resource_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_by_new_relic_monitor_resource.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 @@ -288,13 +289,12 @@ def prepare_request(next_link=None): } ) _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( + _request = HttpRequest( "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) - request.method = "GET" - return request + _request.url = self._client.format_url(_request.url) + _request.method = "GET" + return _request def extract_data(pipeline_response): deserialized = self._deserialize("TagRuleListResult", pipeline_response) @@ -304,11 +304,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 @@ -321,10 +321,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_new_relic_monitor_resource.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules" - } - @distributed_trace def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any) -> _models.TagRule: """Get a TagRule. @@ -336,12 +332,11 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -355,22 +350,20 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -380,26 +373,22 @@ def get(self, resource_group_name: str, monitor_name: str, rule_set_name: str, * error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore def _create_or_update_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any - ) -> _models.TagRule: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -412,7 +401,7 @@ def _create_or_update_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[_models.TagRule] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -422,7 +411,7 @@ def _create_or_update_initial( else: _json = self._serialize.body(resource, "TagRule") - request = build_create_or_update_request( + _request = build_create_or_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -431,43 +420,39 @@ 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) response_headers = {} - if response.status_code == 200: - deserialized = self._deserialize("TagRule", pipeline_response) - if response.status_code == 201: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) if cls: return cls(pipeline_response, deserialized, response_headers) # type: ignore return deserialized # type: ignore - _create_or_update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } - @overload def begin_create_or_update( self, @@ -493,14 +478,6 @@ def begin_create_or_update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -512,7 +489,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: IO, + resource: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -527,18 +504,10 @@ def begin_create_or_update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param resource: Resource create parameters. Required. - :type resource: IO + :type resource: IO[bytes] :keyword content_type: Body Parameter content-type. Content type parameter for binary body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -550,7 +519,7 @@ def begin_create_or_update( resource_group_name: str, monitor_name: str, rule_set_name: str, - resource: Union[_models.TagRule, IO], + resource: Union[_models.TagRule, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.TagRule]: """Create a TagRule. @@ -562,19 +531,9 @@ def begin_create_or_update( :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :param resource: Resource create parameters. Is either a TagRule type or a IO type. Required. - :type resource: ~azure.mgmt.newrelicobservability.models.TagRule or IO - :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. - Default value is None. - :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. + :param resource: Resource create parameters. Is either a TagRule type or a IO[bytes] type. + Required. + :type resource: ~azure.mgmt.newrelicobservability.models.TagRule or IO[bytes] :return: An instance of LROPoller that returns either TagRule or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.newrelicobservability.models.TagRule] :raises ~azure.core.exceptions.HttpResponseError: @@ -601,12 +560,13 @@ def begin_create_or_update( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -618,22 +578,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.TagRule].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create_or_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return LROPoller[_models.TagRule]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - def _delete_initial( # pylint: disable=inconsistent-return-statements + def _delete_initial( self, resource_group_name: str, monitor_name: str, rule_set_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -645,29 +603,32 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) - cls: ClsType[None] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) - request = build_delete_request( + _request = build_delete_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: + try: + response.read() # Load the body in memory and close the socket + except (StreamConsumedError, StreamClosedError): + pass map_error(status_code=response.status_code, response=response, error_map=error_map) error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) @@ -676,12 +637,12 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements if response.status_code == 202: response_headers["Retry-After"] = self._deserialize("int", response.headers.get("Retry-After")) + deserialized = response.stream_download(self._client._pipeline, decompress=_decompress) + if cls: - return cls(pipeline_response, None, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - _delete_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete( @@ -696,14 +657,6 @@ def begin_delete( :type monitor_name: str :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] :raises ~azure.core.exceptions.HttpResponseError: @@ -717,7 +670,7 @@ def begin_delete( lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._delete_initial( # type: ignore + raw_result = self._delete_initial( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -727,11 +680,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( @@ -742,17 +696,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/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @overload def update( @@ -779,7 +729,6 @@ def update( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: @@ -791,7 +740,7 @@ def update( resource_group_name: str, monitor_name: str, rule_set_name: str, - properties: IO, + properties: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -806,11 +755,10 @@ def update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param properties: The resource properties to be updated. Required. - :type properties: IO + :type properties: 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: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: @@ -822,7 +770,7 @@ def update( resource_group_name: str, monitor_name: str, rule_set_name: str, - properties: Union[_models.TagRuleUpdate, IO], + properties: Union[_models.TagRuleUpdate, IO[bytes]], **kwargs: Any ) -> _models.TagRule: """Update a TagRule. @@ -835,17 +783,13 @@ def update( :param rule_set_name: Name of the TagRule. Required. :type rule_set_name: str :param properties: The resource properties to be updated. Is either a TagRuleUpdate type or a - IO type. Required. - :type properties: ~azure.mgmt.newrelicobservability.models.TagRuleUpdate 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 + IO[bytes] type. Required. + :type properties: ~azure.mgmt.newrelicobservability.models.TagRuleUpdate or IO[bytes] :return: TagRule or the result of cls(response) :rtype: ~azure.mgmt.newrelicobservability.models.TagRule :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -868,7 +812,7 @@ def update( else: _json = self._serialize.body(properties, "TagRuleUpdate") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, monitor_name=monitor_name, rule_set_name=rule_set_name, @@ -877,16 +821,14 @@ def update( content_type=content_type, json=_json, content=_content, - template_url=self.update.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -896,13 +838,9 @@ def update( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("TagRule", pipeline_response) + deserialized = self._deserialize("TagRule", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NewRelic.Observability/monitors/{monitorName}/tagRules/{ruleSetName}" - } + return deserialized # type: ignore diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_maximum_set_gen.py index dcd7aedc1bc5..10bdc969707e 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Accounts_List_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Accounts_List_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_minimum_set_gen.py index dff580fd0e3b..d9de47a6568d 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/accounts_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Accounts_List_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Accounts_List_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/billing_info_get.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/billing_info_get.py index d4330719850d..64cdcf452db0 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/billing_info_get.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/billing_info_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/BillingInfo_Get.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/BillingInfo_Get.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/connected_partner_resources_list.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/connected_partner_resources_list.py index 74d1622b2202..51a88ca1c4cc 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/connected_partner_resources_list.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/connected_partner_resources_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/ConnectedPartnerResources_List.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/ConnectedPartnerResources_List.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/linked_resources_list.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/linked_resources_list.py index c13bdc6aecb0..a6d80bddaeb4 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/linked_resources_list.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/linked_resources_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/LinkedResources_List.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/LinkedResources_List.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_createor_update.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_create_or_update.py similarity index 87% rename from sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_createor_update.py rename to sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_create_or_update.py index 1c5c18a7f23e..e6543dab09a8 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_createor_update.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_create_or_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -14,7 +15,7 @@ pip install azure-identity pip install azure-mgmt-newrelicobservability # USAGE - python monitored_subscriptions_createor_update.py + python monitored_subscriptions_create_or_update.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -29,7 +30,7 @@ def main(): subscription_id="00000000-0000-0000-0000-000000000000", ) - response = client.monitored_subscriptions.begin_createor_update( + response = client.monitored_subscriptions.begin_create_or_update( resource_group_name="myResourceGroup", monitor_name="myMonitor", configuration_name="default", @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/MonitoredSubscriptions_CreateorUpdate.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/MonitoredSubscriptions_CreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_delete.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_delete.py index 34f5c33ea1f2..d75b392d0ba8 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_delete.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_delete.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/MonitoredSubscriptions_Delete.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/MonitoredSubscriptions_Delete.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_get.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_get.py index 4646a93ddce4..a59c57397146 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_get.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_get.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/MonitoredSubscriptions_Get.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/MonitoredSubscriptions_Get.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_list.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_list.py index 825db10fb3fc..7b9209ba1b6c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_list.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_list.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/MonitoredSubscriptions_List.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/MonitoredSubscriptions_List.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_update.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_update.py index 96930c614858..9c1f7ffb3167 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_update.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitored_subscriptions_update.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/MonitoredSubscriptions_Update.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/MonitoredSubscriptions_Update.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_create_or_update_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_create_or_update_maximum_set_gen.py index 263529e89854..ff16e411f85e 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_create_or_update_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_create_or_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -53,7 +54,7 @@ def main(): }, "orgCreationSource": "LIFTR", "planData": { - "billingCycle": "YEARLY", + "billingCycle": "Yearly", "effectiveDate": "2022-12-05T14:11:37.786Z", "planDetails": "tbbiaga", "usageType": "PAYG", @@ -75,6 +76,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_CreateOrUpdate_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_CreateOrUpdate_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_maximum_set_gen.py index 24d366d4d41a..ffaaef0271cb 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_Delete_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_Delete_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_minimum_set_gen.py index 71c03709288e..9057c06a9eac 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_delete_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_Delete_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_Delete_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_maximum_set_gen.py index 0a3a273ad478..2ab2bc0b68ed 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_Get_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_Get_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_maximum_set_gen.py index 8622d9163ef0..1d69ef16a08a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_GetMetricRules_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_GetMetricRules_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_minimum_set_gen.py index 0e2edf7519ef..75389581571d 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_rules_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_GetMetricRules_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_GetMetricRules_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_maximum_set_gen.py index cdc0e1a67a1f..a5cdbe02418a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -42,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_GetMetricStatus_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_GetMetricStatus_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_minimum_set_gen.py index 90b7339cc9e3..5545ca6530f8 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_get_metric_status_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -42,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_GetMetricStatus_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_GetMetricStatus_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_maximum_set_gen.py index 7901ccb3b524..26c7df4e9158 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -43,6 +44,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListAppServices_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListAppServices_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_minimum_set_gen.py index 43c1eafb8362..1b17efe5ddde 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_app_services_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -43,6 +44,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListAppServices_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListAppServices_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py index 87c44540d705..288d93110523 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_resource_group_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListByResourceGroup_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListByResourceGroup_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_subscription_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_subscription_maximum_set_gen.py index 9e434f5dd4cc..19f104d16fdf 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_subscription_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_by_subscription_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListBySubscription_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListBySubscription_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_maximum_set_gen.py index f86f905df52b..3451f31c6936 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListHosts_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListHosts_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_minimum_set_gen.py index a7e6cdfefa46..47920895d9a6 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_hosts_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListHosts_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListHosts_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py index 27b4a58ecd03..ff62f2fe56dd 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListMonitoredResources_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListMonitoredResources_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py index aed0bed585e8..051788ad760a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_list_monitored_resources_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_ListMonitoredResources_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_ListMonitoredResources_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_refresh_ingestion_key.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_refresh_ingestion_key.py new file mode 100644 index 000000000000..ae0302e7f9a6 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_refresh_ingestion_key.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. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-newrelicobservability +# USAGE + python monitors_refresh_ingestion_key.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = NewRelicObservabilityMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="00000000-0000-0000-0000-000000000000", + ) + + client.monitors.refresh_ingestion_key( + resource_group_name="myResourceGroup", + monitor_name="myMonitor", + ) + + +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_RefreshIngestionKey.json +if __name__ == "__main__": + main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_resubscribe.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_resubscribe.py new file mode 100644 index 000000000000..281d63a7fbd9 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_resubscribe.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential + +from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-newrelicobservability +# USAGE + python monitors_resubscribe.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = NewRelicObservabilityMgmtClient( + credential=DefaultAzureCredential(), + subscription_id="00000000-0000-0000-0000-000000000000", + ) + + response = client.monitors.begin_resubscribe( + resource_group_name="myResourceGroup", + monitor_name="myMonitor", + ).result() + print(response) + + +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_Resubscribe.json +if __name__ == "__main__": + main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_maximum_set_gen.py index 4c5d86f88de4..72e44195846e 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,7 +37,7 @@ def main(): "azureResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgNewRelic/providers/NewRelic.Observability/monitors/fhcjxnxumkdlgpwanewtkdnyuz", "organizationId": "k", "planData": { - "billingCycle": "YEARLY", + "billingCycle": "Yearly", "effectiveDate": "2022-12-05T14:11:37.786Z", "planDetails": "tbbiaga", "usageType": "PAYG", @@ -47,6 +48,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_minimum_set_gen.py index 399fb99ec4f4..a58f54ca30c3 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_switch_billing_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_update_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_update_maximum_set_gen.py index db6c52e45db5..0f8c7088e2e5 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_update_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -29,7 +30,7 @@ def main(): subscription_id="00000000-0000-0000-0000-000000000000", ) - response = client.monitors.update( + response = client.monitors.begin_update( resource_group_name="rgNewRelic", monitor_name="cdlymktqw", properties={ @@ -49,7 +50,7 @@ def main(): }, "orgCreationSource": "LIFTR", "planData": { - "billingCycle": "YEARLY", + "billingCycle": "Yearly", "effectiveDate": "2022-12-05T14:11:37.786Z", "planDetails": "tbbiaga", "usageType": "PAYG", @@ -64,10 +65,10 @@ def main(): }, "tags": {"key164": "jqakdrrmmyzytqu"}, }, - ) + ).result() print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_Update_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_Update_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_maximum_set_gen.py index d9af167aa914..679a3c08839d 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_VmHostPayload_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_VmHostPayload_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_minimum_set_gen.py index 543bf0985031..6ed735ceefcd 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/monitors_vm_host_payload_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Monitors_VmHostPayload_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Monitors_VmHostPayload_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_maximum_set_gen.py index 6357fd5e6967..de05d5ba7e7c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Operations_List_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Operations_List_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_minimum_set_gen.py index f188db1c0c03..e053be458da4 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/operations_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Operations_List_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Operations_List_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_maximum_set_gen.py index 5e968bbfbb67..8f08fb214dbd 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Organizations_List_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Organizations_List_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_minimum_set_gen.py index 568ca58a8f20..70ee43bd950c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/organizations_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Organizations_List_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Organizations_List_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_maximum_set_gen.py index bc088601be33..1c8d8201908c 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Plans_List_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Plans_List_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_minimum_set_gen.py index 137e1a06c126..ca241401af58 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/plans_list_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -34,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/Plans_List_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/Plans_List_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_maximum_set_gen.py index 739261a2a330..ab8175e084f1 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -64,6 +65,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_CreateOrUpdate_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_CreateOrUpdate_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_minimum_set_gen.py index fe0cb571e315..35a37f70c08d 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_create_or_update_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -38,6 +39,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_CreateOrUpdate_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_CreateOrUpdate_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_maximum_set_gen.py index 498fa8e1b0fa..f24be483088a 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_Delete_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_Delete_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_minimum_set_gen.py index 389af1fc19b7..eec3383ff8cf 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_delete_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -36,6 +37,6 @@ def main(): ).result() -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_Delete_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_Delete_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_maximum_set_gen.py index 2f098a745dfc..1feec495418b 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_Get_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_Get_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_minimum_set_gen.py index 92f1d1df73a5..91fda090e6c4 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_get_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_Get_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_Get_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_maximum_set_gen.py index d08a2ea46c15..e84d5acd8f08 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_ListByNewRelicMonitorResource_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_ListByNewRelicMonitorResource_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_minimum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_minimum_set_gen.py index 483c7b6b6c68..7ef96e7642ad 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_minimum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_list_by_new_relic_monitor_resource_minimum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -37,6 +38,6 @@ def main(): print(item) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_ListByNewRelicMonitorResource_MinimumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_ListByNewRelicMonitorResource_MinimumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_update_maximum_set_gen.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_update_maximum_set_gen.py index b02aa6368aaf..8af3a51a7348 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_update_maximum_set_gen.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_samples/tag_rules_update_maximum_set_gen.py @@ -7,6 +7,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient """ @@ -63,6 +64,6 @@ def main(): print(response) -# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-01-01/examples/TagRules_Update_MaximumSet_Gen.json +# x-ms-original-file: specification/newrelic/resource-manager/NewRelic.Observability/stable/2024-10-01/examples/TagRules_Update_MaximumSet_Gen.json if __name__ == "__main__": main() diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/conftest.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/conftest.py new file mode 100644 index 000000000000..23de442c2e00 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/conftest.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +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): + newrelicobservabilitymgmt_subscription_id = os.environ.get( + "AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000" + ) + newrelicobservabilitymgmt_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + newrelicobservabilitymgmt_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + newrelicobservabilitymgmt_client_secret = os.environ.get( + "AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer( + regex=newrelicobservabilitymgmt_subscription_id, value="00000000-0000-0000-0000-000000000000" + ) + add_general_regex_sanitizer(regex=newrelicobservabilitymgmt_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=newrelicobservabilitymgmt_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer( + regex=newrelicobservabilitymgmt_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/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_operations.py new file mode 100644 index 000000000000..a8feb8b1c034 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtAccountsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_accounts_list(self, resource_group): + response = self.client.accounts.list( + user_email="str", + location="str", + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_operations_async.py new file mode 100644 index 000000000000..c5672da3c136 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_accounts_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtAccountsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_accounts_list(self, resource_group): + response = self.client.accounts.list( + user_email="str", + location="str", + api_version="2024-10-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_billing_info_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_billing_info_operations.py new file mode 100644 index 000000000000..ef267c081cdc --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtBillingInfoOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_billing_info_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_billing_info_operations_async.py new file mode 100644 index 000000000000..03d42513142c --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtBillingInfoOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, 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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_operations.py new file mode 100644 index 000000000000..4e41ce2f20c8 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtConnectedPartnerResourcesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_connected_partner_resources_list(self, resource_group): + response = self.client.connected_partner_resources.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_operations_async.py new file mode 100644 index 000000000000..bdc720730fb0 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_connected_partner_resources_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtConnectedPartnerResourcesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_connected_partner_resources_list(self, resource_group): + response = self.client.connected_partner_resources.list( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitored_subscriptions_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitored_subscriptions_operations.py new file mode 100644 index 000000000000..6ded591dbe39 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtMonitoredSubscriptionsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @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="2024-10-01", + ) + result = [r for r in response] + # 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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitored_subscriptions_begin_create_or_update(self, resource_group): + response = self.client.monitored_subscriptions.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2024-10-01", + ).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="2024-10-01", + ).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="2024-10-01", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitored_subscriptions_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitored_subscriptions_operations_async.py new file mode 100644 index 000000000000..04b3b4fd6e14 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtMonitoredSubscriptionsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async 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="2024-10-01", + ) + 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_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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitored_subscriptions_begin_create_or_update(self, resource_group): + response = await ( + await self.client.monitored_subscriptions.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + configuration_name="str", + api_version="2024-10-01", + ) + ).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="2024-10-01", + ) + ).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="2024-10-01", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations.py new file mode 100644 index 000000000000..31cca20b2741 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations.py @@ -0,0 +1,314 @@ +# 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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtMonitorsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_by_subscription(self, resource_group): + response = self.client.monitors.list_by_subscription( + api_version="2024-10-01", + ) + 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="2024-10-01", + ) + 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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_begin_create_or_update(self, resource_group): + response = self.client.monitors.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={ + "location": "str", + "accountCreationSource": "str", + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "liftrResourceCategory": "str", + "liftrResourcePreference": 0, + "marketplaceSubscriptionId": "str", + "marketplaceSubscriptionStatus": "str", + "monitoringStatus": "str", + "name": "str", + "newRelicAccountProperties": { + "accountInfo": {"accountId": "str", "ingestionKey": "str", "region": "str"}, + "organizationInfo": {"organizationId": "str"}, + "singleSignOnProperties": { + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "orgCreationSource": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "provisioningState": "str", + "saaSAzureSubscriptionStatus": "str", + "subscriptionState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2024-10-01", + ).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", + properties={ + "accountCreationSource": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "newRelicAccountProperties": { + "accountInfo": {"accountId": "str", "ingestionKey": "str", "region": "str"}, + "organizationInfo": {"organizationId": "str"}, + "singleSignOnProperties": { + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "orgCreationSource": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "tags": {"str": "str"}, + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2024-10-01", + ).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, + user_email="str", + monitor_name="str", + api_version="2024-10-01", + ).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_get_metric_rules(self, resource_group): + response = self.client.monitors.get_metric_rules( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str"}, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_get_metric_status(self, resource_group): + response = self.client.monitors.get_metric_status( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str", "azureResourceIds": ["str"]}, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_list_app_services(self, resource_group): + response = self.client.monitors.list_app_services( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str", "azureResourceIds": ["str"]}, + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_switch_billing(self, resource_group): + response = self.client.monitors.switch_billing( + resource_group_name=resource_group.name, + monitor_name="str", + request={ + "userEmail": "str", + "azureResourceId": "str", + "organizationId": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + }, + api_version="2024-10-01", + ) + + # 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", + request={"userEmail": "str", "vmIds": ["str"]}, + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_refresh_ingestion_key(self, resource_group): + response = self.client.monitors.refresh_ingestion_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + + # 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="2024-10-01", + ) + 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="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_vm_host_payload(self, resource_group): + response = self.client.monitors.vm_host_payload( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_monitors_begin_resubscribe(self, resource_group): + response = self.client.monitors.begin_resubscribe( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations_async.py new file mode 100644 index 000000000000..9248772ba370 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_monitors_operations_async.py @@ -0,0 +1,323 @@ +# 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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtMonitorsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_by_subscription(self, resource_group): + response = self.client.monitors.list_by_subscription( + api_version="2024-10-01", + ) + 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="2024-10-01", + ) + 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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_begin_create_or_update(self, resource_group): + response = await ( + await self.client.monitors.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + resource={ + "location": "str", + "accountCreationSource": "str", + "id": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "liftrResourceCategory": "str", + "liftrResourcePreference": 0, + "marketplaceSubscriptionId": "str", + "marketplaceSubscriptionStatus": "str", + "monitoringStatus": "str", + "name": "str", + "newRelicAccountProperties": { + "accountInfo": {"accountId": "str", "ingestionKey": "str", "region": "str"}, + "organizationInfo": {"organizationId": "str"}, + "singleSignOnProperties": { + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "orgCreationSource": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "provisioningState": "str", + "saaSAzureSubscriptionStatus": "str", + "subscriptionState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "tags": {"str": "str"}, + "type": "str", + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2024-10-01", + ) + ).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", + properties={ + "accountCreationSource": "str", + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "newRelicAccountProperties": { + "accountInfo": {"accountId": "str", "ingestionKey": "str", "region": "str"}, + "organizationInfo": {"organizationId": "str"}, + "singleSignOnProperties": { + "enterpriseAppId": "str", + "provisioningState": "str", + "singleSignOnState": "str", + "singleSignOnUrl": "str", + }, + "userId": "str", + }, + "orgCreationSource": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + "tags": {"str": "str"}, + "userInfo": { + "country": "str", + "emailAddress": "str", + "firstName": "str", + "lastName": "str", + "phoneNumber": "str", + }, + }, + api_version="2024-10-01", + ) + ).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, + user_email="str", + monitor_name="str", + api_version="2024-10-01", + ) + ).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_get_metric_rules(self, resource_group): + response = await self.client.monitors.get_metric_rules( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str"}, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_get_metric_status(self, resource_group): + response = await self.client.monitors.get_metric_status( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str", "azureResourceIds": ["str"]}, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_list_app_services(self, resource_group): + response = self.client.monitors.list_app_services( + resource_group_name=resource_group.name, + monitor_name="str", + request={"userEmail": "str", "azureResourceIds": ["str"]}, + api_version="2024-10-01", + ) + 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_switch_billing(self, resource_group): + response = await self.client.monitors.switch_billing( + resource_group_name=resource_group.name, + monitor_name="str", + request={ + "userEmail": "str", + "azureResourceId": "str", + "organizationId": "str", + "planData": { + "billingCycle": "str", + "effectiveDate": "2020-02-20 00:00:00", + "planDetails": "str", + "usageType": "str", + }, + }, + api_version="2024-10-01", + ) + + # 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", + request={"userEmail": "str", "vmIds": ["str"]}, + api_version="2024-10-01", + ) + 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_refresh_ingestion_key(self, resource_group): + response = await self.client.monitors.refresh_ingestion_key( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + + # 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="2024-10-01", + ) + 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="2024-10-01", + ) + 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_vm_host_payload(self, resource_group): + response = await self.client.monitors.vm_host_payload( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_monitors_begin_resubscribe(self, resource_group): + response = await ( + await self.client.monitors.begin_resubscribe( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations.py new file mode 100644 index 000000000000..f411bb533ef6 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations_async.py new file mode 100644 index 000000000000..08daba244df3 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_operations_async.py @@ -0,0 +1,30 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import pytest +from azure.mgmt.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2024-10-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_operations.py new file mode 100644 index 000000000000..2499151ca9ad --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtOrganizationsOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_organizations_list(self, resource_group): + response = self.client.organizations.list( + user_email="str", + location="str", + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_operations_async.py new file mode 100644 index 000000000000..94043c8e5e50 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_organizations_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtOrganizationsOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_organizations_list(self, resource_group): + response = self.client.organizations.list( + user_email="str", + location="str", + api_version="2024-10-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_operations.py new file mode 100644 index 000000000000..3ce20bd75196 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtPlansOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_plans_list(self, resource_group): + response = self.client.plans.list( + api_version="2024-10-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_operations_async.py new file mode 100644 index 000000000000..acf09b6755fd --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_plans_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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtPlansOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_plans_list(self, resource_group): + response = self.client.plans.list( + api_version="2024-10-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations.py new file mode 100644 index 000000000000..863e563a8422 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations.py @@ -0,0 +1,121 @@ +# 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.newrelicobservability import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtTagRulesOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_list_by_new_relic_monitor_resource(self, resource_group): + response = self.client.tag_rules.list_by_new_relic_monitor_resource( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + 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_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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_begin_create_or_update(self, resource_group): + response = self.client.tag_rules.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + resource={ + "id": "str", + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendMetrics": "str", + "userEmail": "str", + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2024-10-01", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_begin_delete(self, resource_group): + response = self.client.tag_rules.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2024-10-01", + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_tag_rules_update(self, resource_group): + response = self.client.tag_rules.update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + properties={ + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendMetrics": "str", + "userEmail": "str", + }, + }, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations_async.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations_async.py new file mode 100644 index 000000000000..e22234886350 --- /dev/null +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/generated_tests/test_new_relic_observability_mgmt_tag_rules_operations_async.py @@ -0,0 +1,126 @@ +# 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.newrelicobservability.aio import NewRelicObservabilityMgmtClient + +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 TestNewRelicObservabilityMgmtTagRulesOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(NewRelicObservabilityMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_list_by_new_relic_monitor_resource(self, resource_group): + response = self.client.tag_rules.list_by_new_relic_monitor_resource( + resource_group_name=resource_group.name, + monitor_name="str", + api_version="2024-10-01", + ) + 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_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="2024-10-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_begin_create_or_update(self, resource_group): + response = await ( + await self.client.tag_rules.begin_create_or_update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + resource={ + "id": "str", + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendMetrics": "str", + "userEmail": "str", + }, + "name": "str", + "provisioningState": "str", + "systemData": { + "createdAt": "2020-02-20 00:00:00", + "createdBy": "str", + "createdByType": "str", + "lastModifiedAt": "2020-02-20 00:00:00", + "lastModifiedBy": "str", + "lastModifiedByType": "str", + }, + "type": "str", + }, + api_version="2024-10-01", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_begin_delete(self, resource_group): + response = await ( + await self.client.tag_rules.begin_delete( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + api_version="2024-10-01", + ) + ).result() # call '.result()' to poll until service return final result + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_tag_rules_update(self, resource_group): + response = await self.client.tag_rules.update( + resource_group_name=resource_group.name, + monitor_name="str", + rule_set_name="str", + properties={ + "logRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendAadLogs": "str", + "sendActivityLogs": "str", + "sendSubscriptionLogs": "str", + }, + "metricRules": { + "filteringTags": [{"action": "str", "name": "str", "value": "str"}], + "sendMetrics": "str", + "userEmail": "str", + }, + }, + api_version="2024-10-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/setup.py b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/setup.py index 4da7d992ee4a..a317cf4a6e46 100644 --- a/sdk/newrelicobservability/azure-mgmt-newrelicobservability/setup.py +++ b/sdk/newrelicobservability/azure-mgmt-newrelicobservability/setup.py @@ -74,9 +74,10 @@ "pytyped": ["py.typed"], }, install_requires=[ - "isodate<1.0.0,>=0.6.1", - "azure-common~=1.1", - "azure-mgmt-core>=1.3.2,<2.0.0", + "isodate>=0.6.1", + "typing-extensions>=4.6.0", + "azure-common>=1.1", + "azure-mgmt-core>=1.3.2", ], python_requires=">=3.8", )