diff --git a/sdk/storageactions/azure-mgmt-storageactions/CHANGELOG.md b/sdk/storageactions/azure-mgmt-storageactions/CHANGELOG.md index 9120af57df30..6636767232c8 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/CHANGELOG.md +++ b/sdk/storageactions/azure-mgmt-storageactions/CHANGELOG.md @@ -1,5 +1,22 @@ # Release History +## 1.0.0 (2025-04-18) + +### Features Added + + - Enum `ProvisioningState` added member `ACCEPTED` + - Added enum `OnFailure` + - Added enum `OnSuccess` + - Added model `StorageTaskUpdateProperties` + - Method `StorageTasksOperations.begin_create` has a new overload `def begin_create(self: None, resource_group_name: str, storage_task_name: str, parameters: IO[bytes], content_type: str)` + - Method `StorageTasksOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, storage_task_name: str, parameters: IO[bytes], content_type: str)` + - Method `StorageTasksOperations.preview_actions` has a new overload `def preview_actions(self: None, location: str, parameters: IO[bytes], content_type: str)` + +### Breaking Changes + + - Method `StorageTask.__init__` removed default value `None` from its parameter `identity` + - Method `StorageTask.__init__` removed default value `None` from its parameter `properties` + ## 1.0.0b1 (2024-03-21) * Initial Release diff --git a/sdk/storageactions/azure-mgmt-storageactions/README.md b/sdk/storageactions/azure-mgmt-storageactions/README.md index f0f045e42b6f..29b3be628a60 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/README.md +++ b/sdk/storageactions/azure-mgmt-storageactions/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Storageactions Management Client Library. -This package has been tested with Python 3.8+. +This package has been tested with Python 3.9+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ @@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For ### Prerequisites -- Python 3.8+ is required to use this package. +- Python 3.9+ is required to use this package. - [Azure subscription](https://azure.microsoft.com/free/) ### Install the package @@ -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/storageactions/azure-mgmt-storageactions/_meta.json b/sdk/storageactions/azure-mgmt-storageactions/_meta.json index db829621ac16..322783cc2012 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/_meta.json +++ b/sdk/storageactions/azure-mgmt-storageactions/_meta.json @@ -1,11 +1,11 @@ { - "commit": "f36fad422c8d60ebdf5010840320a38248be19ab", + "commit": "5297c1393614e227ca3dad402588da8d7aef38e7", "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.33.0", + "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/storageactions/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/storageactions/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.33.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/storageactions/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/__init__.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/__init__.py index cd7eb6ea163b..c1d157ae9feb 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/__init__.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/__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 ._storage_actions_mgmt_client import StorageActionsMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._storage_actions_mgmt_client import StorageActionsMgmtClient # 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__ = [ "StorageActionsMgmtClient", ] -__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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_configuration.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_configuration.py index 4644a32ff39f..04c32f360d70 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_configuration.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_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 StorageActionsMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class StorageActionsMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for StorageActionsMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -35,7 +33,6 @@ class StorageActionsMgmtClientConfiguration(Configuration): # pylint: disable=t """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(StorageActionsMgmtClientConfiguration, self).__init__(**kwargs) api_version: str = kwargs.pop("api_version", "2023-01-01") if credential is None: @@ -48,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-storageactions/{}".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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_serialization.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_serialization.py index 4bae2292227b..f5187701d7be 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_serialization.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_serialization.py @@ -1,30 +1,12 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines +# coding=utf-8 # -------------------------------------------------------------------------- -# # Copyright (c) Microsoft Corporation. All rights reserved. -# -# The MIT License (MIT) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the ""Software""), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# +# 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. # -------------------------------------------------------------------------- -# pylint: skip-file # pyright: reportUnnecessaryTypeIgnoreComment=false from base64 import b64decode, b64encode @@ -48,11 +30,8 @@ IO, Mapping, Callable, - TypeVar, MutableMapping, - Type, List, - Mapping, ) try: @@ -62,13 +41,13 @@ import xml.etree.ElementTree as ET import isodate # type: ignore +from typing_extensions import Self -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") -ModelType = TypeVar("ModelType", bound="Model") JSON = MutableMapping[str, Any] @@ -91,6 +70,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 +93,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 +105,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 +124,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 +136,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 +158,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: @@ -184,80 +165,31 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], except NameError: _long_type = int - -class UTC(datetime.tzinfo): - """Time Zone info for handling UTC""" - - def utcoffset(self, dt): - """UTF offset for UTC is 0.""" - return datetime.timedelta(0) - - def tzname(self, dt): - """Timestamp representation.""" - return "Z" - - def dst(self, dt): - """No daylight saving for UTC.""" - return datetime.timedelta(hours=1) - - -try: - from datetime import timezone as _FixedOffset # type: ignore -except ImportError: # Python 2.7 - - class _FixedOffset(datetime.tzinfo): # type: ignore - """Fixed offset in minutes east from UTC. - Copy/pasted from Python doc - :param datetime.timedelta offset: offset in timedelta format - """ - - def __init__(self, offset): - self.__offset = offset - - def utcoffset(self, dt): - return self.__offset - - def tzname(self, dt): - return str(self.__offset.total_seconds() / 3600) - - def __repr__(self): - return "".format(self.tzname(None)) - - def dst(self, dt): - return datetime.timedelta(0) - - def __getinitargs__(self): - return (self.__offset,) - - -try: - from datetime import timezone - - TZ_UTC = timezone.utc -except ImportError: - TZ_UTC = UTC() # type: ignore +TZ_UTC = datetime.timezone.utc _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 +244,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 +280,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 +293,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 +304,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 +340,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,30 +358,31 @@ 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 @classmethod - def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = None) -> ModelType: + def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: """Parse a str using the RestAPI syntax and return a model. :param str data: A str using RestAPI structure. JSON by default. :param str content_type: JSON by default, set application/xml if XML. :returns: An instance of this model - :raises: DeserializationError if something went wrong + :raises DeserializationError: if something went wrong + :rtype: Self """ 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( - cls: Type[ModelType], + cls, data: Any, key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, - ) -> ModelType: + ) -> Self: """Parse a dict using given key extractor return a model. By default consider key @@ -431,9 +390,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 + :raises DeserializationError: if something went wrong + :rtype: Self """ deserializer = Deserializer(cls._infer_class_models()) deserializer.key_extractors = ( # type: ignore @@ -445,7 +406,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 +414,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 +471,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 +512,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 +528,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. + :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 +567,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 +610,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 +622,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 +641,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 + :raises SerializationError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized request body """ # Just in case this is a dict @@ -708,20 +681,22 @@ 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 - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :returns: The serialized URL path + :raises TypeError: if serialization fails. + :raises ValueError: if data is None """ try: output = self.serialize_data(data, data_type, **kwargs) @@ -730,30 +705,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 - :raises: TypeError if serialization fails. - :raises: ValueError if data is None + :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 +738,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 + :raises TypeError: if serialization fails. + :raises ValueError: if data is None + :returns: The serialized header """ try: if data_type in ["[str]"]: @@ -784,32 +760,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. + :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 +799,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 +819,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 +852,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 +862,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 +923,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 +948,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 +956,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 +967,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 +981,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 +1012,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 +1074,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 +1089,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. + :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 +1127,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. + :raises SerializationError: if format invalid. + :return: serialized iso """ if isinstance(attr, str): attr = isodate.parse_datetime(attr) @@ -1170,19 +1153,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 + :raises SerializationError: if format invalid + :return: serialied unix """ if isinstance(attr, int): return attr @@ -1190,11 +1174,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 +1193,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 +1215,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 +1222,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 +1281,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 +1333,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( + 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 +1355,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 +1364,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 +1386,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 @@ -1407,27 +1402,29 @@ def __call__(self, target_obj, response_data, content_type=None): :param str target_obj: Target data type to deserialize to. :param requests.Response response_data: REST response object. :param str content_type: Swagger "produces" if available. - :raises: DeserializationError if deserialization fails. + :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 :param str target_obj: Target data type to deserialize to. :param object data: Object to deserialize. - :raises: DeserializationError if deserialization fails. + :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 +1441,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 +1478,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 +1507,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 +1535,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 +1558,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 +1580,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 +1624,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. + :raises DeserializationError: if deserialization fails. :return: Deserialized object. + :rtype: object """ if data is None: return data @@ -1633,7 +1647,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 +1670,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 +1695,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,20 +1706,21 @@ 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. + :raises TypeError: if non-builtin datatype encountered. """ if attr is None: return None 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 +1746,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,8 +1757,9 @@ 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. + :raises TypeError: if string format is not valid. """ # If we're here, data is supposed to be a basic type. # If it's still an XML node, take the text @@ -1749,24 +1769,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 +1793,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 +1807,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 +1819,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 +1828,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,8 +1848,9 @@ 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. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1841,8 +1861,9 @@ 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. + :raises TypeError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1856,24 +1877,26 @@ def deserialize_decimal(attr): """Deserialize string into Decimal object. :param str attr: response string to be deserialized. - :rtype: Decimal - :raises: DeserializationError if string format invalid. + :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. + :raises ValueError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1884,8 +1907,9 @@ 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. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1893,32 +1917,33 @@ 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. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text 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. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1931,31 +1956,32 @@ 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. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text try: parsed_date = email.utils.parsedate_tz(attr) # type: ignore date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) ) if not date_obj.tzinfo: 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. + :raises DeserializationError: if string format invalid. """ if isinstance(attr, ET.Element): attr = attr.text @@ -1982,9 +2008,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 +2017,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 + :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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_storage_actions_mgmt_client.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_storage_actions_mgmt_client.py index ba3a846b360b..2e5623c8cbf2 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_storage_actions_mgmt_client.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_storage_actions_mgmt_client.py @@ -7,10 +7,15 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING, cast +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import HttpRequest, HttpResponse +from azure.core.settings import settings from azure.mgmt.core import ARMPipelineClient +from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints from . import models as _models from ._configuration import StorageActionsMgmtClientConfiguration @@ -23,11 +28,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class StorageActionsMgmtClient: """The Azure Storage Actions Management API. :ivar operations: Operations operations @@ -44,7 +48,7 @@ class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-ke :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. The value must be an UUID. Required. :type subscription_id: str - :param base_url: Service URL. Default value is "https://management.azure.com". + :param base_url: Service URL. Default value is None. :type base_url: str :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this default value may result in unsupported behavior. @@ -54,16 +58,36 @@ class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-ke """ def __init__( - self, - credential: "TokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = StorageActionsMgmtClientConfiguration( - credential=credential, subscription_id=subscription_id, **kwargs + credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **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=cast(str, 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) @@ -78,7 +102,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 @@ -98,12 +122,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) -> "StorageActionsMgmtClient": + def __enter__(self) -> Self: self._client.__enter__() return self diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_vendor.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_vendor.py deleted file mode 100644 index 0dafe0e287ff..000000000000 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_version.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_version.py index e5754a47ce68..c47f66669f1b 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_version.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0b1" +VERSION = "1.0.0" diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/__init__.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/__init__.py index b1357fdfc85d..cbb899c4466e 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/__init__.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/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 ._storage_actions_mgmt_client import StorageActionsMgmtClient +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._storage_actions_mgmt_client import StorageActionsMgmtClient # 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__ = [ "StorageActionsMgmtClient", ] -__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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_configuration.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_configuration.py index b6a5110cb1ed..64446f660572 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_configuration.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/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 StorageActionsMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes +class StorageActionsMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes """Configuration for StorageActionsMgmtClient. Note that all parameters used to create this instance are saved as instance @@ -35,7 +33,6 @@ class StorageActionsMgmtClientConfiguration(Configuration): # pylint: disable=t """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: - super(StorageActionsMgmtClientConfiguration, self).__init__(**kwargs) api_version: str = kwargs.pop("api_version", "2023-01-01") if credential is None: @@ -48,6 +45,7 @@ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **k self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-storageactions/{}".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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_storage_actions_mgmt_client.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_storage_actions_mgmt_client.py index e4da11ca2ec9..946c66af516c 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_storage_actions_mgmt_client.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/_storage_actions_mgmt_client.py @@ -7,10 +7,15 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, TYPE_CHECKING +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast +from typing_extensions import Self +from azure.core.pipeline import policies from azure.core.rest import AsyncHttpResponse, HttpRequest +from azure.core.settings import settings from azure.mgmt.core import AsyncARMPipelineClient +from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy +from azure.mgmt.core.tools import get_arm_endpoints from .. import models as _models from .._serialization import Deserializer, Serializer @@ -23,11 +28,10 @@ ) if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-keyword +class StorageActionsMgmtClient: """The Azure Storage Actions Management API. :ivar operations: Operations operations @@ -44,7 +48,7 @@ class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-ke :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. The value must be an UUID. Required. :type subscription_id: str - :param base_url: Service URL. Default value is "https://management.azure.com". + :param base_url: Service URL. Default value is None. :type base_url: str :keyword api_version: Api Version. Default value is "2023-01-01". Note that overriding this default value may result in unsupported behavior. @@ -54,16 +58,38 @@ class StorageActionsMgmtClient: # pylint: disable=client-accepts-api-version-ke """ def __init__( - self, - credential: "AsyncTokenCredential", - subscription_id: str, - base_url: str = "https://management.azure.com", - **kwargs: Any + self, credential: "AsyncTokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any ) -> None: + _cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore + _endpoints = get_arm_endpoints(_cloud) + if not base_url: + base_url = _endpoints["resource_manager"] + credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"]) self._config = StorageActionsMgmtClientConfiguration( - credential=credential, subscription_id=subscription_id, **kwargs + credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **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=cast(str, base_url), policies=_policies, **kwargs ) - self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) @@ -78,7 +104,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 @@ -98,12 +126,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) -> "StorageActionsMgmtClient": + async def __aenter__(self) -> Self: await self._client.__aenter__() return self diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/__init__.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/__init__.py index 3bcc0a8fa328..39b5abc1fb68 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/__init__.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/__init__.py @@ -5,14 +5,20 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._storage_tasks_operations import StorageTasksOperations -from ._storage_task_assignment_operations import StorageTaskAssignmentOperations -from ._storage_tasks_report_operations import StorageTasksReportOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._storage_tasks_operations import StorageTasksOperations # type: ignore +from ._storage_task_assignment_operations import StorageTaskAssignmentOperations # type: ignore +from ._storage_tasks_report_operations import StorageTasksReportOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -21,5 +27,5 @@ "StorageTaskAssignmentOperations", "StorageTasksReportOperations", ] -__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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_operations.py index 221d10c050f4..af684358765d 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -19,15 +20,15 @@ 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 ..._serialization import Deserializer, Serializer from ...operations._operations import build_list_request +from .._configuration import StorageActionsMgmtClientConfiguration T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -47,16 +48,15 @@ class Operations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: """Lists all of the available Storage Actions Rest API operations. - :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.storageactions.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -67,7 +67,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, @@ -78,14 +78,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 @@ -97,13 +95,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) @@ -113,11 +110,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 @@ -129,5 +126,3 @@ async def get_next(next_link=None): return pipeline_response return AsyncItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.StorageActions/operations"} diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_task_assignment_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_task_assignment_operations.py index 4786ed2610a5..71b5c04df20a 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_task_assignment_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_task_assignment_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -19,15 +20,15 @@ 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 ..._serialization import Deserializer, Serializer from ...operations._storage_task_assignment_operations import build_list_request +from .._configuration import StorageActionsMgmtClientConfiguration T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -47,16 +48,16 @@ class StorageTaskAssignmentOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( - self, resource_group_name: str, storage_task_name: str, maxpagesize: Optional[str] = None, **kwargs: Any + self, resource_group_name: str, storage_task_name: str, maxpagesize: Optional[int] = None, **kwargs: Any ) -> AsyncIterable["_models.StorageTaskAssignment"]: - """Lists all the storage tasks available under the given resource group. + """Lists Resource IDs of the Storage Task Assignments associated with this Storage Task. :param resource_group_name: The name of the resource group. The name is case insensitive. Required. @@ -65,10 +66,9 @@ def list( Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be - included in the list response. Default value is None. - :type maxpagesize: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param maxpagesize: Optional, specifies the maximum number of Storage Task Assignment Resource + IDs to be included in the list response. Default value is None. + :type maxpagesize: int :return: An iterator like instance of either StorageTaskAssignment or the result of cls(response) :rtype: @@ -81,7 +81,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTaskAssignmentsListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -92,18 +92,16 @@ 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, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, maxpagesize=maxpagesize, 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 @@ -115,13 +113,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("StorageTaskAssignmentsListResult", pipeline_response) @@ -131,11 +128,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 @@ -147,7 +144,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/Microsoft.StorageActions/storageTasks/{storageTaskName}/storageTaskAssignments" - } diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_operations.py index 1400e7e209ec..c724537508b3 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,10 +5,12 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -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,7 @@ from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models -from ..._vendor import _convert_request +from ..._serialization import Deserializer, Serializer from ...operations._storage_tasks_operations import ( build_create_request, build_delete_request, @@ -40,6 +42,7 @@ build_preview_actions_request, build_update_request, ) +from .._configuration import StorageActionsMgmtClientConfiguration T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -59,19 +62,19 @@ class StorageTasksOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") async def _create_initial( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTask, IO], + parameters: Union[_models.StorageTask, IO[bytes]], **kwargs: Any - ) -> Optional[_models.StorageTask]: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -84,7 +87,7 @@ async def _create_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[Optional[_models.StorageTask]] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -94,7 +97,7 @@ async def _create_initial( else: _json = self._serialize.body(parameters, "StorageTask") - request = build_create_request( + _request = build_create_request( resource_group_name=resource_group_name, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, @@ -102,44 +105,38 @@ async def _create_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201, 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("StorageTask", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("StorageTask", 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 - _create_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @overload async def begin_create( @@ -169,14 +166,6 @@ async def begin_create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for - this operation to not poll, or pass in your own initialized polling object for a personal - polling strategy. - :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of AsyncLROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -188,7 +177,7 @@ async def begin_create( self, resource_group_name: str, storage_task_name: str, - parameters: IO, + parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -207,18 +196,10 @@ async def begin_create( letters only. Required. :type storage_task_name: str :param parameters: The parameters to create a Storage Task. Required. - :type parameters: IO + :type parameters: 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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -230,7 +211,7 @@ async def begin_create( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTask, IO], + parameters: Union[_models.StorageTask, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.StorageTask]: """Asynchronously creates a new storage task resource with the specified parameters. If a storage @@ -247,19 +228,8 @@ async def begin_create( letters only. Required. :type storage_task_name: str :param parameters: The parameters to create a Storage Task. Is either a StorageTask type or a - IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTask 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. + IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTask or IO[bytes] :return: An instance of AsyncLROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -286,12 +256,13 @@ async def begin_create( params=_params, **kwargs ) + await raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -303,22 +274,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.StorageTask].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return AsyncLROPoller[_models.StorageTask]( + 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, storage_task_name: str, **kwargs: Any - ) -> None: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -330,28 +299,31 @@ 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, storage_task_name=storage_task_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) @@ -360,12 +332,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/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @distributed_trace_async async def begin_delete( @@ -380,14 +352,6 @@ async def begin_delete( Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_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: @@ -401,7 +365,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, storage_task_name=storage_task_name, api_version=api_version, @@ -410,11 +374,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( @@ -425,17 +390,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace_async async def get(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) -> _models.StorageTask: @@ -448,12 +409,11 @@ async def get(self, resource_group_name: str, storage_task_name: str, **kwargs: Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageTask or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTask :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -467,21 +427,19 @@ async def get(self, resource_group_name: str, storage_task_name: str, **kwargs: api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTask] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_task_name=storage_task_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 @@ -491,25 +449,21 @@ async def get(self, resource_group_name: str, storage_task_name: str, **kwargs: error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", 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/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore async def _update_initial( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTaskUpdateParameters, IO], + parameters: Union[_models.StorageTaskUpdateParameters, IO[bytes]], **kwargs: Any - ) -> Optional[_models.StorageTask]: - error_map = { + ) -> AsyncIterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -522,7 +476,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.StorageTask]] = kwargs.pop("cls", None) + cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -532,7 +486,7 @@ async def _update_initial( else: _json = self._serialize.body(parameters, "StorageTaskUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, @@ -540,41 +494,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("StorageTask", 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/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @overload async def begin_update( @@ -600,14 +551,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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -619,7 +562,7 @@ async def begin_update( self, resource_group_name: str, storage_task_name: str, - parameters: IO, + parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -634,18 +577,10 @@ async def begin_update( letters only. Required. :type storage_task_name: str :param parameters: The parameters to provide to update the storage task resource. Required. - :type parameters: IO + :type parameters: 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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -657,7 +592,7 @@ async def begin_update( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTaskUpdateParameters, IO], + parameters: Union[_models.StorageTaskUpdateParameters, IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[_models.StorageTask]: """Update storage task properties. @@ -670,19 +605,8 @@ async def begin_update( letters only. Required. :type storage_task_name: str :param parameters: The parameters to provide to update the storage task resource. Is either a - StorageTaskUpdateParameters type or a IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTaskUpdateParameters 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. + StorageTaskUpdateParameters type or a IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTaskUpdateParameters or IO[bytes] :return: An instance of AsyncLROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -709,12 +633,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("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -726,23 +651,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller.from_continuation_token( + return AsyncLROPoller[_models.StorageTask].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return AsyncLROPoller[_models.StorageTask]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageTask"]: """Lists all the storage tasks available under the subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageTask or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storageactions.models.StorageTask] :raises ~azure.core.exceptions.HttpResponseError: @@ -753,7 +675,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageT api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTasksListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -764,15 +686,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.StorageT 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 @@ -784,13 +704,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("StorageTasksListResult", pipeline_response) @@ -800,11 +719,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 @@ -817,10 +736,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageActions/storageTasks" - } - @distributed_trace def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.StorageTask"]: """Lists all the storage tasks available under the given resource group. @@ -828,7 +743,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy :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 StorageTask or the result of cls(response) :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storageactions.models.StorageTask] :raises ~azure.core.exceptions.HttpResponseError: @@ -839,7 +753,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTasksListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -850,16 +764,14 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy 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 @@ -871,13 +783,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("StorageTasksListResult", pipeline_response) @@ -887,11 +798,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 @@ -904,10 +815,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks" - } - @overload async def preview_actions( self, @@ -927,7 +834,6 @@ async def preview_actions( :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: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: @@ -935,7 +841,7 @@ async def preview_actions( @overload async def preview_actions( - self, location: str, parameters: IO, *, content_type: str = "application/json", **kwargs: Any + self, location: str, parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.StorageTaskPreviewAction: """Runs the input conditions against input object metadata properties and designates matched objects in response. @@ -943,11 +849,10 @@ async def preview_actions( :param location: The location to perform preview of the actions. Required. :type location: str :param parameters: The parameters to preview action condition. Required. - :type parameters: IO + :type parameters: 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: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: @@ -955,7 +860,7 @@ async def preview_actions( @distributed_trace_async async def preview_actions( - self, location: str, parameters: Union[_models.StorageTaskPreviewAction, IO], **kwargs: Any + self, location: str, parameters: Union[_models.StorageTaskPreviewAction, IO[bytes]], **kwargs: Any ) -> _models.StorageTaskPreviewAction: """Runs the input conditions against input object metadata properties and designates matched objects in response. @@ -963,17 +868,13 @@ async def preview_actions( :param location: The location to perform preview of the actions. Required. :type location: str :param parameters: The parameters to preview action condition. Is either a - StorageTaskPreviewAction type or a IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction 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 + StorageTaskPreviewAction type or a IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction or IO[bytes] :return: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -996,23 +897,21 @@ async def preview_actions( else: _json = self._serialize.body(parameters, "StorageTaskPreviewAction") - request = build_preview_actions_request( + _request = build_preview_actions_request( location=location, subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.preview_actions.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 @@ -1022,13 +921,9 @@ async def preview_actions( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("StorageTaskPreviewAction", pipeline_response) + deserialized = self._deserialize("StorageTaskPreviewAction", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - preview_actions.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageActions/locations/{location}/previewActions" - } + return deserialized # type: ignore diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_report_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_report_operations.py index 9314ac871220..7313faa3f2a5 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_report_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/aio/operations/_storage_tasks_report_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse +from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( ClientAuthenticationError, @@ -19,15 +20,15 @@ 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 ..._serialization import Deserializer, Serializer from ...operations._storage_tasks_report_operations import build_list_request +from .._configuration import StorageActionsMgmtClientConfiguration T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -47,17 +48,17 @@ class StorageTasksReportOperations: def __init__(self, *args, **kwargs) -> None: input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( self, resource_group_name: str, storage_task_name: str, - maxpagesize: Optional[str] = None, + maxpagesize: Optional[int] = None, filter: Optional[str] = None, **kwargs: Any ) -> AsyncIterable["_models.StorageTaskReportInstance"]: @@ -70,13 +71,12 @@ def list( Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be - included in the list response. Default value is None. - :type maxpagesize: str + :param maxpagesize: Optional, specifies the maximum number of Storage Task Assignment Resource + IDs to be included in the list response. Default value is None. + :type maxpagesize: int :param filter: Optional. When specified, it can be used to query using reporting properties. Default value is None. :type filter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageTaskReportInstance or the result of cls(response) :rtype: @@ -89,7 +89,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -100,19 +100,17 @@ 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, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, maxpagesize=maxpagesize, filter=filter, 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 @@ -124,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("StorageTaskReportSummary", pipeline_response) @@ -140,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 @@ -156,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/Microsoft.StorageActions/storageTasks/{storageTaskName}/reports" - } diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/__init__.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/__init__.py index 03ece32a27de..4c9aeecea1f7 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/__init__.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/__init__.py @@ -5,51 +5,65 @@ # 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 ElseCondition -from ._models_py3 import ErrorAdditionalInfo -from ._models_py3 import ErrorDetail -from ._models_py3 import ErrorResponse -from ._models_py3 import IfCondition -from ._models_py3 import ManagedServiceIdentity -from ._models_py3 import Operation -from ._models_py3 import OperationDisplay -from ._models_py3 import OperationListResult -from ._models_py3 import ProxyResource -from ._models_py3 import Resource -from ._models_py3 import StorageTask -from ._models_py3 import StorageTaskAction -from ._models_py3 import StorageTaskAssignment -from ._models_py3 import StorageTaskAssignmentsListResult -from ._models_py3 import StorageTaskOperation -from ._models_py3 import StorageTaskPreviewAction -from ._models_py3 import StorageTaskPreviewActionCondition -from ._models_py3 import StorageTaskPreviewActionIfCondition -from ._models_py3 import StorageTaskPreviewActionProperties -from ._models_py3 import StorageTaskPreviewBlobProperties -from ._models_py3 import StorageTaskPreviewContainerProperties -from ._models_py3 import StorageTaskPreviewKeyValueProperties -from ._models_py3 import StorageTaskProperties -from ._models_py3 import StorageTaskReportInstance -from ._models_py3 import StorageTaskReportProperties -from ._models_py3 import StorageTaskReportSummary -from ._models_py3 import StorageTaskUpdateParameters -from ._models_py3 import StorageTasksListResult -from ._models_py3 import SystemData -from ._models_py3 import TrackedResource -from ._models_py3 import UserAssignedIdentity +from typing import TYPE_CHECKING -from ._storage_actions_mgmt_client_enums import ActionType -from ._storage_actions_mgmt_client_enums import CreatedByType -from ._storage_actions_mgmt_client_enums import ManagedServiceIdentityType -from ._storage_actions_mgmt_client_enums import MatchedBlockName -from ._storage_actions_mgmt_client_enums import Origin -from ._storage_actions_mgmt_client_enums import ProvisioningState -from ._storage_actions_mgmt_client_enums import RunResult -from ._storage_actions_mgmt_client_enums import RunStatusEnum -from ._storage_actions_mgmt_client_enums import StorageTaskOperationName +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + + +from ._models_py3 import ( # type: ignore + ElseCondition, + ErrorAdditionalInfo, + ErrorDetail, + ErrorResponse, + IfCondition, + ManagedServiceIdentity, + Operation, + OperationDisplay, + OperationListResult, + ProxyResource, + Resource, + StorageTask, + StorageTaskAction, + StorageTaskAssignment, + StorageTaskAssignmentsListResult, + StorageTaskOperation, + StorageTaskPreviewAction, + StorageTaskPreviewActionCondition, + StorageTaskPreviewActionIfCondition, + StorageTaskPreviewActionProperties, + StorageTaskPreviewBlobProperties, + StorageTaskPreviewContainerProperties, + StorageTaskPreviewKeyValueProperties, + StorageTaskProperties, + StorageTaskReportInstance, + StorageTaskReportProperties, + StorageTaskReportSummary, + StorageTaskUpdateParameters, + StorageTaskUpdateProperties, + StorageTasksListResult, + SystemData, + TrackedResource, + UserAssignedIdentity, +) + +from ._storage_actions_mgmt_client_enums import ( # type: ignore + ActionType, + CreatedByType, + ManagedServiceIdentityType, + MatchedBlockName, + OnFailure, + OnSuccess, + Origin, + ProvisioningState, + RunResult, + RunStatusEnum, + StorageTaskOperationName, +) 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__ = [ @@ -81,6 +95,7 @@ "StorageTaskReportProperties", "StorageTaskReportSummary", "StorageTaskUpdateParameters", + "StorageTaskUpdateProperties", "StorageTasksListResult", "SystemData", "TrackedResource", @@ -89,11 +104,13 @@ "CreatedByType", "ManagedServiceIdentityType", "MatchedBlockName", + "OnFailure", + "OnSuccess", "Origin", "ProvisioningState", "RunResult", "RunStatusEnum", "StorageTaskOperationName", ] -__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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_models_py3.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_models_py3.py index cdb153e331aa..3c0d6b0acd29 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_models_py3.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_models_py3.py @@ -1,5 +1,5 @@ +# pylint: disable=line-too-long,useless-suppression,too-many-lines # coding=utf-8 -# pylint: disable=too-many-lines # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. @@ -8,25 +8,18 @@ # -------------------------------------------------------------------------- import datetime -import sys from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union from .. import _serialization -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: - # pylint: disable=unused-import,ungrouped-imports from .. import models as _models class ElseCondition(_serialization.Model): """The else block of storage task 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 operations: List of operations to execute in the else block. Required. :vartype operations: list[~azure.mgmt.storageactions.models.StorageTaskOperation] @@ -73,8 +66,8 @@ class ErrorAdditionalInfo(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.type = None - self.info = None + self.type: Optional[str] = None + self.info: Optional[JSON] = None class ErrorDetail(_serialization.Model): @@ -113,11 +106,11 @@ class ErrorDetail(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.code = None - self.message = None - self.target = None - self.details = None - self.additional_info = None + self.code: Optional[str] = None + self.message: Optional[str] = None + self.target: Optional[str] = None + self.details: Optional[List["_models.ErrorDetail"]] = None + self.additional_info: Optional[List["_models.ErrorAdditionalInfo"]] = None class ErrorResponse(_serialization.Model): @@ -144,10 +137,10 @@ def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: A class IfCondition(_serialization.Model): """The if block of storage task 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 condition: The condition predicate which is composed of object properties, eg: blob and - container properties. Required. + :ivar condition: Condition predicate to evaluate each object. See + https://aka.ms/storagetaskconditions for valid properties and operators. Required. :vartype condition: str :ivar operations: List of operations to execute when the condition predicate satisfies. Required. @@ -166,8 +159,8 @@ class IfCondition(_serialization.Model): def __init__(self, *, condition: str, operations: List["_models.StorageTaskOperation"], **kwargs: Any) -> None: """ - :keyword condition: The condition predicate which is composed of object properties, eg: blob - and container properties. Required. + :keyword condition: Condition predicate to evaluate each object. See + https://aka.ms/storagetaskconditions for valid properties and operators. Required. :paramtype condition: str :keyword operations: List of operations to execute when the condition predicate satisfies. Required. @@ -183,7 +176,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. @@ -236,8 +229,8 @@ def __init__( ~azure.mgmt.storageactions.models.UserAssignedIdentity] """ super().__init__(**kwargs) - self.principal_id = None - self.tenant_id = None + self.principal_id: Optional[str] = None + self.tenant_id: Optional[str] = None self.type = type self.user_assigned_identities = user_assigned_identities @@ -285,11 +278,11 @@ def __init__(self, *, display: Optional["_models.OperationDisplay"] = None, **kw :paramtype display: ~azure.mgmt.storageactions.models.OperationDisplay """ super().__init__(**kwargs) - self.name = None - self.is_data_action = None + self.name: Optional[str] = None + self.is_data_action: Optional[bool] = None self.display = display - self.origin = None - self.action_type = None + self.origin: Optional[Union[str, "_models.Origin"]] = None + self.action_type: Optional[Union[str, "_models.ActionType"]] = None class OperationDisplay(_serialization.Model): @@ -328,10 +321,10 @@ class OperationDisplay(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.provider = None - self.resource = None - self.operation = None - self.description = None + self.provider: Optional[str] = None + self.resource: Optional[str] = None + self.operation: Optional[str] = None + self.description: Optional[str] = None class OperationListResult(_serialization.Model): @@ -359,8 +352,8 @@ class OperationListResult(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.value = None - self.next_link = None + self.value: Optional[List["_models.Operation"]] = None + self.next_link: Optional[str] = None class Resource(_serialization.Model): @@ -398,10 +391,10 @@ class Resource(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.id = None - self.name = None - self.type = None - self.system_data = None + self.id: Optional[str] = None + self.name: Optional[str] = None + self.type: Optional[str] = None + self.system_data: Optional["_models.SystemData"] = None class ProxyResource(Resource): @@ -423,24 +416,6 @@ class ProxyResource(Resource): :vartype system_data: ~azure.mgmt.storageactions.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 TrackedResource(Resource): """The resource model definition for an Azure Resource Manager tracked top level resource which @@ -448,7 +423,7 @@ 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. E.g. "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". @@ -501,7 +476,7 @@ class StorageTask(TrackedResource): 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. E.g. "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". @@ -518,9 +493,9 @@ class StorageTask(TrackedResource): :vartype tags: dict[str, str] :ivar location: The geo-location where the resource lives. Required. :vartype location: str - :ivar identity: The managed service identity of the resource. + :ivar identity: The managed service identity of the resource. Required. :vartype identity: ~azure.mgmt.storageactions.models.ManagedServiceIdentity - :ivar properties: Properties of the storage task. + :ivar properties: Properties of the storage task. Required. :vartype properties: ~azure.mgmt.storageactions.models.StorageTaskProperties """ @@ -530,6 +505,8 @@ class StorageTask(TrackedResource): "type": {"readonly": True}, "system_data": {"readonly": True}, "location": {"required": True}, + "identity": {"required": True}, + "properties": {"required": True}, } _attribute_map = { @@ -547,9 +524,9 @@ def __init__( self, *, location: str, + identity: "_models.ManagedServiceIdentity", + properties: "_models.StorageTaskProperties", tags: Optional[Dict[str, str]] = None, - identity: Optional["_models.ManagedServiceIdentity"] = None, - properties: Optional["_models.StorageTaskProperties"] = None, **kwargs: Any ) -> None: """ @@ -557,9 +534,9 @@ def __init__( :paramtype tags: dict[str, str] :keyword location: The geo-location where the resource lives. Required. :paramtype location: str - :keyword identity: The managed service identity of the resource. + :keyword identity: The managed service identity of the resource. Required. :paramtype identity: ~azure.mgmt.storageactions.models.ManagedServiceIdentity - :keyword properties: Properties of the storage task. + :keyword properties: Properties of the storage task. Required. :paramtype properties: ~azure.mgmt.storageactions.models.StorageTaskProperties """ super().__init__(tags=tags, location=location, **kwargs) @@ -571,7 +548,7 @@ class StorageTaskAction(_serialization.Model): """The storage task action represents conditional statements and operations to be performed on target objects. - 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 if_property: The if block of storage task operation. Required. :vartype if_property: ~azure.mgmt.storageactions.models.IfCondition @@ -607,11 +584,11 @@ def __init__( class StorageTaskAssignment(_serialization.Model): - """Fetch the Storage task assignment ARM ids. + """Storage Task Assignment associated with this Storage Task. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: ARM Id of the storage task assignments, associated with the storage tasks. + :ivar id: Resource ID of the Storage Task Assignment. :vartype id: str """ @@ -626,7 +603,7 @@ class StorageTaskAssignment(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.id = None + self.id: Optional[str] = None class StorageTaskAssignmentsListResult(_serialization.Model): @@ -634,11 +611,10 @@ class StorageTaskAssignmentsListResult(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar value: Gets the list of storage task assignment Ids. + :ivar value: List of Storage Task Assignment Resource IDs associated with this Storage Task. :vartype value: list[~azure.mgmt.storageactions.models.StorageTaskAssignment] - :ivar next_link: Request URL that can be used to query next page of storage task assignment - Ids. Returned when total number of requested storage task assignment Ids exceed maximum page - size. + :ivar next_link: Request URL that can be used to query next page of Resource IDs. Returned when + total number of requested Resource IDs exceed maximum page size. :vartype next_link: str """ @@ -655,14 +631,14 @@ class StorageTaskAssignmentsListResult(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.value = None - self.next_link = None + self.value: Optional[List["_models.StorageTaskAssignment"]] = None + self.next_link: Optional[str] = None class StorageTaskOperation(_serialization.Model): """Represents an operation to be performed on the object. - All required parameters must be populated in order to send to Azure. + All required parameters must be populated in order to send to server. :ivar name: The operation to be performed on the object. Required. Known values are: "SetBlobTier", "SetBlobTags", "SetBlobImmutabilityPolicy", "SetBlobLegalHold", "SetBlobExpiry", @@ -670,12 +646,12 @@ class StorageTaskOperation(_serialization.Model): :vartype name: str or ~azure.mgmt.storageactions.models.StorageTaskOperationName :ivar parameters: Key-value parameters for the operation. :vartype parameters: dict[str, str] - :ivar on_success: Action to be taken when the operation is successful for a object. Default - value is "continue". - :vartype on_success: str - :ivar on_failure: Action to be taken when the operation fails for a object. Default value is - "break". - :vartype on_failure: str + :ivar on_success: Action to be taken when the operation is successful for a object. Known + values are: "continue" and "continue". + :vartype on_success: str or ~azure.mgmt.storageactions.models.OnSuccess + :ivar on_failure: Action to be taken when the operation fails for a object. Known values are: + "break" and "break". + :vartype on_failure: str or ~azure.mgmt.storageactions.models.OnFailure """ _validation = { @@ -694,8 +670,8 @@ def __init__( *, name: Union[str, "_models.StorageTaskOperationName"], parameters: Optional[Dict[str, str]] = None, - on_success: Optional[Literal["continue"]] = None, - on_failure: Optional[Literal["break"]] = None, + on_success: Optional[Union[str, "_models.OnSuccess"]] = None, + on_failure: Optional[Union[str, "_models.OnFailure"]] = None, **kwargs: Any ) -> None: """ @@ -705,12 +681,12 @@ def __init__( :paramtype name: str or ~azure.mgmt.storageactions.models.StorageTaskOperationName :keyword parameters: Key-value parameters for the operation. :paramtype parameters: dict[str, str] - :keyword on_success: Action to be taken when the operation is successful for a object. Default - value is "continue". - :paramtype on_success: str - :keyword on_failure: Action to be taken when the operation fails for a object. Default value is - "break". - :paramtype on_failure: str + :keyword on_success: Action to be taken when the operation is successful for a object. Known + values are: "continue" and "continue". + :paramtype on_success: str or ~azure.mgmt.storageactions.models.OnSuccess + :keyword on_failure: Action to be taken when the operation fails for a object. Known values + are: "break" and "break". + :paramtype on_failure: str or ~azure.mgmt.storageactions.models.OnFailure """ super().__init__(**kwargs) self.name = name @@ -722,7 +698,7 @@ def __init__( class StorageTaskPreviewAction(_serialization.Model): """Storage Task Preview Action. - 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 properties: Properties of the storage task preview. Required. :vartype properties: ~azure.mgmt.storageactions.models.StorageTaskPreviewActionProperties @@ -749,7 +725,7 @@ class StorageTaskPreviewActionCondition(_serialization.Model): """Represents the storage task conditions to be tested for a match with container and blob properties. - 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 if_property: The condition to be tested for a match with container and blob properties. Required. @@ -807,16 +783,15 @@ def __init__(self, *, condition: Optional[str] = None, **kwargs: Any) -> None: class StorageTaskPreviewActionProperties(_serialization.Model): """Storage task preview action properties. - 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 container: Preview action container properties to be tested for a match with the provided - condition. Required. + :ivar container: Properties of a sample container to test for a match with the preview action. + Required. :vartype container: ~azure.mgmt.storageactions.models.StorageTaskPreviewContainerProperties - :ivar blobs: Preview action container properties to be tested for a match with the provided - condition. Required. + :ivar blobs: Properties of some sample blobs in the container to test for matches with the + preview action. Required. :vartype blobs: list[~azure.mgmt.storageactions.models.StorageTaskPreviewBlobProperties] - :ivar action: Preview action container properties to be tested for a match with the provided - condition. Required. + :ivar action: Preview action to test. Required. :vartype action: ~azure.mgmt.storageactions.models.StorageTaskPreviewActionCondition """ @@ -841,14 +816,13 @@ def __init__( **kwargs: Any ) -> None: """ - :keyword container: Preview action container properties to be tested for a match with the - provided condition. Required. + :keyword container: Properties of a sample container to test for a match with the preview + action. Required. :paramtype container: ~azure.mgmt.storageactions.models.StorageTaskPreviewContainerProperties - :keyword blobs: Preview action container properties to be tested for a match with the provided - condition. Required. + :keyword blobs: Properties of some sample blobs in the container to test for matches with the + preview action. Required. :paramtype blobs: list[~azure.mgmt.storageactions.models.StorageTaskPreviewBlobProperties] - :keyword action: Preview action container properties to be tested for a match with the provided - condition. Required. + :keyword action: Preview action to test. Required. :paramtype action: ~azure.mgmt.storageactions.models.StorageTaskPreviewActionCondition """ super().__init__(**kwargs) @@ -862,7 +836,7 @@ class StorageTaskPreviewBlobProperties(_serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar name: property for the container name. + :ivar name: Name of test blob. :vartype name: str :ivar properties: properties key value pairs to be tested for a match against the provided condition. @@ -900,7 +874,7 @@ def __init__( **kwargs: Any ) -> None: """ - :keyword name: property for the container name. + :keyword name: Name of test blob. :paramtype name: str :keyword properties: properties key value pairs to be tested for a match against the provided condition. @@ -918,13 +892,13 @@ def __init__( self.properties = properties self.metadata = metadata self.tags = tags - self.matched_block = None + self.matched_block: Optional[Union[str, "_models.MatchedBlockName"]] = None class StorageTaskPreviewContainerProperties(_serialization.Model): """Storage task preview container properties. - :ivar name: property for the container name. + :ivar name: Name of test container. :vartype name: str :ivar metadata: metadata key value pairs to be tested for a match against the provided condition. @@ -944,7 +918,7 @@ def __init__( **kwargs: Any ) -> None: """ - :keyword name: property for the container name. + :keyword name: Name of test container. :paramtype name: str :keyword metadata: metadata key value pairs to be tested for a match against the provided condition. @@ -987,7 +961,7 @@ class StorageTaskProperties(_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 task_version: Storage task version. :vartype task_version: int @@ -999,8 +973,8 @@ class StorageTaskProperties(_serialization.Model): :ivar action: The storage task action that is executed. Required. :vartype action: ~azure.mgmt.storageactions.models.StorageTaskAction :ivar provisioning_state: Represents the provisioning state of the storage task. Known values - are: "ValidateSubscriptionQuotaBegin", "ValidateSubscriptionQuotaEnd", "Creating", "Succeeded", - "Deleting", "Canceled", and "Failed". + are: "ValidateSubscriptionQuotaBegin", "ValidateSubscriptionQuotaEnd", "Accepted", "Creating", + "Succeeded", "Deleting", "Canceled", and "Failed". :vartype provisioning_state: str or ~azure.mgmt.storageactions.models.ProvisioningState :ivar creation_time_in_utc: The creation date and time of the storage task in UTC. :vartype creation_time_in_utc: ~datetime.datetime @@ -1035,12 +1009,12 @@ def __init__(self, *, enabled: bool, description: str, action: "_models.StorageT :paramtype action: ~azure.mgmt.storageactions.models.StorageTaskAction """ super().__init__(**kwargs) - self.task_version = None + self.task_version: Optional[int] = None self.enabled = enabled self.description = description self.action = action - self.provisioning_state = None - self.creation_time_in_utc = None + self.provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None + self.creation_time_in_utc: Optional[datetime.datetime] = None class StorageTaskReportInstance(ProxyResource): @@ -1087,16 +1061,15 @@ def __init__(self, *, properties: Optional["_models.StorageTaskReportProperties" self.properties = properties -class StorageTaskReportProperties(_serialization.Model): # pylint: disable=too-many-instance-attributes +class StorageTaskReportProperties(_serialization.Model): """Storage task execution report for a run instance. Variables are only populated by the server, and will be ignored when sending a request. - :ivar task_assignment_id: Represents the Storage Task Assignment Id associated with the storage - task that provided an execution context. + :ivar task_assignment_id: Resource ID of the Storage Task Assignment associated with this + reported run. :vartype task_assignment_id: str - :ivar storage_account_id: Represents the Storage Account Id where the storage task definition - was applied and executed. + :ivar storage_account_id: Resource ID of the Storage Account where this reported run executed. :vartype storage_account_id: str :ivar start_time: Start time of the run instance. Filter options such as startTime gt '2023-06-26T20:51:24.4494016Z' and other comparison operators can be used as described for @@ -1137,7 +1110,7 @@ class StorageTaskReportProperties(_serialization.Model): # pylint: disable=too- :ivar summary_report_path: Full path to the verbose report stored in the reporting container as specified in the assignment execution context for the storage account. :vartype summary_report_path: str - :ivar task_id: Storage Task Arm Id. + :ivar task_id: Resource ID of the Storage Task applied during this run. :vartype task_id: str :ivar task_version: Storage Task Version. :vartype task_version: str @@ -1183,20 +1156,20 @@ class StorageTaskReportProperties(_serialization.Model): # pylint: disable=too- def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.task_assignment_id = None - self.storage_account_id = None - self.start_time = None - self.finish_time = None - self.objects_targeted_count = None - self.objects_operated_on_count = None - self.object_failed_count = None - self.objects_succeeded_count = None - self.run_status_error = None - self.run_status_enum = None - self.summary_report_path = None - self.task_id = None - self.task_version = None - self.run_result = None + self.task_assignment_id: Optional[str] = None + self.storage_account_id: Optional[str] = None + self.start_time: Optional[str] = None + self.finish_time: Optional[str] = None + self.objects_targeted_count: Optional[str] = None + self.objects_operated_on_count: Optional[str] = None + self.object_failed_count: Optional[str] = None + self.objects_succeeded_count: Optional[str] = None + self.run_status_error: Optional[str] = None + self.run_status_enum: Optional[Union[str, "_models.RunStatusEnum"]] = None + self.summary_report_path: Optional[str] = None + self.task_id: Optional[str] = None + self.task_version: Optional[str] = None + self.run_result: Optional[Union[str, "_models.RunResult"]] = None class StorageTaskReportSummary(_serialization.Model): @@ -1225,12 +1198,12 @@ class StorageTaskReportSummary(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.value = None - self.next_link = None + self.value: Optional[List["_models.StorageTaskReportInstance"]] = None + self.next_link: Optional[str] = None class StorageTasksListResult(_serialization.Model): - """The response from the List Storage Tasks operation. + """The response from the List Storage Task operation. Variables are only populated by the server, and will be ignored when sending a request. @@ -1254,8 +1227,8 @@ class StorageTasksListResult(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.value = None - self.next_link = None + self.value: Optional[List["_models.StorageTask"]] = None + self.next_link: Optional[str] = None class StorageTaskUpdateParameters(_serialization.Model): @@ -1269,13 +1242,13 @@ class StorageTaskUpdateParameters(_serialization.Model): characters and a value no greater in length than 256 characters. :vartype tags: dict[str, str] :ivar properties: Properties of the storage task. - :vartype properties: ~azure.mgmt.storageactions.models.StorageTaskProperties + :vartype properties: ~azure.mgmt.storageactions.models.StorageTaskUpdateProperties """ _attribute_map = { "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, "tags": {"key": "tags", "type": "{str}"}, - "properties": {"key": "properties", "type": "StorageTaskProperties"}, + "properties": {"key": "properties", "type": "StorageTaskUpdateProperties"}, } def __init__( @@ -1283,7 +1256,7 @@ def __init__( *, identity: Optional["_models.ManagedServiceIdentity"] = None, tags: Optional[Dict[str, str]] = None, - properties: Optional["_models.StorageTaskProperties"] = None, + properties: Optional["_models.StorageTaskUpdateProperties"] = None, **kwargs: Any ) -> None: """ @@ -1295,7 +1268,7 @@ def __init__( characters and a value no greater in length than 256 characters. :paramtype tags: dict[str, str] :keyword properties: Properties of the storage task. - :paramtype properties: ~azure.mgmt.storageactions.models.StorageTaskProperties + :paramtype properties: ~azure.mgmt.storageactions.models.StorageTaskUpdateProperties """ super().__init__(**kwargs) self.identity = identity @@ -1303,6 +1276,67 @@ def __init__( self.properties = properties +class StorageTaskUpdateProperties(_serialization.Model): + """Properties of the storage task. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar task_version: Storage task version. + :vartype task_version: int + :ivar enabled: Storage Task is enabled when set to true and disabled when set to false. + :vartype enabled: bool + :ivar description: Text that describes the purpose of the storage task. + :vartype description: str + :ivar action: The storage task action that is executed. + :vartype action: ~azure.mgmt.storageactions.models.StorageTaskAction + :ivar provisioning_state: Represents the provisioning state of the storage task. Known values + are: "ValidateSubscriptionQuotaBegin", "ValidateSubscriptionQuotaEnd", "Accepted", "Creating", + "Succeeded", "Deleting", "Canceled", and "Failed". + :vartype provisioning_state: str or ~azure.mgmt.storageactions.models.ProvisioningState + :ivar creation_time_in_utc: The creation date and time of the storage task in UTC. + :vartype creation_time_in_utc: ~datetime.datetime + """ + + _validation = { + "task_version": {"readonly": True, "maximum": 1, "minimum": 1}, + "provisioning_state": {"readonly": True}, + "creation_time_in_utc": {"readonly": True}, + } + + _attribute_map = { + "task_version": {"key": "taskVersion", "type": "int"}, + "enabled": {"key": "enabled", "type": "bool"}, + "description": {"key": "description", "type": "str"}, + "action": {"key": "action", "type": "StorageTaskAction"}, + "provisioning_state": {"key": "provisioningState", "type": "str"}, + "creation_time_in_utc": {"key": "creationTimeInUtc", "type": "iso-8601"}, + } + + def __init__( + self, + *, + enabled: Optional[bool] = None, + description: Optional[str] = None, + action: Optional["_models.StorageTaskAction"] = None, + **kwargs: Any + ) -> None: + """ + :keyword enabled: Storage Task is enabled when set to true and disabled when set to false. + :paramtype enabled: bool + :keyword description: Text that describes the purpose of the storage task. + :paramtype description: str + :keyword action: The storage task action that is executed. + :paramtype action: ~azure.mgmt.storageactions.models.StorageTaskAction + """ + super().__init__(**kwargs) + self.task_version: Optional[int] = None + self.enabled = enabled + self.description = description + self.action = action + self.provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None + self.creation_time_in_utc: Optional[datetime.datetime] = None + + class SystemData(_serialization.Model): """Metadata pertaining to creation and last modification of the resource. @@ -1391,5 +1425,5 @@ class UserAssignedIdentity(_serialization.Model): def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) - self.principal_id = None - self.client_id = None + self.principal_id: Optional[str] = None + self.client_id: Optional[str] = None diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_storage_actions_mgmt_client_enums.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_storage_actions_mgmt_client_enums.py index cd74f9195a91..092bdf087842 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_storage_actions_mgmt_client_enums.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/models/_storage_actions_mgmt_client_enums.py @@ -46,6 +46,20 @@ class MatchedBlockName(str, Enum, metaclass=CaseInsensitiveEnumMeta): ELSE_ENUM = "Else" +class OnFailure(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Action to be taken when the operation fails for a object.""" + + BREAK = "break" + BREAK_ENUM = "break" + + +class OnSuccess(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Action to be taken when the operation is successful for a object.""" + + CONTINUE = "continue" + CONTINUE_ENUM = "continue" + + class Origin(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The intended executor of the operation; as in Resource Based Access Control (RBAC) and audit logs UX. Default value is "user,system". @@ -61,6 +75,7 @@ class ProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): VALIDATE_SUBSCRIPTION_QUOTA_BEGIN = "ValidateSubscriptionQuotaBegin" VALIDATE_SUBSCRIPTION_QUOTA_END = "ValidateSubscriptionQuotaEnd" + ACCEPTED = "Accepted" CREATING = "Creating" SUCCEEDED = "Succeeded" DELETING = "Deleting" diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/__init__.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/__init__.py index 3bcc0a8fa328..39b5abc1fb68 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/__init__.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/__init__.py @@ -5,14 +5,20 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +# pylint: disable=wrong-import-position -from ._operations import Operations -from ._storage_tasks_operations import StorageTasksOperations -from ._storage_task_assignment_operations import StorageTaskAssignmentOperations -from ._storage_tasks_report_operations import StorageTasksReportOperations +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ._patch import * # pylint: disable=unused-wildcard-import + +from ._operations import Operations # type: ignore +from ._storage_tasks_operations import StorageTasksOperations # type: ignore +from ._storage_task_assignment_operations import StorageTaskAssignmentOperations # type: ignore +from ._storage_tasks_report_operations import StorageTasksReportOperations # type: ignore from ._patch import __all__ as _patch_all -from ._patch import * # pylint: disable=unused-wildcard-import +from ._patch import * from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -21,5 +27,5 @@ "StorageTaskAssignmentOperations", "StorageTasksReportOperations", ] -__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/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_operations.py index 0ac8f8eb0f21..47875d235264 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_operations.py @@ -1,4 +1,3 @@ -# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +5,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -19,15 +20,14 @@ ) 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 +from .._configuration import StorageActionsMgmtClientConfiguration +from .._serialization import Deserializer, Serializer T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -69,16 +69,15 @@ class Operations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: """Lists all of the available Storage Actions Rest API operations. - :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.storageactions.models.Operation] :raises ~azure.core.exceptions.HttpResponseError: @@ -89,7 +88,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 +99,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 +116,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 +131,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 +147,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = {"url": "/providers/Microsoft.StorageActions/operations"} diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_task_assignment_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_task_assignment_operations.py index 89d7b73e2162..5b68ccc8d10a 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_task_assignment_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_task_assignment_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +6,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -19,15 +21,14 @@ ) 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 +from .._configuration import StorageActionsMgmtClientConfiguration +from .._serialization import Deserializer, Serializer T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -41,7 +42,7 @@ def build_list_request( storage_task_name: str, subscription_id: str, *, - maxpagesize: Optional[str] = None, + maxpagesize: Optional[int] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -54,7 +55,7 @@ def build_list_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}/storageTaskAssignments", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -69,7 +70,7 @@ def build_list_request( # Construct parameters if maxpagesize is not None: - _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "str") + _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers @@ -92,16 +93,16 @@ class StorageTaskAssignmentOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( - self, resource_group_name: str, storage_task_name: str, maxpagesize: Optional[str] = None, **kwargs: Any + self, resource_group_name: str, storage_task_name: str, maxpagesize: Optional[int] = None, **kwargs: Any ) -> Iterable["_models.StorageTaskAssignment"]: - """Lists all the storage tasks available under the given resource group. + """Lists Resource IDs of the Storage Task Assignments associated with this Storage Task. :param resource_group_name: The name of the resource group. The name is case insensitive. Required. @@ -110,10 +111,9 @@ def list( Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be - included in the list response. Default value is None. - :type maxpagesize: str - :keyword callable cls: A custom type or function that will be passed the direct response + :param maxpagesize: Optional, specifies the maximum number of Storage Task Assignment Resource + IDs to be included in the list response. Default value is None. + :type maxpagesize: int :return: An iterator like instance of either StorageTaskAssignment or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storageactions.models.StorageTaskAssignment] @@ -125,7 +125,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTaskAssignmentsListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -136,18 +136,16 @@ 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, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, maxpagesize=maxpagesize, 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 @@ -159,13 +157,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("StorageTaskAssignmentsListResult", pipeline_response) @@ -175,11 +172,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 @@ -191,7 +188,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}/storageTaskAssignments" - } diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_operations.py index e1c5bb318d6e..aa667e935b6f 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression,too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,31 +6,34 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, 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 from azure.mgmt.core.polling.arm_polling import ARMPolling from .. import models as _models -from .._serialization import Serializer -from .._vendor import _convert_request +from .._configuration import StorageActionsMgmtClientConfiguration +from .._serialization import Deserializer, Serializer T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -53,7 +56,7 @@ def build_create_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -90,7 +93,7 @@ def build_delete_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -125,7 +128,7 @@ def build_get_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -161,7 +164,7 @@ def build_update_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -220,7 +223,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -251,7 +254,7 @@ def build_preview_actions_request(location: str, subscription_id: str, **kwargs: _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.StorageActions/locations/{location}/previewActions", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), "location": _SERIALIZER.url("location", location, "str"), @@ -284,19 +287,19 @@ class StorageTasksOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") def _create_initial( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTask, IO], + parameters: Union[_models.StorageTask, IO[bytes]], **kwargs: Any - ) -> Optional[_models.StorageTask]: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -309,7 +312,7 @@ def _create_initial( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[Optional[_models.StorageTask]] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -319,7 +322,7 @@ def _create_initial( else: _json = self._serialize.body(parameters, "StorageTask") - request = build_create_request( + _request = build_create_request( resource_group_name=resource_group_name, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, @@ -327,44 +330,38 @@ def _create_initial( content_type=content_type, json=_json, content=_content, - template_url=self._create_initial.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) - _stream = False + _decompress = kwargs.pop("decompress", True) + _stream = True pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=_stream, **kwargs + _request, stream=_stream, **kwargs ) response = pipeline_response.http_response if response.status_code not in [200, 201, 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("StorageTask", pipeline_response) - - if response.status_code == 201: - deserialized = self._deserialize("StorageTask", pipeline_response) - 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) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - _create_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @overload def begin_create( @@ -394,14 +391,6 @@ def begin_create( :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. Default value is "application/json". :paramtype content_type: str - :keyword callable cls: A custom type or function that will be passed the direct response - :keyword str continuation_token: A continuation token to restart a poller from a saved state. - :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this - operation to not poll, or pass in your own initialized polling object for a personal polling - strategy. - :paramtype polling: bool or ~azure.core.polling.PollingMethod - :keyword int polling_interval: Default waiting time between two polls for LRO operations if no - Retry-After header is present. :return: An instance of LROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -413,7 +402,7 @@ def begin_create( self, resource_group_name: str, storage_task_name: str, - parameters: IO, + parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -432,18 +421,10 @@ def begin_create( letters only. Required. :type storage_task_name: str :param parameters: The parameters to create a Storage Task. Required. - :type parameters: IO + :type parameters: 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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -455,7 +436,7 @@ def begin_create( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTask, IO], + parameters: Union[_models.StorageTask, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.StorageTask]: """Asynchronously creates a new storage task resource with the specified parameters. If a storage @@ -472,19 +453,8 @@ def begin_create( letters only. Required. :type storage_task_name: str :param parameters: The parameters to create a Storage Task. Is either a StorageTask type or a - IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTask 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. + IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTask or IO[bytes] :return: An instance of LROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -511,12 +481,13 @@ def begin_create( params=_params, **kwargs ) + raw_result.http_response.read() # type: ignore kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - deserialized = self._deserialize("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -528,22 +499,18 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.StorageTask].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_create.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return LROPoller[_models.StorageTask]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) - def _delete_initial( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, storage_task_name: str, **kwargs: Any - ) -> None: - error_map = { + def _delete_initial(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -555,28 +522,31 @@ 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, storage_task_name=storage_task_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) @@ -585,12 +555,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/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @distributed_trace def begin_delete(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) -> LROPoller[None]: @@ -603,14 +573,6 @@ def begin_delete(self, resource_group_name: str, storage_task_name: str, **kwarg Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_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: @@ -624,7 +586,7 @@ def begin_delete(self, resource_group_name: str, storage_task_name: str, **kwarg 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, storage_task_name=storage_task_name, api_version=api_version, @@ -633,11 +595,12 @@ def begin_delete(self, resource_group_name: str, storage_task_name: str, **kwarg 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( @@ -648,17 +611,13 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent- else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[None].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_delete.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method) # type: ignore @distributed_trace def get(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) -> _models.StorageTask: @@ -671,12 +630,11 @@ def get(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) - Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: StorageTask or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTask :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -690,21 +648,19 @@ def get(self, resource_group_name: str, storage_task_name: str, **kwargs: Any) - api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTask] = kwargs.pop("cls", None) - request = build_get_request( + _request = build_get_request( resource_group_name=resource_group_name, storage_task_name=storage_task_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 @@ -714,25 +670,21 @@ def get(self, resource_group_name: str, storage_task_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("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) - - return deserialized + return cls(pipeline_response, deserialized, {}) # type: ignore - get.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore def _update_initial( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTaskUpdateParameters, IO], + parameters: Union[_models.StorageTaskUpdateParameters, IO[bytes]], **kwargs: Any - ) -> Optional[_models.StorageTask]: - error_map = { + ) -> Iterator[bytes]: + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -745,7 +697,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.StorageTask]] = kwargs.pop("cls", None) + cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None @@ -755,7 +707,7 @@ def _update_initial( else: _json = self._serialize.body(parameters, "StorageTaskUpdateParameters") - request = build_update_request( + _request = build_update_request( resource_group_name=resource_group_name, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, @@ -763,41 +715,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("StorageTask", pipeline_response) - 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) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized - - _update_initial.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return deserialized # type: ignore @overload def begin_update( @@ -823,14 +772,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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -842,7 +783,7 @@ def begin_update( self, resource_group_name: str, storage_task_name: str, - parameters: IO, + parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any @@ -857,18 +798,10 @@ def begin_update( letters only. Required. :type storage_task_name: str :param parameters: The parameters to provide to update the storage task resource. Required. - :type parameters: IO + :type parameters: 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 StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -880,7 +813,7 @@ def begin_update( self, resource_group_name: str, storage_task_name: str, - parameters: Union[_models.StorageTaskUpdateParameters, IO], + parameters: Union[_models.StorageTaskUpdateParameters, IO[bytes]], **kwargs: Any ) -> LROPoller[_models.StorageTask]: """Update storage task properties. @@ -893,19 +826,8 @@ def begin_update( letters only. Required. :type storage_task_name: str :param parameters: The parameters to provide to update the storage task resource. Is either a - StorageTaskUpdateParameters type or a IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTaskUpdateParameters 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. + StorageTaskUpdateParameters type or a IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTaskUpdateParameters or IO[bytes] :return: An instance of LROPoller that returns either StorageTask or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storageactions.models.StorageTask] @@ -932,12 +854,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("StorageTask", pipeline_response) + deserialized = self._deserialize("StorageTask", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore return deserialized if polling is True: @@ -949,23 +872,20 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller.from_continuation_token( + return LROPoller[_models.StorageTask].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - - begin_update.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}" - } + return LROPoller[_models.StorageTask]( + self._client, raw_result, get_long_running_output, polling_method # type: ignore + ) @distributed_trace def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageTask"]: """Lists all the storage tasks available under the subscription. - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageTask or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storageactions.models.StorageTask] :raises ~azure.core.exceptions.HttpResponseError: @@ -976,7 +896,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageTask"] api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTasksListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -987,15 +907,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.StorageTask"] 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 @@ -1007,13 +925,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("StorageTasksListResult", pipeline_response) @@ -1023,11 +940,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 @@ -1040,10 +957,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_subscription.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageActions/storageTasks" - } - @distributed_trace def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.StorageTask"]: """Lists all the storage tasks available under the given resource group. @@ -1051,7 +964,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite :param resource_group_name: The name of the resource group. The name is case insensitive. Required. :type resource_group_name: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageTask or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storageactions.models.StorageTask] :raises ~azure.core.exceptions.HttpResponseError: @@ -1062,7 +974,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTasksListResult] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1073,16 +985,14 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite def prepare_request(next_link=None): if not next_link: - request = build_list_by_resource_group_request( + _request = build_list_by_resource_group_request( resource_group_name=resource_group_name, subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_resource_group.metadata["url"], headers=_headers, params=_params, ) - request = _convert_request(request) - request.url = self._client.format_url(request.url) + _request.url = self._client.format_url(_request.url) else: # make call to next link with the client's api-version @@ -1094,13 +1004,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("StorageTasksListResult", pipeline_response) @@ -1110,11 +1019,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 @@ -1127,10 +1036,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list_by_resource_group.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks" - } - @overload def preview_actions( self, @@ -1150,7 +1055,6 @@ def preview_actions( :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: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: @@ -1158,7 +1062,7 @@ def preview_actions( @overload def preview_actions( - self, location: str, parameters: IO, *, content_type: str = "application/json", **kwargs: Any + self, location: str, parameters: IO[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> _models.StorageTaskPreviewAction: """Runs the input conditions against input object metadata properties and designates matched objects in response. @@ -1166,11 +1070,10 @@ def preview_actions( :param location: The location to perform preview of the actions. Required. :type location: str :param parameters: The parameters to preview action condition. Required. - :type parameters: IO + :type parameters: 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: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: @@ -1178,7 +1081,7 @@ def preview_actions( @distributed_trace def preview_actions( - self, location: str, parameters: Union[_models.StorageTaskPreviewAction, IO], **kwargs: Any + self, location: str, parameters: Union[_models.StorageTaskPreviewAction, IO[bytes]], **kwargs: Any ) -> _models.StorageTaskPreviewAction: """Runs the input conditions against input object metadata properties and designates matched objects in response. @@ -1186,17 +1089,13 @@ def preview_actions( :param location: The location to perform preview of the actions. Required. :type location: str :param parameters: The parameters to preview action condition. Is either a - StorageTaskPreviewAction type or a IO type. Required. - :type parameters: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction 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 + StorageTaskPreviewAction type or a IO[bytes] type. Required. + :type parameters: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction or IO[bytes] :return: StorageTaskPreviewAction or the result of cls(response) :rtype: ~azure.mgmt.storageactions.models.StorageTaskPreviewAction :raises ~azure.core.exceptions.HttpResponseError: """ - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -1219,23 +1118,21 @@ def preview_actions( else: _json = self._serialize.body(parameters, "StorageTaskPreviewAction") - request = build_preview_actions_request( + _request = build_preview_actions_request( location=location, subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, content=_content, - template_url=self.preview_actions.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 @@ -1245,13 +1142,9 @@ def preview_actions( error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize("StorageTaskPreviewAction", pipeline_response) + deserialized = self._deserialize("StorageTaskPreviewAction", pipeline_response.http_response) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, deserialized, {}) # type: ignore - return deserialized - - preview_actions.metadata = { - "url": "/subscriptions/{subscriptionId}/providers/Microsoft.StorageActions/locations/{location}/previewActions" - } + return deserialized # type: ignore diff --git a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_report_operations.py b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_report_operations.py index 6b6290a56f0d..028b918393c7 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_report_operations.py +++ b/sdk/storageactions/azure-mgmt-storageactions/azure/mgmt/storageactions/operations/_storage_tasks_report_operations.py @@ -1,4 +1,4 @@ -# pylint: disable=too-many-lines +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -6,9 +6,11 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from collections.abc import MutableMapping from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse +from azure.core import PipelineClient from azure.core.exceptions import ( ClientAuthenticationError, HttpResponseError, @@ -19,15 +21,14 @@ ) 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 +from .._configuration import StorageActionsMgmtClientConfiguration +from .._serialization import Deserializer, Serializer T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -41,7 +42,7 @@ def build_list_request( storage_task_name: str, subscription_id: str, *, - maxpagesize: Optional[str] = None, + maxpagesize: Optional[int] = None, filter: Optional[str] = None, **kwargs: Any ) -> HttpRequest: @@ -55,7 +56,7 @@ def build_list_request( _url = kwargs.pop( "template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}/reports", - ) # pylint: disable=line-too-long + ) path_format_arguments = { "resourceGroupName": _SERIALIZER.url( "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 @@ -70,7 +71,7 @@ def build_list_request( # Construct parameters if maxpagesize is not None: - _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "str") + _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int") if filter is not None: _params["$filter"] = _SERIALIZER.query("filter", filter, "str") _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -95,17 +96,17 @@ class StorageTasksReportOperations: def __init__(self, *args, **kwargs): input_args = list(args) - self._client = input_args.pop(0) if input_args else kwargs.pop("client") - self._config = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") + self._config: StorageActionsMgmtClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( self, resource_group_name: str, storage_task_name: str, - maxpagesize: Optional[str] = None, + maxpagesize: Optional[int] = None, filter: Optional[str] = None, **kwargs: Any ) -> Iterable["_models.StorageTaskReportInstance"]: @@ -118,13 +119,12 @@ def list( Storage task names must be between 3 and 18 characters in length and use numbers and lower-case letters only. Required. :type storage_task_name: str - :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be - included in the list response. Default value is None. - :type maxpagesize: str + :param maxpagesize: Optional, specifies the maximum number of Storage Task Assignment Resource + IDs to be included in the list response. Default value is None. + :type maxpagesize: int :param filter: Optional. When specified, it can be used to query using reporting properties. Default value is None. :type filter: str - :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either StorageTaskReportInstance or the result of cls(response) :rtype: @@ -137,7 +137,7 @@ def list( api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None) - error_map = { + error_map: MutableMapping = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError, @@ -148,19 +148,17 @@ 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, storage_task_name=storage_task_name, subscription_id=self._config.subscription_id, maxpagesize=maxpagesize, filter=filter, 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 @@ -172,13 +170,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("StorageTaskReportSummary", pipeline_response) @@ -188,11 +185,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 @@ -204,7 +201,3 @@ def get_next(next_link=None): return pipeline_response return ItemPaged(get_next, extract_data) - - list.metadata = { - "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageActions/storageTasks/{storageTaskName}/reports" - } diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/operations_list.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/operations_list.py index d306e73989fc..5e354e5ada9d 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/operations_list.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/operations_list.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/perform_storage_task_actions_preview.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/perform_storage_task_actions_preview.py index 0e2174026143..8f2679e2ef0d 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/perform_storage_task_actions_preview.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/misc/perform_storage_task_actions_preview.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/delete_storage_task.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/delete_storage_task.py index 7901765c23de..0490c3e41890 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/delete_storage_task.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/delete_storage_task.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/get_storage_task.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/get_storage_task.py index ce611430da4e..7e2efc67fcc7 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/get_storage_task.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/get_storage_task.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/patch_storage_task.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/patch_storage_task.py index 65ebd43dab95..a50b1cf68d25 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/patch_storage_task.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/patch_storage_task.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ @@ -33,6 +35,12 @@ def main(): resource_group_name="res4228", storage_task_name="mytask1", parameters={ + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/1f31ba14-ce16-4281-b9b4-3e78da6e1616/resourceGroups/res4228/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity": {} + }, + }, "properties": { "action": { "else": {"operations": [{"name": "DeleteBlob", "onFailure": "break", "onSuccess": "continue"}]}, @@ -47,10 +55,8 @@ def main(): } ], }, - }, - "description": "My Storage task", - "enabled": True, - } + } + }, }, ).result() print(response) diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/put_storage_task.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/put_storage_task.py index 13bf1632ebf1..25da3c48d22d 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/put_storage_task.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_crud/put_storage_task.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ @@ -33,6 +35,7 @@ def main(): resource_group_name="res4228", storage_task_name="mytask1", parameters={ + "identity": {"type": "SystemAssigned"}, "location": "westus", "properties": { "action": { diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_task_assignment_ids.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_task_assignment_ids.py index d7f24735f2b6..e100487cd124 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_task_assignment_ids.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_task_assignment_ids.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_resource_group.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_resource_group.py index 368149b7c421..297c5316a822 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_resource_group.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_resource_group.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_subscription.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_subscription.py index 83d2312d83fa..38ffc5eea933 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_subscription.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_by_subscription.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_run_report_summary.py b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_run_report_summary.py index 2f1fbc4a7b52..f00fa929e467 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_run_report_summary.py +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_samples/storage_tasks_list/list_storage_tasks_run_report_summary.py @@ -1,3 +1,4 @@ +# pylint: disable=line-too-long,useless-suppression # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -7,6 +8,7 @@ # -------------------------------------------------------------------------- from azure.identity import DefaultAzureCredential + from azure.mgmt.storageactions import StorageActionsMgmtClient """ diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/conftest.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/conftest.py new file mode 100644 index 000000000000..8bb755e68fc6 --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/conftest.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +import os +import pytest +from dotenv import load_dotenv +from devtools_testutils import ( + test_proxy, + add_general_regex_sanitizer, + add_body_key_sanitizer, + add_header_regex_sanitizer, +) + +load_dotenv() + + +# For security, please avoid record sensitive identity information in recordings +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + storageactionsmgmt_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + storageactionsmgmt_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + storageactionsmgmt_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + storageactionsmgmt_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=storageactionsmgmt_subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=storageactionsmgmt_tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=storageactionsmgmt_client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=storageactionsmgmt_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/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_operations.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_operations.py new file mode 100644 index 000000000000..2f8ddd6e400c --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_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.storageactions import StorageActionsMgmtClient + +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 TestStorageActionsMgmtOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2023-01-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_operations_async.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_operations_async.py new file mode 100644 index 000000000000..585dd579067b --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_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.storageactions.aio import StorageActionsMgmtClient + +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 TestStorageActionsMgmtOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_operations_list(self, resource_group): + response = self.client.operations.list( + api_version="2023-01-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_operations.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_operations.py new file mode 100644 index 000000000000..d30c60a0dde7 --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_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.storageactions import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTaskAssignmentOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_task_assignment_list(self, resource_group): + response = self.client.storage_task_assignment.list( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_operations_async.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_operations_async.py new file mode 100644 index 000000000000..a1ace465bc2a --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_task_assignment_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.storageactions.aio import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTaskAssignmentOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_storage_task_assignment_list(self, resource_group): + response = self.client.storage_task_assignment.list( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations.py new file mode 100644 index 000000000000..9a93874bdbb1 --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations.py @@ -0,0 +1,184 @@ +# 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.storageactions import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTasksOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_tasks_begin_create(self, resource_group): + response = self.client.storage_tasks.begin_create( + resource_group_name=resource_group.name, + storage_task_name="str", + parameters={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "location": "str", + "properties": { + "action": { + "if": { + "condition": "str", + "operations": [ + {"name": "str", "onFailure": "str", "onSuccess": "str", "parameters": {"str": "str"}} + ], + }, + "else": { + "operations": [ + {"name": "str", "onFailure": "str", "onSuccess": "str", "parameters": {"str": "str"}} + ] + }, + }, + "description": "str", + "enabled": bool, + "creationTimeInUtc": "2020-02-20 00:00:00", + "provisioningState": "str", + "taskVersion": 0, + }, + "id": "str", + "name": "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", + }, + api_version="2023-01-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_storage_tasks_begin_delete(self, resource_group): + response = self.client.storage_tasks.begin_delete( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-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_storage_tasks_get(self, resource_group): + response = self.client.storage_tasks.get( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_tasks_begin_update(self, resource_group): + response = self.client.storage_tasks.begin_update( + resource_group_name=resource_group.name, + storage_task_name="str", + parameters={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "properties": { + "action": { + "if": { + "condition": "str", + "operations": [ + {"name": "str", "onFailure": "str", "onSuccess": "str", "parameters": {"str": "str"}} + ], + }, + "else": { + "operations": [ + {"name": "str", "onFailure": "str", "onSuccess": "str", "parameters": {"str": "str"}} + ] + }, + }, + "creationTimeInUtc": "2020-02-20 00:00:00", + "description": "str", + "enabled": bool, + "provisioningState": "str", + "taskVersion": 0, + }, + "tags": {"str": "str"}, + }, + api_version="2023-01-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_storage_tasks_list_by_subscription(self, resource_group): + response = self.client.storage_tasks.list_by_subscription( + api_version="2023-01-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_tasks_list_by_resource_group(self, resource_group): + response = self.client.storage_tasks.list_by_resource_group( + resource_group_name=resource_group.name, + api_version="2023-01-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_tasks_preview_actions(self, resource_group): + response = self.client.storage_tasks.preview_actions( + location="str", + parameters={ + "properties": { + "action": {"elseBlockExists": bool, "if": {"condition": "str"}}, + "blobs": [ + { + "matchedBlock": "str", + "metadata": [{"key": "str", "value": "str"}], + "name": "str", + "properties": [{"key": "str", "value": "str"}], + "tags": [{"key": "str", "value": "str"}], + } + ], + "container": {"metadata": [{"key": "str", "value": "str"}], "name": "str"}, + } + }, + api_version="2023-01-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations_async.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations_async.py new file mode 100644 index 000000000000..43bca8e36f16 --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_operations_async.py @@ -0,0 +1,211 @@ +# 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.storageactions.aio import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTasksOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_storage_tasks_begin_create(self, resource_group): + response = await ( + await self.client.storage_tasks.begin_create( + resource_group_name=resource_group.name, + storage_task_name="str", + parameters={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "location": "str", + "properties": { + "action": { + "if": { + "condition": "str", + "operations": [ + { + "name": "str", + "onFailure": "str", + "onSuccess": "str", + "parameters": {"str": "str"}, + } + ], + }, + "else": { + "operations": [ + { + "name": "str", + "onFailure": "str", + "onSuccess": "str", + "parameters": {"str": "str"}, + } + ] + }, + }, + "description": "str", + "enabled": bool, + "creationTimeInUtc": "2020-02-20 00:00:00", + "provisioningState": "str", + "taskVersion": 0, + }, + "id": "str", + "name": "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", + }, + api_version="2023-01-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_storage_tasks_begin_delete(self, resource_group): + response = await ( + await self.client.storage_tasks.begin_delete( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-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_storage_tasks_get(self, resource_group): + response = await self.client.storage_tasks.get( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + + # please add some check logic here by yourself + # ... + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_storage_tasks_begin_update(self, resource_group): + response = await ( + await self.client.storage_tasks.begin_update( + resource_group_name=resource_group.name, + storage_task_name="str", + parameters={ + "identity": { + "type": "str", + "principalId": "str", + "tenantId": "str", + "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}}, + }, + "properties": { + "action": { + "if": { + "condition": "str", + "operations": [ + { + "name": "str", + "onFailure": "str", + "onSuccess": "str", + "parameters": {"str": "str"}, + } + ], + }, + "else": { + "operations": [ + { + "name": "str", + "onFailure": "str", + "onSuccess": "str", + "parameters": {"str": "str"}, + } + ] + }, + }, + "creationTimeInUtc": "2020-02-20 00:00:00", + "description": "str", + "enabled": bool, + "provisioningState": "str", + "taskVersion": 0, + }, + "tags": {"str": "str"}, + }, + api_version="2023-01-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_storage_tasks_list_by_subscription(self, resource_group): + response = self.client.storage_tasks.list_by_subscription( + api_version="2023-01-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_storage_tasks_list_by_resource_group(self, resource_group): + response = self.client.storage_tasks.list_by_resource_group( + resource_group_name=resource_group.name, + api_version="2023-01-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_storage_tasks_preview_actions(self, resource_group): + response = await self.client.storage_tasks.preview_actions( + location="str", + parameters={ + "properties": { + "action": {"elseBlockExists": bool, "if": {"condition": "str"}}, + "blobs": [ + { + "matchedBlock": "str", + "metadata": [{"key": "str", "value": "str"}], + "name": "str", + "properties": [{"key": "str", "value": "str"}], + "tags": [{"key": "str", "value": "str"}], + } + ], + "container": {"metadata": [{"key": "str", "value": "str"}], "name": "str"}, + } + }, + api_version="2023-01-01", + ) + + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_operations.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_operations.py new file mode 100644 index 000000000000..b9fe8f0e218d --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_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.storageactions import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTasksReportOperations(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_storage_tasks_report_list(self, resource_group): + response = self.client.storage_tasks_report.list( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + result = [r for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_operations_async.py b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_operations_async.py new file mode 100644 index 000000000000..b198da9ddc59 --- /dev/null +++ b/sdk/storageactions/azure-mgmt-storageactions/generated_tests/test_storage_actions_mgmt_storage_tasks_report_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.storageactions.aio import StorageActionsMgmtClient + +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 TestStorageActionsMgmtStorageTasksReportOperationsAsync(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.client = self.create_mgmt_client(StorageActionsMgmtClient, is_async=True) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy_async + async def test_storage_tasks_report_list(self, resource_group): + response = self.client.storage_tasks_report.list( + resource_group_name=resource_group.name, + storage_task_name="str", + api_version="2023-01-01", + ) + result = [r async for r in response] + # please add some check logic here by yourself + # ... diff --git a/sdk/storageactions/azure-mgmt-storageactions/setup.py b/sdk/storageactions/azure-mgmt-storageactions/setup.py index 37bba30f0185..90b3b1590dea 100644 --- a/sdk/storageactions/azure-mgmt-storageactions/setup.py +++ b/sdk/storageactions/azure-mgmt-storageactions/setup.py @@ -53,7 +53,6 @@ "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -74,9 +73,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.5.0", ], - python_requires=">=3.8", + python_requires=">=3.9", )