diff --git a/sdk/resources/azure-mgmt-msi/README.md b/sdk/resources/azure-mgmt-msi/README.md
index c1c726c38088..9b84ab1b0cc3 100644
--- a/sdk/resources/azure-mgmt-msi/README.md
+++ b/sdk/resources/azure-mgmt-msi/README.md
@@ -1,7 +1,7 @@
# Microsoft Azure SDK for Python
This is the Microsoft Azure Msi Management Client Library.
-This package has been tested with Python 3.7+.
+This package has been tested with Python 3.8+.
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
## _Disclaimer_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
### Prerequisites
-- Python 3.7+ is required to use this package.
+- Python 3.8+ is required to use this package.
- [Azure subscription](https://azure.microsoft.com/free/)
### Install the package
@@ -45,8 +45,9 @@ client = ManagedServiceIdentityClient(credential=DefaultAzureCredential(), subsc
## Examples
-
-Code samples for this package can be found at [Msi Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com and [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+Code samples for this package can be found at:
+- [Search Msi Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
+- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
## Troubleshooting
@@ -58,6 +59,3 @@ Code samples for this package can be found at [Msi Management](https://docs.micr
If you encounter any bugs or have suggestions, please file an issue in the
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
section of the project.
-
-
-
diff --git a/sdk/resources/azure-mgmt-msi/_meta.json b/sdk/resources/azure-mgmt-msi/_meta.json
index d0e866245b78..49c29641b554 100644
--- a/sdk/resources/azure-mgmt-msi/_meta.json
+++ b/sdk/resources/azure-mgmt-msi/_meta.json
@@ -1,11 +1,11 @@
{
- "commit": "51d4c24a011e300b9713179e0515fef35bf3f678",
+ "commit": "51cca7e1e0f67e7ad11c6d6d6cf65b28af94c138",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
- "autorest": "3.9.2",
+ "autorest": "3.10.2",
"use": [
- "@autorest/python@6.4.0",
- "@autorest/modelerfour@4.24.3"
+ "@autorest/python@6.27.4",
+ "@autorest/modelerfour@4.27.0"
],
- "autorest_command": "autorest specification/msi/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.4.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+ "autorest_command": "autorest specification/msi/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
"readme": "specification/msi/resource-manager/readme.md"
}
\ No newline at end of file
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_configuration.py
index b2bda5543799..282dc385aa9a 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_configuration.py
@@ -10,7 +10,6 @@
# --------------------------------------------------------------------------
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
@@ -20,7 +19,7 @@
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration):
+class ManagedServiceIdentityClientConfiguration:
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -42,12 +41,12 @@ def __init__(
raise ValueError("Parameter 'credential' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
self.credential = credential
self.subscription_id = subscription_id
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'azure-mgmt-msi/{}'.format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py
index 46a47731fc02..2e9c23ef5c23 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py
@@ -10,8 +10,11 @@
# --------------------------------------------------------------------------
from typing import Any, Optional, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin
@@ -70,8 +73,28 @@ def __init__(
profile: KnownProfiles=KnownProfiles.default,
**kwargs: Any
):
+ if api_version:
+ kwargs.setdefault('api_version', api_version)
self._config = ManagedServiceIdentityClientConfiguration(credential, subscription_id, **kwargs)
- self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
super(ManagedServiceIdentityClient, self).__init__(
api_version=api_version,
profile=profile
@@ -119,7 +142,7 @@ def federated_identity_credentials(self):
else:
raise ValueError("API version {} does not have operation group 'federated_identity_credentials'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def operations(self):
@@ -142,7 +165,7 @@ def operations(self):
else:
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def system_assigned_identities(self):
@@ -165,7 +188,7 @@ def system_assigned_identities(self):
else:
raise ValueError("API version {} does not have operation group 'system_assigned_identities'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def user_assigned_identities(self):
@@ -188,7 +211,7 @@ def user_assigned_identities(self):
else:
raise ValueError("API version {} does not have operation group 'user_assigned_identities'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
def close(self):
self._client.close()
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_serialization.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_serialization.py
index 25467dfc00bb..a94487cbf17a 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_serialization.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_serialization.py
@@ -24,7 +24,6 @@
#
# --------------------------------------------------------------------------
-# pylint: skip-file
# pyright: reportUnnecessaryTypeIgnoreComment=false
from base64 import b64decode, b64encode
@@ -52,7 +51,6 @@
MutableMapping,
Type,
List,
- Mapping,
)
try:
@@ -63,8 +61,8 @@
import isodate # type: ignore
-from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback
-from azure.core.serialization import NULL as AzureCoreNull
+from azure.core.exceptions import DeserializationError, SerializationError
+from azure.core.serialization import NULL as CoreNull
_BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
@@ -91,6 +89,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 +112,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 +124,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 +143,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 +155,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 +177,6 @@ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]],
return None
-try:
- basestring # type: ignore
- unicode_str = unicode # type: ignore
-except NameError:
- basestring = str
- unicode_str = str
-
_LOGGER = logging.getLogger(__name__)
try:
@@ -189,15 +189,30 @@ class UTC(datetime.tzinfo):
"""Time Zone info for handling UTC"""
def utcoffset(self, dt):
- """UTF offset for UTC is 0."""
+ """UTF offset for UTC is 0.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The offset
+ :rtype: datetime.timedelta
+ """
return datetime.timedelta(0)
def tzname(self, dt):
- """Timestamp representation."""
+ """Timestamp representation.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The timestamp representation
+ :rtype: str
+ """
return "Z"
def dst(self, dt):
- """No daylight saving for UTC."""
+ """No daylight saving for UTC.
+
+ :param datetime.datetime dt: The datetime
+ :returns: The daylight saving time
+ :rtype: datetime.timedelta
+ """
return datetime.timedelta(hours=1)
@@ -211,7 +226,7 @@ class _FixedOffset(datetime.tzinfo): # type: ignore
:param datetime.timedelta offset: offset in timedelta format
"""
- def __init__(self, offset):
+ def __init__(self, offset) -> None:
self.__offset = offset
def utcoffset(self, dt):
@@ -240,24 +255,26 @@ def __getinitargs__(self):
_FLATTEN = re.compile(r"(? None:
- self.additional_properties: Dict[str, Any] = {}
- for k in kwargs:
+ self.additional_properties: Optional[Dict[str, Any]] = {}
+ for k in kwargs: # pylint: disable=consider-using-dict-items
if k not in self._attribute_map:
_LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
elif k in self._validation and self._validation[k].get("readonly", False):
@@ -305,13 +329,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 +365,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 +378,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,14 +389,14 @@ 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,
keep_readonly: bool = True,
- key_transformer: Callable[
- [str, Dict[str, Any], Any], Any
- ] = attribute_transformer,
+ key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer,
**kwargs: Any
) -> JSON:
"""Return a dict that can be serialized using json.dump.
@@ -387,12 +425,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):
@@ -402,7 +443,7 @@ def _infer_class_models(cls):
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
if cls.__name__ not in client_models:
raise ValueError("Not Autorest generated code")
- except Exception:
+ except Exception: # pylint: disable=broad-exception-caught
# Assume it's not Autorest generated (tests?). Add ourselves as dependencies.
client_models = {cls.__name__: cls}
return client_models
@@ -415,9 +456,10 @@ def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = N
:param str content_type: JSON by default, set application/xml if XML.
:returns: An instance of this model
:raises: DeserializationError if something went wrong
+ :rtype: ModelType
"""
deserializer = Deserializer(cls._infer_class_models())
- return deserializer(cls.__name__, data, content_type=content_type)
+ return deserializer(cls.__name__, data, content_type=content_type) # type: ignore
@classmethod
def from_dict(
@@ -433,9 +475,11 @@ def from_dict(
and last_rest_key_case_insensitive_extractor)
:param dict data: A dict using RestAPI structure
+ :param function key_extractors: A key extractor function.
:param str content_type: JSON by default, set application/xml if XML.
:returns: An instance of this model
:raises: DeserializationError if something went wrong
+ :rtype: ModelType
"""
deserializer = Deserializer(cls._infer_class_models())
deserializer.key_extractors = ( # type: ignore
@@ -447,7 +491,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):
@@ -455,21 +499,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:
@@ -508,11 +556,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"}
@@ -547,7 +597,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,
@@ -563,17 +613,20 @@ def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]]=None):
"[]": self.serialize_iter,
"{}": self.serialize_dict,
}
- self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
+ self.dependencies: Dict[str, type] = dict(classes) if classes else {}
self.key_transformer = full_restapi_key_transformer
self.client_side_validation = True
- def _serialize(self, target_obj, data_type=None, **kwargs):
+ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals
+ self, target_obj, data_type=None, **kwargs
+ ):
"""Serialize data into a string according to type.
- :param target_obj: The data to be serialized.
+ :param object target_obj: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str, dict
:raises: SerializationError if serialization fails.
+ :returns: The serialized data.
"""
key_transformer = kwargs.get("key_transformer", self.key_transformer)
keep_readonly = kwargs.get("keep_readonly", False)
@@ -599,12 +652,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"] == "":
@@ -631,7 +686,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
if xml_desc.get("attr", False):
if xml_ns:
ET.register_namespace(xml_prefix, xml_ns)
- xml_name = "{}{}".format(xml_ns, xml_name)
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
serialized.set(xml_name, new_attr) # type: ignore
continue
if xml_desc.get("text", False):
@@ -640,7 +695,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
@@ -651,7 +707,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
@@ -664,23 +720,24 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
_serialized.update(_new_attr) # type: ignore
_new_attr = _new_attr[k] # type: ignore
_serialized = _serialized[k]
- except ValueError:
- continue
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
except (AttributeError, KeyError, TypeError) as err:
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
- raise_with_traceback(SerializationError, msg, err)
- else:
- return serialized
+ raise SerializationError(msg) from err
+ return serialized
def body(self, data, data_type, **kwargs):
"""Serialize data intended for a request body.
- :param data: The data to be serialized.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: dict
:raises: SerializationError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized request body
"""
# Just in case this is a dict
@@ -709,18 +766,20 @@ def body(self, data, data_type, **kwargs):
attribute_key_case_insensitive_extractor,
last_rest_key_case_insensitive_extractor,
]
- data = deserializer._deserialize(data_type, data)
+ data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access
except DeserializationError as err:
- raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err)
+ raise SerializationError("Unable to build a model: " + str(err)) from err
return self._serialize(data, data_type, **kwargs)
def url(self, name, data, data_type, **kwargs):
"""Serialize data intended for a URL path.
- :param data: The data to be serialized.
+ :param str name: The name of the URL path parameter.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str
+ :returns: The serialized URL path
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
"""
@@ -731,30 +790,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.
- :rtype: str
+ :rtype: str, list
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized query parameter
"""
try:
# Treat the list aside, since we don't want to encode the div separator
if data_type.startswith("["):
internal_data_type = data_type[1:-1]
- data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
- if not kwargs.get("skip_quote", False):
- data = [quote(str(d), safe="") for d in data]
- return str(self.serialize_iter(data, internal_data_type, **kwargs))
+ do_quote = not kwargs.get("skip_quote", False)
+ 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)
@@ -764,19 +823,20 @@ def query(self, name, data, data_type, **kwargs):
output = str(output)
else:
output = quote(str(output), safe="")
- except SerializationError:
- raise TypeError("{} must be type {}.".format(name, data_type))
- else:
- return str(output)
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
def header(self, name, data, data_type, **kwargs):
"""Serialize data intended for a request header.
- :param data: The data to be serialized.
+ :param str name: The name of the header.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
:rtype: str
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
+ :returns: The serialized header
"""
try:
if data_type in ["[str]"]:
@@ -785,32 +845,31 @@ def header(self, name, data, data_type, **kwargs):
output = self.serialize_data(data, data_type, **kwargs)
if data_type == "bool":
output = json.dumps(output)
- except SerializationError:
- raise TypeError("{} must be type {}.".format(name, data_type))
- else:
- return str(output)
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
def serialize_data(self, data, data_type, **kwargs):
"""Serialize generic data according to supplied data type.
- :param data: The data to be serialized.
+ :param object data: The data to be serialized.
:param str data_type: The type to be serialized from.
- :param bool required: Whether it's essential that the data not be
- empty or None
:raises: AttributeError if required data is None.
:raises: ValueError if data is None
:raises: SerializationError if serialization fails.
+ :returns: The serialized data.
+ :rtype: str, int, float, bool, dict, list
"""
if data is None:
raise ValueError("No value for given attribute")
try:
- if data is AzureCoreNull:
+ if data is CoreNull:
return None
if data_type in self.basic_types.values():
return self.serialize_basic(data, data_type, **kwargs)
- elif data_type in self.serialize_type:
+ if data_type in self.serialize_type:
return self.serialize_type[data_type](data, **kwargs)
# If dependencies is empty, try with current data class
@@ -825,12 +884,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
@@ -846,23 +904,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
@@ -876,8 +937,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.
@@ -887,13 +947,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'.
+ Defaults to False.
:rtype: list, str
+ :return: serialized iterable
"""
if isinstance(data, str):
raise SerializationError("Refuse str type as a valid iter type.")
@@ -905,9 +965,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
for d in data:
try:
serialized.append(self.serialize_data(d, iter_type, **kwargs))
- except ValueError:
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
serialized.append(None)
+ if kwargs.get("do_quote", False):
+ serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
if div:
serialized = ["" if s is None else str(s) for s in serialized]
serialized = div.join(serialized)
@@ -943,16 +1008,17 @@ 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 = {}
for key, value in attr.items():
try:
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
- except ValueError:
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
serialized[self.serialize_unicode(key)] = None
if "xml" in serialization_ctxt:
@@ -967,7 +1033,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
@@ -975,6 +1041,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
@@ -985,7 +1052,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)
@@ -999,7 +1066,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:
@@ -1030,56 +1097,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)
@@ -1087,11 +1159,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)
@@ -1101,30 +1174,32 @@ def serialize_time(attr, **kwargs):
return t
@staticmethod
- def serialize_duration(attr, **kwargs):
+ def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize TimeDelta object into ISO-8601 formatted string.
:param TimeDelta attr: Object to be serialized.
:rtype: str
+ :return: serialized duration
"""
if isinstance(attr, str):
attr = isodate.parse_duration(attr)
return isodate.duration_isoformat(attr)
@staticmethod
- def serialize_rfc(attr, **kwargs):
+ def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into RFC-1123 formatted string.
:param Datetime attr: Object to be serialized.
:rtype: str
:raises: TypeError if format invalid.
+ :return: serialized rfc
"""
try:
if not attr.tzinfo:
_LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
utc = attr.utctimetuple()
- except AttributeError:
- raise TypeError("RFC1123 object must be valid Datetime object.")
+ except AttributeError as exc:
+ raise TypeError("RFC1123 object must be valid Datetime object.") from exc
return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format(
Serializer.days[utc.tm_wday],
@@ -1137,12 +1212,13 @@ def serialize_rfc(attr, **kwargs):
)
@staticmethod
- def serialize_iso(attr, **kwargs):
+ def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into ISO-8601 formatted string.
:param Datetime attr: Object to be serialized.
:rtype: str
:raises: SerializationError if format invalid.
+ :return: serialized iso
"""
if isinstance(attr, str):
attr = isodate.parse_datetime(attr)
@@ -1162,19 +1238,20 @@ def serialize_iso(attr, **kwargs):
return date + microseconds + "Z"
except (ValueError, OverflowError) as err:
msg = "Unable to serialize datetime object."
- raise_with_traceback(SerializationError, msg, err)
+ raise SerializationError(msg) from err
except AttributeError as err:
msg = "ISO-8601 object must be valid Datetime object."
- raise_with_traceback(TypeError, msg, err)
+ raise TypeError(msg) from err
@staticmethod
- def serialize_unix(attr, **kwargs):
+ def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument
"""Serialize Datetime object into IntTime format.
This is represented as seconds.
:param Datetime attr: Object to be serialized.
:rtype: int
:raises: SerializationError if format invalid
+ :return: serialied unix
"""
if isinstance(attr, int):
return attr
@@ -1182,11 +1259,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
@@ -1201,14 +1278,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
@@ -1222,7 +1300,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:])
@@ -1230,17 +1307,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)
@@ -1273,11 +1362,11 @@ def _extract_name_from_internal_type(internal_type):
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
xml_ns = internal_type_xml_map.get("ns", None)
if xml_ns:
- xml_name = "{}{}".format(xml_ns, xml_name)
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
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
@@ -1297,7 +1386,7 @@ def xml_key_extractor(attr, attr_desc, data):
# Integrate namespace if necessary
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
if xml_ns:
- xml_name = "{}{}".format(xml_ns, xml_name)
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
# If it's an attribute, that's simple
if xml_desc.get("attr", False):
@@ -1329,22 +1418,21 @@ def xml_key_extractor(attr, attr_desc, data):
if is_iter_type:
if is_wrapped:
return None # is_wrapped no node, we want None
- else:
- return [] # not wrapped, assume empty list
+ return [] # not wrapped, assume empty list
return None # Assume it's not there, maybe an optional node.
# If is_iter_type and not wrapped, return all found children
if is_iter_type:
if not is_wrapped:
return children
- else: # Iter and wrapped, should have found one node only (the wrap one)
- if len(children) != 1:
- raise DeserializationError(
- "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(
- xml_name
- )
+ # Iter and wrapped, should have found one node only (the wrap one)
+ if len(children) != 1:
+ raise DeserializationError(
+ "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( # pylint: disable=line-too-long
+ xml_name
)
- return list(children[0]) # Might be empty list and that's ok.
+ )
+ return list(children[0]) # Might be empty list and that's ok.
# Here it's not a itertype, we should have found one element only or empty
if len(children) > 1:
@@ -1352,7 +1440,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.
@@ -1361,9 +1449,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,
@@ -1383,7 +1471,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
@@ -1401,11 +1489,12 @@ def __call__(self, target_obj, response_data, content_type=None):
:param str content_type: Swagger "produces" if available.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
data = self._unpack_content(response_data, content_type)
return self._deserialize(target_obj, data)
- def _deserialize(self, target_obj, data):
+ def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements
"""Call the deserializer on a model.
Data needs to be already deserialized as JSON or XML ElementTree
@@ -1414,12 +1503,13 @@ def _deserialize(self, target_obj, data):
:param object data: Object to deserialize.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
# This is already a model, go recursive just in case
if hasattr(data, "_attribute_map"):
constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")]
try:
- for attr, mapconfig in data._attribute_map.items():
+ for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access
if attr in constants:
continue
value = getattr(data, attr)
@@ -1436,15 +1526,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"...
@@ -1473,10 +1563,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:
@@ -1503,18 +1592,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
@@ -1529,10 +1620,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
)
@@ -1550,10 +1643,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", {})
@@ -1570,31 +1665,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():
@@ -1603,15 +1709,16 @@ def _instantiate_model(self, response, attrs, additional_properties=None):
except Exception as exp:
msg = "Unable to populate response model. "
msg += "Type: {}, Error: {}".format(type(response), exp)
- raise DeserializationError(msg)
+ raise DeserializationError(msg) from exp
- def deserialize_data(self, data, data_type):
+ def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements
"""Process data for deserialization according to data type.
:param str data: The response string to be deserialized.
:param str data_type: The type to deserialize to.
:raises: DeserializationError if deserialization fails.
:return: Deserialized object.
+ :rtype: object
"""
if data is None:
return data
@@ -1625,7 +1732,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)
@@ -1644,15 +1755,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:
@@ -1669,6 +1780,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):
@@ -1679,11 +1791,12 @@ def deserialize_dict(self, attr, dict_type):
attr = {el.tag: el.text for el in attr}
return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()}
- def deserialize_object(self, attr, **kwargs):
+ def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements
"""Deserialize a generic object.
This will be handled as a dictionary.
:param dict attr: Dictionary to be deserialized.
+ :return: Deserialized object.
:rtype: dict
:raises: TypeError if non-builtin datatype encountered.
"""
@@ -1692,7 +1805,7 @@ def deserialize_object(self, attr, **kwargs):
if isinstance(attr, ET.Element):
# Do no recurse on XML, just return the tree as-is
return attr
- if isinstance(attr, basestring):
+ if isinstance(attr, str):
return self.deserialize_basic(attr, "str")
obj_type = type(attr)
if obj_type in self.basic_types:
@@ -1718,11 +1831,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
@@ -1730,6 +1842,7 @@ def deserialize_basic(self, attr, data_type):
:param str attr: response string to be deserialized.
:param str data_type: deserialization data type.
+ :return: Deserialized basic type.
:rtype: str, int, float or bool
:raises: TypeError if string format is not valid.
"""
@@ -1741,24 +1854,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):
@@ -1766,6 +1878,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,
@@ -1779,8 +1892,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):
@@ -1792,6 +1904,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:
@@ -1800,12 +1913,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:
@@ -1821,6 +1933,7 @@ def deserialize_bytearray(attr):
"""Deserialize string into bytearray.
:param str attr: response string to be deserialized.
+ :return: Deserialized bytearray
:rtype: bytearray
:raises: TypeError if string format invalid.
"""
@@ -1833,6 +1946,7 @@ def deserialize_base64(attr):
"""Deserialize base64 encoded string into string.
:param str attr: response string to be deserialized.
+ :return: Deserialized base64 string
:rtype: bytearray
:raises: TypeError if string format invalid.
"""
@@ -1848,22 +1962,24 @@ def deserialize_decimal(attr):
"""Deserialize string into Decimal object.
:param str attr: response string to be deserialized.
- :rtype: Decimal
+ :return: Deserialized decimal
:raises: DeserializationError if string format invalid.
+ :rtype: decimal
"""
if isinstance(attr, ET.Element):
attr = attr.text
try:
- return decimal.Decimal(attr) # type: ignore
+ return decimal.Decimal(str(attr)) # type: ignore
except decimal.DecimalException as err:
msg = "Invalid decimal {}".format(attr)
- raise_with_traceback(DeserializationError, msg, err)
+ raise DeserializationError(msg) from err
@staticmethod
def deserialize_long(attr):
"""Deserialize string into long (Py2) or int (Py3).
:param str attr: response string to be deserialized.
+ :return: Deserialized int
:rtype: long or int
:raises: ValueError if string format invalid.
"""
@@ -1876,6 +1992,7 @@ def deserialize_duration(attr):
"""Deserialize ISO-8601 formatted string into TimeDelta object.
:param str attr: response string to be deserialized.
+ :return: Deserialized duration
:rtype: TimeDelta
:raises: DeserializationError if string format invalid.
"""
@@ -1885,15 +2002,15 @@ def deserialize_duration(attr):
duration = isodate.parse_duration(attr)
except (ValueError, OverflowError, AttributeError) as err:
msg = "Cannot deserialize duration object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return duration
+ raise DeserializationError(msg) from err
+ return duration
@staticmethod
def deserialize_date(attr):
"""Deserialize ISO-8601 formatted string into Date object.
:param str attr: response string to be deserialized.
+ :return: Deserialized date
:rtype: Date
:raises: DeserializationError if string format invalid.
"""
@@ -1902,13 +2019,14 @@ def deserialize_date(attr):
if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore
raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
# This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
- return isodate.parse_date(attr, defaultmonth=None, defaultday=None)
+ return isodate.parse_date(attr, defaultmonth=0, defaultday=0)
@staticmethod
def deserialize_time(attr):
"""Deserialize ISO-8601 formatted string into time object.
:param str attr: response string to be deserialized.
+ :return: Deserialized time
:rtype: datetime.time
:raises: DeserializationError if string format invalid.
"""
@@ -1923,6 +2041,7 @@ def deserialize_rfc(attr):
"""Deserialize RFC-1123 formatted string into Datetime object.
:param str attr: response string to be deserialized.
+ :return: Deserialized RFC datetime
:rtype: Datetime
:raises: DeserializationError if string format invalid.
"""
@@ -1937,15 +2056,15 @@ def deserialize_rfc(attr):
date_obj = date_obj.astimezone(tz=TZ_UTC)
except ValueError as err:
msg = "Cannot deserialize to rfc datetime object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return date_obj
+ raise DeserializationError(msg) from err
+ return date_obj
@staticmethod
def deserialize_iso(attr):
"""Deserialize ISO-8601 formatted string into Datetime object.
:param str attr: response string to be deserialized.
+ :return: Deserialized ISO datetime
:rtype: Datetime
:raises: DeserializationError if string format invalid.
"""
@@ -1974,9 +2093,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):
@@ -1984,15 +2102,16 @@ def deserialize_unix(attr):
This is represented as seconds.
:param int attr: Object to be serialized.
+ :return: Deserialized datetime
:rtype: Datetime
:raises: DeserializationError if format invalid
"""
if isinstance(attr, ET.Element):
attr = int(attr.text) # type: ignore
try:
+ attr = int(attr)
date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
except ValueError as err:
msg = "Cannot deserialize to unix datetime object."
- raise_with_traceback(DeserializationError, msg, err)
- else:
- return date_obj
+ raise DeserializationError(msg) from err
+ return date_obj
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_configuration.py
index fecf6dff63cb..a1a7d4dbc7a0 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_configuration.py
@@ -10,7 +10,6 @@
# --------------------------------------------------------------------------
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
@@ -20,7 +19,7 @@
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration):
+class ManagedServiceIdentityClientConfiguration:
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -42,12 +41,12 @@ def __init__(
raise ValueError("Parameter 'credential' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
self.credential = credential
self.subscription_id = subscription_id
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'azure-mgmt-msi/{}'.format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_managed_service_identity_client.py
index 34be501c4cfb..581028058584 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_managed_service_identity_client.py
@@ -10,8 +10,11 @@
# --------------------------------------------------------------------------
from typing import Any, Optional, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin
@@ -70,8 +73,28 @@ def __init__(
profile: KnownProfiles = KnownProfiles.default,
**kwargs: Any
) -> None:
+ if api_version:
+ kwargs.setdefault('api_version', api_version)
self._config = ManagedServiceIdentityClientConfiguration(credential, subscription_id, **kwargs)
- self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
super(ManagedServiceIdentityClient, self).__init__(
api_version=api_version,
profile=profile
@@ -119,7 +142,7 @@ def federated_identity_credentials(self):
else:
raise ValueError("API version {} does not have operation group 'federated_identity_credentials'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def operations(self):
@@ -142,7 +165,7 @@ def operations(self):
else:
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def system_assigned_identities(self):
@@ -165,7 +188,7 @@ def system_assigned_identities(self):
else:
raise ValueError("API version {} does not have operation group 'system_assigned_identities'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
@property
def user_assigned_identities(self):
@@ -188,7 +211,7 @@ def user_assigned_identities(self):
else:
raise ValueError("API version {} does not have operation group 'user_assigned_identities'".format(api_version))
self._config.api_version = api_version
- return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+ return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
async def close(self):
await self._client.close()
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/__init__.py
index 785d352dea5b..6bbff1405f98 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/__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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_configuration.py
index 923d2e5f804b..f91964a2d421 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", "2018-11-30")
+ api_version: str = kwargs.pop("api_version", "2018-11-30")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_managed_service_identity_client.py
index b8ce7a54d011..83eab96be23d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from . import models as _models
from .._serialization import Deserializer, Serializer
@@ -18,11 +21,10 @@
from .operations import Operations, SystemAssignedIdentitiesOperations, UserAssignedIdentitiesOperations
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -54,21 +56,39 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2018-11-30"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+ self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-11-30")
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2018-11-30"
)
- 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
@@ -88,12 +108,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) -> "ManagedServiceIdentityClient":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_metadata.json b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_metadata.json
index 391712d17b2e..0591115a7999 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_metadata.json
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_metadata.json
@@ -8,10 +8,10 @@
"host_value": "\"https://management.azure.com\"",
"parameterized_host_template": null,
"azure_arm": true,
- "has_lro_operations": false,
+ "has_public_lro_operations": false,
"client_side_validation": false,
- "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"global_parameters": {
"sync": {
@@ -101,8 +101,8 @@
"credential_scopes": ["https://management.azure.com/.default"],
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
- "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"operation_groups": {
"system_assigned_identities": "SystemAssignedIdentitiesOperations",
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_patch.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_patch.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_vendor.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_vendor.py
deleted file mode 100644
index bd0df84f5319..000000000000
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_vendor.py
+++ /dev/null
@@ -1,30 +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 typing import List, cast
-
-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
-
-
-def _format_url_section(template, **kwargs):
- components = template.split("/")
- while components:
- try:
- return template.format(**kwargs)
- except KeyError as key:
- # Need the cast, as for some reasons "split" is typed as list[str | Any]
- formatted_components = cast(List[str], template.split("/"))
- components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
- template = "/".join(components)
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_version.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_version.py
index d00e82dfabad..e5754a47ce68 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_version.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_version.py
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "7.1.0b1"
+VERSION = "1.0.0b1"
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/__init__.py
index 28cad922df0d..14c69894e88d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_configuration.py
index cb3f4d5b4237..c5876dcb8654 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", "2018-11-30")
+ api_version: str = kwargs.pop("api_version", "2018-11-30")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_managed_service_identity_client.py
index 91d8c3375b2a..a6b6b5d07ed0 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from .. import models as _models
from ..._serialization import Deserializer, Serializer
@@ -18,11 +21,10 @@
from .operations import Operations, SystemAssignedIdentitiesOperations, UserAssignedIdentitiesOperations
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -54,21 +56,41 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2018-11-30"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+ self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-11-30")
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2018-11-30"
)
- 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
@@ -88,12 +110,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) -> "ManagedServiceIdentityClient":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_patch.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_patch.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/__init__.py
index 24c14ec2a376..fabe6180626f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/__init__.py
@@ -5,13 +5,19 @@
# 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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # 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__ = [
@@ -19,5 +25,5 @@
"Operations",
"UserAssignedIdentitiesOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_operations.py
index 59e03b060581..ea6d1d6ad7d4 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._operations import build_list_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -56,12 +53,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2018_11_30.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -69,10 +66,10 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -83,14 +80,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -101,14 +96,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _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)
@@ -118,10 +112,11 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -132,5 +127,3 @@ async def get_next(next_link=None):
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_system_assigned_identities_operations.py
index c6329578fb9e..1e80dc8494a2 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._system_assigned_identities_operations import build_get_by_scope_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -54,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace_async
async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -62,12 +60,11 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -78,21 +75,20 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -101,11 +97,9 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_user_assigned_identities_operations.py
index d329295cfc5d..789028764e67 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._user_assigned_identities_operations import (
build_create_or_update_request,
build_delete_request,
@@ -38,10 +36,10 @@
build_update_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -64,12 +62,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2018_11_30.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -77,10 +75,10 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -91,15 +89,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
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
@@ -110,14 +106,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -127,10 +122,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -142,10 +138,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -153,7 +145,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2018_11_30.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -161,10 +152,10 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -175,16 +166,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
@@ -195,14 +184,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -212,10 +200,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -227,10 +216,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.ManagedIdentity/userAssignedIdentities"
- }
-
@overload
async def create_or_update(
self,
@@ -253,7 +238,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -264,7 +248,7 @@ async def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -277,11 +261,10 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -289,7 +272,11 @@ async def create_or_update(
@distributed_trace_async
async def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -299,17 +286,13 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2018_11_30.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2018_11_30.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -320,19 +303,19 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -340,15 +323,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -357,21 +339,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
async def update(
self,
@@ -394,7 +368,6 @@ async def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -405,7 +378,7 @@ async def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -418,11 +391,10 @@ async def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -430,7 +402,11 @@ async def update(
@distributed_trace_async
async def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -439,18 +415,14 @@ async def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2018_11_30.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2018_11_30.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -461,19 +433,19 @@ async def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -481,15 +453,14 @@ async def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -498,16 +469,12 @@ async def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -518,12 +485,11 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -534,23 +500,22 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -559,21 +524,15 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
- self, resource_group_name: str, resource_name: str, **kwargs: Any
- ) -> None:
+ async def delete(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> None:
"""Deletes the identity.
:param resource_group_name: The name of the Resource Group to which the identity belongs.
@@ -581,12 +540,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -597,23 +555,22 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -623,8 +580,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/__init__.py
index d788ecaa25f2..650fd34412c4 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/__init__.py
@@ -5,20 +5,29 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import Identity
-from ._models_py3 import IdentityUpdate
-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 SystemAssignedIdentity
-from ._models_py3 import TrackedResource
-from ._models_py3 import UserAssignedIdentitiesListResult
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import ( # type: ignore
+ CloudErrorBody,
+ Identity,
+ IdentityUpdate,
+ Operation,
+ OperationDisplay,
+ OperationListResult,
+ ProxyResource,
+ Resource,
+ SystemAssignedIdentity,
+ TrackedResource,
+ UserAssignedIdentitiesListResult,
+)
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__ = [
@@ -34,5 +43,5 @@
"TrackedResource",
"UserAssignedIdentitiesListResult",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/_models_py3.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/_models_py3.py
index 86ab205209bd..353fe3f18670 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/_models_py3.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/models/_models_py3.py
@@ -1,5 +1,4 @@
# 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.
@@ -12,7 +11,6 @@
from ... import _serialization
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
@@ -72,7 +70,7 @@ class Resource(_serialization.Model):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -107,10 +105,10 @@ class TrackedResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -155,10 +153,10 @@ class Identity(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. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -219,7 +217,7 @@ class IdentityUpdate(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -386,7 +384,7 @@ class ProxyResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -395,32 +393,16 @@ class ProxyResource(Resource):
:vartype type: str
"""
- _validation = {
- "id": {"readonly": True},
- "name": {"readonly": True},
- "type": {"readonly": True},
- }
-
- _attribute_map = {
- "id": {"key": "id", "type": "str"},
- "name": {"key": "name", "type": "str"},
- "type": {"key": "type", "type": "str"},
- }
-
- def __init__(self, **kwargs: Any) -> None:
- """ """
- super().__init__(**kwargs)
-
class SystemAssignedIdentity(ProxyResource):
"""Describes a system assigned identity resource.
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/__init__.py
index 24c14ec2a376..fabe6180626f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/__init__.py
@@ -5,13 +5,19 @@
# 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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # 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__ = [
@@ -19,5 +25,5 @@
"Operations",
"UserAssignedIdentitiesOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_operations.py
index 97218966d66d..2bbe77e87a27 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -78,12 +75,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2018_11_30.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -91,10 +88,10 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -105,14 +102,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
@@ -123,14 +118,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -140,10 +134,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -154,5 +149,3 @@ def get_next(next_link=None):
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_system_assigned_identities_operations.py
index 21dafe3deb77..b492389be48f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -43,7 +40,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -52,7 +49,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
"scope": _SERIALIZER.url("scope", scope, "str", skip_quote=True),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -81,6 +78,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -89,12 +87,11 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -105,21 +102,20 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -128,11 +124,9 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_user_assigned_identities_operations.py
index 4fcbafc9aa71..cc3be09feada 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +43,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -56,7 +54,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
"subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -71,7 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -84,7 +82,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
"resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -101,7 +99,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -116,7 +114,7 @@ def build_create_or_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -135,7 +133,7 @@ def build_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -150,7 +148,7 @@ def build_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -167,7 +165,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -181,7 +179,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -198,7 +196,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -212,7 +210,7 @@ def build_delete_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -241,12 +239,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2018_11_30.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -254,10 +252,10 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -268,15 +266,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
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
@@ -287,14 +283,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -304,10 +299,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -319,10 +315,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -330,7 +322,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2018_11_30.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -338,10 +329,10 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -352,16 +343,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
@@ -372,14 +361,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -389,10 +377,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -404,10 +393,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.ManagedIdentity/userAssignedIdentities"
- }
-
@overload
def create_or_update(
self,
@@ -430,7 +415,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -441,7 +425,7 @@ def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -454,11 +438,10 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -466,7 +449,11 @@ def create_or_update(
@distributed_trace
def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -476,17 +463,13 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2018_11_30.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2018_11_30.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -497,19 +480,19 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -517,15 +500,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -534,21 +516,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
def update(
self,
@@ -571,7 +545,6 @@ def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -582,7 +555,7 @@ def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -595,11 +568,10 @@ def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -607,7 +579,11 @@ def update(
@distributed_trace
def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -616,18 +592,14 @@ def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2018_11_30.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2018_11_30.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -638,19 +610,19 @@ def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -658,15 +630,14 @@ def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -675,16 +646,12 @@ def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -695,12 +662,11 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2018_11_30.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -711,23 +677,22 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -736,16 +701,12 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -758,12 +719,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -774,23 +734,22 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2018-11-30"] = kwargs.pop("api_version", _params.pop("api-version", "2018-11-30"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-30"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -800,8 +759,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/__init__.py
index 785d352dea5b..6bbff1405f98 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/__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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_configuration.py
index b2d63699ad87..28dc64aa06ad 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2021-09-30-preview"] = kwargs.pop("api_version", "2021-09-30-preview")
+ api_version: str = kwargs.pop("api_version", "2021-09-30-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_managed_service_identity_client.py
index e3d32bf1c259..2d8e73ce8af1 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from . import models as _models
from .._serialization import Deserializer, Serializer
@@ -18,11 +21,10 @@
from .operations import Operations, SystemAssignedIdentitiesOperations, UserAssignedIdentitiesOperations
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -54,21 +56,41 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
+ )
+ self.operations = Operations(
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
)
- 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
@@ -88,12 +110,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) -> "ManagedServiceIdentityClient":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_metadata.json b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_metadata.json
index 9adee707850d..b4e966cd09a1 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_metadata.json
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_metadata.json
@@ -8,10 +8,10 @@
"host_value": "\"https://management.azure.com\"",
"parameterized_host_template": null,
"azure_arm": true,
- "has_lro_operations": false,
+ "has_public_lro_operations": false,
"client_side_validation": false,
- "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"global_parameters": {
"sync": {
@@ -101,8 +101,8 @@
"credential_scopes": ["https://management.azure.com/.default"],
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
- "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"operation_groups": {
"system_assigned_identities": "SystemAssignedIdentitiesOperations",
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_patch.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_patch.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_vendor.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_vendor.py
deleted file mode 100644
index bd0df84f5319..000000000000
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_vendor.py
+++ /dev/null
@@ -1,30 +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 typing import List, cast
-
-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
-
-
-def _format_url_section(template, **kwargs):
- components = template.split("/")
- while components:
- try:
- return template.format(**kwargs)
- except KeyError as key:
- # Need the cast, as for some reasons "split" is typed as list[str | Any]
- formatted_components = cast(List[str], template.split("/"))
- components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
- template = "/".join(components)
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_version.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_version.py
index d00e82dfabad..e5754a47ce68 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_version.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/_version.py
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "7.1.0b1"
+VERSION = "1.0.0b1"
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/__init__.py
index 28cad922df0d..14c69894e88d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_configuration.py
index 45c6c2f86ef9..0855fea01294 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2021-09-30-preview"] = kwargs.pop("api_version", "2021-09-30-preview")
+ api_version: str = kwargs.pop("api_version", "2021-09-30-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_managed_service_identity_client.py
index 0d02776795f1..5e0252ae5527 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from .. import models as _models
from ..._serialization import Deserializer, Serializer
@@ -18,11 +21,10 @@
from .operations import Operations, SystemAssignedIdentitiesOperations, UserAssignedIdentitiesOperations
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -54,21 +56,43 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
+ )
+ self.operations = Operations(
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2021-09-30-preview"
)
- 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
@@ -88,12 +112,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) -> "ManagedServiceIdentityClient":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_patch.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_patch.py
index f99e77fef986..17dbc073e01b 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_patch.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/_patch.py
@@ -25,6 +25,7 @@
#
# --------------------------------------------------------------------------
+
# This file is used for handwritten extensions to the generated code. Example:
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
def patch_sdk():
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/__init__.py
index 24c14ec2a376..fabe6180626f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/__init__.py
@@ -5,13 +5,19 @@
# 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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # 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__ = [
@@ -19,5 +25,5 @@
"Operations",
"UserAssignedIdentitiesOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_operations.py
index 1b67e928fdfb..e307f4ed0837 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._operations import build_list_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -56,12 +53,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Operation]
@@ -70,12 +67,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -86,14 +83,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
@@ -104,14 +99,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _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)
@@ -121,10 +115,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -135,5 +130,3 @@ async def get_next(next_link=None):
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_system_assigned_identities_operations.py
index 24cd105a2bf1..8d7792116fee 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._system_assigned_identities_operations import build_get_by_scope_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -54,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace_async
async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -62,12 +60,11 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -78,23 +75,22 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -103,11 +99,9 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_user_assigned_identities_operations.py
index 23b25ed05f5f..9b28af85ecdd 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/aio/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._user_assigned_identities_operations import (
build_create_or_update_request,
build_delete_request,
@@ -39,10 +37,10 @@
build_update_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -65,12 +63,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Identity]
@@ -79,12 +77,12 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -95,15 +93,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
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
@@ -114,14 +110,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -131,10 +126,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -146,10 +142,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -157,7 +149,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Identity]
@@ -166,12 +157,12 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -182,16 +173,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
@@ -202,14 +191,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -219,10 +207,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -234,10 +223,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.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_associated_resources(
self,
@@ -270,7 +255,6 @@ def list_associated_resources(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either AzureResource or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.AzureResource]
@@ -279,12 +263,12 @@ def list_associated_resources(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.AssociatedResourcesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -295,7 +279,7 @@ def list_associated_resources(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_associated_resources_request(
+ _request = build_list_associated_resources_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -305,12 +289,10 @@ def prepare_request(next_link=None):
skip=skip,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list_associated_resources.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -321,14 +303,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("AssociatedResourcesListResult", pipeline_response)
@@ -338,10 +319,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -353,10 +335,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_associated_resources.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/listAssociatedResources"
- }
-
@overload
async def create_or_update(
self,
@@ -379,7 +357,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -390,7 +367,7 @@ async def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -403,11 +380,10 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -415,7 +391,11 @@ async def create_or_update(
@distributed_trace_async
async def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -425,17 +405,13 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -446,8 +422,8 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -455,12 +431,12 @@ async def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -468,15 +444,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -485,21 +460,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
async def update(
self,
@@ -522,7 +489,6 @@ async def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -533,7 +499,7 @@ async def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -546,11 +512,10 @@ async def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -558,7 +523,11 @@ async def update(
@distributed_trace_async
async def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -567,18 +536,14 @@ async def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -589,8 +554,8 @@ async def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -598,12 +563,12 @@ async def update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -611,15 +576,14 @@ async def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -628,16 +592,12 @@ async def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -648,12 +608,11 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -664,25 +623,24 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -691,21 +649,15 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
- self, resource_group_name: str, resource_name: str, **kwargs: Any
- ) -> None:
+ async def delete(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> None:
"""Deletes the identity.
:param resource_group_name: The name of the Resource Group to which the identity belongs.
@@ -713,12 +665,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -729,25 +680,24 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -757,8 +707,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/__init__.py
index d8de55229f14..3e362b33c59f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/__init__.py
@@ -5,22 +5,31 @@
# 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 AssociatedResourcesListResult
-from ._models_py3 import AzureResource
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import Identity
-from ._models_py3 import IdentityUpdate
-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 SystemAssignedIdentity
-from ._models_py3 import TrackedResource
-from ._models_py3 import UserAssignedIdentitiesListResult
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import ( # type: ignore
+ AssociatedResourcesListResult,
+ AzureResource,
+ CloudErrorBody,
+ Identity,
+ IdentityUpdate,
+ Operation,
+ OperationDisplay,
+ OperationListResult,
+ ProxyResource,
+ Resource,
+ SystemAssignedIdentity,
+ TrackedResource,
+ UserAssignedIdentitiesListResult,
+)
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__ = [
@@ -38,5 +47,5 @@
"TrackedResource",
"UserAssignedIdentitiesListResult",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/_models_py3.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/_models_py3.py
index ec6a8ffed69b..905d41ff30d2 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/_models_py3.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/models/_models_py3.py
@@ -1,5 +1,4 @@
# 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.
@@ -12,7 +11,6 @@
from ... import _serialization
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
@@ -154,7 +152,7 @@ class Resource(_serialization.Model):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -189,10 +187,10 @@ class TrackedResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -237,10 +235,10 @@ class Identity(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. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -301,7 +299,7 @@ class IdentityUpdate(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -468,7 +466,7 @@ class ProxyResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -477,32 +475,16 @@ class ProxyResource(Resource):
:vartype type: str
"""
- _validation = {
- "id": {"readonly": True},
- "name": {"readonly": True},
- "type": {"readonly": True},
- }
-
- _attribute_map = {
- "id": {"key": "id", "type": "str"},
- "name": {"key": "name", "type": "str"},
- "type": {"key": "type", "type": "str"},
- }
-
- def __init__(self, **kwargs: Any) -> None:
- """ """
- super().__init__(**kwargs)
-
class SystemAssignedIdentity(ProxyResource):
"""Describes a system assigned identity resource.
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/__init__.py
index 24c14ec2a376..fabe6180626f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/__init__.py
@@ -5,13 +5,19 @@
# 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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # 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__ = [
@@ -19,5 +25,5 @@
"Operations",
"UserAssignedIdentitiesOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_operations.py
index 87535394dd83..55704786b98e 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,9 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -80,12 +75,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -93,12 +88,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -109,14 +104,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
@@ -127,14 +120,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -144,10 +136,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -158,5 +151,3 @@ def get_next(next_link=None):
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_system_assigned_identities_operations.py
index 5262459e6772..4e5018102806 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -43,9 +40,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -54,7 +49,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
"scope": _SERIALIZER.url("scope", scope, "str", skip_quote=True),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -83,6 +78,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -91,12 +87,11 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -107,23 +102,22 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -132,11 +126,9 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_user_assigned_identities_operations.py
index cf1ceb330436..8e3b4ae9a031 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2021_09_30_preview/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,9 +43,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -58,7 +54,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
"subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -73,9 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -88,7 +82,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
"resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -114,9 +108,7 @@ def build_list_associated_resources_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -130,7 +122,7 @@ def build_list_associated_resources_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
if filter is not None:
@@ -157,9 +149,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -174,7 +164,7 @@ def build_create_or_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -193,9 +183,7 @@ def build_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -210,7 +198,7 @@ def build_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -227,9 +215,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -243,7 +229,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -260,9 +246,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-09-30-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -276,7 +260,7 @@ def build_delete_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -305,12 +289,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -318,12 +302,12 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -334,15 +318,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
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
@@ -353,14 +335,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -370,10 +351,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -385,10 +367,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -396,7 +374,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -404,12 +381,12 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -420,16 +397,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
@@ -440,14 +415,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -457,10 +431,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -472,10 +447,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.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_associated_resources(
self,
@@ -508,7 +479,6 @@ def list_associated_resources(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either AzureResource or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2021_09_30_preview.models.AzureResource]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -516,12 +486,12 @@ def list_associated_resources(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.AssociatedResourcesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -532,7 +502,7 @@ def list_associated_resources(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_associated_resources_request(
+ _request = build_list_associated_resources_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -542,12 +512,10 @@ def prepare_request(next_link=None):
skip=skip,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list_associated_resources.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -558,14 +526,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("AssociatedResourcesListResult", pipeline_response)
@@ -575,10 +542,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -590,10 +558,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_associated_resources.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/listAssociatedResources"
- }
-
@overload
def create_or_update(
self,
@@ -616,7 +580,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -627,7 +590,7 @@ def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -640,11 +603,10 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -652,7 +614,11 @@ def create_or_update(
@distributed_trace
def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -662,17 +628,13 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -683,8 +645,8 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -692,12 +654,12 @@ def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -705,15 +667,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -722,21 +683,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
def update(
self,
@@ -759,7 +712,6 @@ def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -770,7 +722,7 @@ def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -783,11 +735,10 @@ def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -795,7 +746,11 @@ def update(
@distributed_trace
def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -804,18 +759,14 @@ def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2021_09_30_preview.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -826,8 +777,8 @@ def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -835,12 +786,12 @@ def update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -848,15 +799,14 @@ def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -865,16 +815,12 @@ def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -885,12 +831,11 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2021_09_30_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -901,25 +846,24 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -928,16 +872,12 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -950,12 +890,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -966,25 +905,24 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2021-09-30-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2021-09-30-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2021-09-30-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -994,8 +932,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/__init__.py
index 785d352dea5b..6bbff1405f98 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/__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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_configuration.py
index e71f74f78936..6e8257cbc190 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2022-01-31-preview"] = kwargs.pop("api_version", "2022-01-31-preview")
+ api_version: str = kwargs.pop("api_version", "2022-01-31-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_managed_service_identity_client.py
index 20d32ad4e09a..cab4728025b9 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from . import models as _models
from .._serialization import Deserializer, Serializer
@@ -23,11 +26,10 @@
)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -62,24 +64,44 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
+ )
+ self.operations = Operations(
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
self.federated_identity_credentials = FederatedIdentityCredentialsOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
- 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
@@ -99,12 +121,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) -> "ManagedServiceIdentityClient":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_metadata.json b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_metadata.json
index 2301ab6b4eb8..3d069ed66e92 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_metadata.json
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_metadata.json
@@ -8,10 +8,10 @@
"host_value": "\"https://management.azure.com\"",
"parameterized_host_template": null,
"azure_arm": true,
- "has_lro_operations": false,
+ "has_public_lro_operations": false,
"client_side_validation": false,
- "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"global_parameters": {
"sync": {
@@ -101,8 +101,8 @@
"credential_scopes": ["https://management.azure.com/.default"],
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
- "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"operation_groups": {
"system_assigned_identities": "SystemAssignedIdentitiesOperations",
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_vendor.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_vendor.py
deleted file mode 100644
index bd0df84f5319..000000000000
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_vendor.py
+++ /dev/null
@@ -1,30 +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 typing import List, cast
-
-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
-
-
-def _format_url_section(template, **kwargs):
- components = template.split("/")
- while components:
- try:
- return template.format(**kwargs)
- except KeyError as key:
- # Need the cast, as for some reasons "split" is typed as list[str | Any]
- formatted_components = cast(List[str], template.split("/"))
- components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
- template = "/".join(components)
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_version.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_version.py
index d00e82dfabad..e5754a47ce68 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_version.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/_version.py
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "7.1.0b1"
+VERSION = "1.0.0b1"
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/__init__.py
index 28cad922df0d..14c69894e88d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_configuration.py
index 994c6192f569..21e03e59e4af 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2022-01-31-preview"] = kwargs.pop("api_version", "2022-01-31-preview")
+ api_version: str = kwargs.pop("api_version", "2022-01-31-preview")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_managed_service_identity_client.py
index 0b8246d5fe6a..6bc90570a7af 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from .. import models as _models
from ..._serialization import Deserializer, Serializer
@@ -23,11 +26,10 @@
)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -62,24 +64,46 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
+ )
+ self.operations = Operations(
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
self.federated_identity_credentials = FederatedIdentityCredentialsOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2022-01-31-preview"
)
- 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
@@ -99,12 +123,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) -> "ManagedServiceIdentityClient":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/__init__.py
index 9296ec8c2232..b50b543ebd92 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
-from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # type: ignore
+from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations # 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 @@
"UserAssignedIdentitiesOperations",
"FederatedIdentityCredentialsOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_federated_identity_credentials_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_federated_identity_credentials_operations.py
index b83d0692e328..de0e79653380 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_federated_identity_credentials_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_federated_identity_credentials_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._federated_identity_credentials_operations import (
build_create_or_update_request,
build_delete_request,
@@ -36,10 +34,10 @@
build_list_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -62,6 +60,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(
@@ -86,7 +85,6 @@ def list(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either FederatedIdentityCredential or the result of
cls(response)
:rtype:
@@ -96,12 +94,12 @@ def list(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.FederatedIdentityCredentialsListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -112,19 +110,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,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
top=top,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -135,14 +131,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("FederatedIdentityCredentialsListResult", pipeline_response)
@@ -152,10 +147,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -167,10 +163,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials"
- }
-
@overload
async def create_or_update(
self,
@@ -197,7 +189,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -209,7 +200,7 @@ async def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -225,11 +216,10 @@ async def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. 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: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -241,7 +231,7 @@ async def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: Union[_models.FederatedIdentityCredential, IO],
+ parameters: Union[_models.FederatedIdentityCredential, IO[bytes]],
**kwargs: Any
) -> _models.FederatedIdentityCredential:
"""Create or update a federated identity credential under the specified user assigned identity.
@@ -255,17 +245,14 @@ async def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. Is either
- a FederatedIdentityCredential type or a IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential 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
+ a FederatedIdentityCredential type or a IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential or
+ IO[bytes]
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -276,8 +263,8 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
@@ -285,12 +272,12 @@ async def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "FederatedIdentityCredential")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
@@ -299,15 +286,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -316,21 +302,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
-
@distributed_trace_async
async def get(
self,
@@ -349,12 +327,11 @@ async def get(
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -365,26 +342,25 @@ async def get(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -393,19 +369,15 @@ async def get(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", 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.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
+ async def delete(
self,
resource_group_name: str,
resource_name: str,
@@ -422,12 +394,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -438,26 +409,25 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -467,8 +437,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_operations.py
index 205d42e06a04..5f6adc6032ba 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._operations import build_list_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -56,12 +53,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Operation]
@@ -70,12 +67,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -86,14 +83,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
@@ -104,14 +99,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _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)
@@ -121,10 +115,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -135,5 +130,3 @@ async def get_next(next_link=None):
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_system_assigned_identities_operations.py
index c42db5bf9269..885b443f98a5 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._system_assigned_identities_operations import build_get_by_scope_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -54,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace_async
async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -62,12 +60,11 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -78,23 +75,22 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -103,11 +99,9 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_user_assigned_identities_operations.py
index 8d2f7c6791ac..02f2bd8f7120 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/aio/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._user_assigned_identities_operations import (
build_create_or_update_request,
build_delete_request,
@@ -39,10 +37,10 @@
build_update_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -65,12 +63,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Identity]
@@ -79,12 +77,12 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -95,15 +93,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
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
@@ -114,14 +110,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -131,10 +126,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -146,10 +142,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -157,7 +149,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Identity]
@@ -166,12 +157,12 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -182,16 +173,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
@@ -202,14 +191,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -219,10 +207,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -234,10 +223,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.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_associated_resources(
self,
@@ -270,7 +255,6 @@ def list_associated_resources(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either AzureResource or the result of cls(response)
:rtype:
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.AzureResource]
@@ -279,12 +263,12 @@ def list_associated_resources(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.AssociatedResourcesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -295,7 +279,7 @@ def list_associated_resources(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_associated_resources_request(
+ _request = build_list_associated_resources_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -305,12 +289,10 @@ def prepare_request(next_link=None):
skip=skip,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list_associated_resources.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -321,14 +303,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("AssociatedResourcesListResult", pipeline_response)
@@ -338,10 +319,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -353,10 +335,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_associated_resources.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/listAssociatedResources"
- }
-
@overload
async def create_or_update(
self,
@@ -379,7 +357,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -390,7 +367,7 @@ async def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -403,11 +380,10 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -415,7 +391,11 @@ async def create_or_update(
@distributed_trace_async
async def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -425,17 +405,13 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -446,8 +422,8 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -455,12 +431,12 @@ async def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -468,15 +444,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -485,21 +460,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
async def update(
self,
@@ -522,7 +489,6 @@ async def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -533,7 +499,7 @@ async def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -546,11 +512,10 @@ async def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -558,7 +523,11 @@ async def update(
@distributed_trace_async
async def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -567,18 +536,14 @@ async def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -589,8 +554,8 @@ async def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -598,12 +563,12 @@ async def update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -611,15 +576,14 @@ async def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -628,16 +592,12 @@ async def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -648,12 +608,11 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -664,25 +623,24 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -691,21 +649,15 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
- self, resource_group_name: str, resource_name: str, **kwargs: Any
- ) -> None:
+ async def delete(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> None:
"""Deletes the identity.
:param resource_group_name: The name of the Resource Group to which the identity belongs.
@@ -713,12 +665,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -729,25 +680,24 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -757,8 +707,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/__init__.py
index 0f6a36be5fd0..7d9fc613ee5e 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/__init__.py
@@ -5,24 +5,33 @@
# 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 AssociatedResourcesListResult
-from ._models_py3 import AzureResource
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import FederatedIdentityCredential
-from ._models_py3 import FederatedIdentityCredentialsListResult
-from ._models_py3 import Identity
-from ._models_py3 import IdentityUpdate
-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 SystemAssignedIdentity
-from ._models_py3 import TrackedResource
-from ._models_py3 import UserAssignedIdentitiesListResult
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import ( # type: ignore
+ AssociatedResourcesListResult,
+ AzureResource,
+ CloudErrorBody,
+ FederatedIdentityCredential,
+ FederatedIdentityCredentialsListResult,
+ Identity,
+ IdentityUpdate,
+ Operation,
+ OperationDisplay,
+ OperationListResult,
+ ProxyResource,
+ Resource,
+ SystemAssignedIdentity,
+ TrackedResource,
+ UserAssignedIdentitiesListResult,
+)
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__ = [
@@ -42,5 +51,5 @@
"TrackedResource",
"UserAssignedIdentitiesListResult",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/_models_py3.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/_models_py3.py
index f519a8a455c4..c16271febb1d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/_models_py3.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/models/_models_py3.py
@@ -1,5 +1,4 @@
# 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.
@@ -12,7 +11,6 @@
from ... import _serialization
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
@@ -154,7 +152,7 @@ class Resource(_serialization.Model):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -190,7 +188,7 @@ class ProxyResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -199,22 +197,6 @@ class ProxyResource(Resource):
:vartype type: str
"""
- _validation = {
- "id": {"readonly": True},
- "name": {"readonly": True},
- "type": {"readonly": True},
- }
-
- _attribute_map = {
- "id": {"key": "id", "type": "str"},
- "name": {"key": "name", "type": "str"},
- "type": {"key": "type", "type": "str"},
- }
-
- def __init__(self, **kwargs: Any) -> None:
- """ """
- super().__init__(**kwargs)
-
class FederatedIdentityCredential(ProxyResource):
"""Describes a federated identity credential.
@@ -222,7 +204,7 @@ class FederatedIdentityCredential(ProxyResource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -314,10 +296,10 @@ class TrackedResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -362,10 +344,10 @@ class Identity(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. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -426,7 +408,7 @@ class IdentityUpdate(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -591,10 +573,10 @@ class SystemAssignedIdentity(ProxyResource):
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. Ex -
- /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.
+ /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/__init__.py
index 9296ec8c2232..b50b543ebd92 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
-from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # type: ignore
+from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations # 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 @@
"UserAssignedIdentitiesOperations",
"FederatedIdentityCredentialsOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_federated_identity_credentials_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_federated_identity_credentials_operations.py
index 52bc8e786ad8..17c7c53ddd47 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_federated_identity_credentials_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_federated_identity_credentials_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -53,9 +51,7 @@ def build_list_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -69,7 +65,7 @@ def build_list_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
if top is not None:
@@ -94,9 +90,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -114,7 +108,7 @@ def build_create_or_update_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -137,9 +131,7 @@ def build_get_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -156,7 +148,7 @@ def build_get_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -177,9 +169,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -196,7 +186,7 @@ def build_delete_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -225,6 +215,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(
@@ -249,7 +240,6 @@ def list(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either FederatedIdentityCredential or the result of
cls(response)
:rtype:
@@ -259,12 +249,12 @@ def list(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.FederatedIdentityCredentialsListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -275,19 +265,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,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
top=top,
skiptoken=skiptoken,
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
@@ -298,14 +286,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("FederatedIdentityCredentialsListResult", pipeline_response)
@@ -315,10 +302,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -330,10 +318,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials"
- }
-
@overload
def create_or_update(
self,
@@ -360,7 +344,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -372,7 +355,7 @@ def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -388,11 +371,10 @@ def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. 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: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -404,7 +386,7 @@ def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: Union[_models.FederatedIdentityCredential, IO],
+ parameters: Union[_models.FederatedIdentityCredential, IO[bytes]],
**kwargs: Any
) -> _models.FederatedIdentityCredential:
"""Create or update a federated identity credential under the specified user assigned identity.
@@ -418,17 +400,14 @@ def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. Is either
- a FederatedIdentityCredential type or a IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential 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
+ a FederatedIdentityCredential type or a IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential or
+ IO[bytes]
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -439,8 +418,8 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
@@ -448,12 +427,12 @@ def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "FederatedIdentityCredential")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
@@ -462,15 +441,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -479,21 +457,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
-
@distributed_trace
def get(
self,
@@ -512,12 +482,11 @@ def get(
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -528,26 +497,25 @@ def get(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -556,16 +524,12 @@ def get(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", 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.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -585,12 +549,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -601,26 +564,25 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -630,8 +592,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_operations.py
index 93519c71fcd2..c9f03559e156 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,9 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -80,12 +75,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -93,12 +88,12 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -109,14 +104,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
@@ -127,14 +120,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -144,10 +136,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -158,5 +151,3 @@ def get_next(next_link=None):
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_system_assigned_identities_operations.py
index 7e722f8b976a..a88595bac8f4 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -43,9 +40,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -54,7 +49,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
"scope": _SERIALIZER.url("scope", scope, "str", skip_quote=True),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -83,6 +78,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -91,12 +87,11 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -107,23 +102,22 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -132,11 +126,9 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_user_assigned_identities_operations.py
index 1845c81b6b99..7a7910b51df8 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2022_01_31_preview/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,9 +43,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -58,7 +54,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
"subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -73,9 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -88,7 +82,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
"resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -114,9 +108,7 @@ def build_list_associated_resources_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -130,7 +122,7 @@ def build_list_associated_resources_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
if filter is not None:
@@ -157,9 +149,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -174,7 +164,7 @@ def build_create_or_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -193,9 +183,7 @@ def build_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -210,7 +198,7 @@ def build_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -227,9 +215,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -243,7 +229,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -260,9 +246,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
- )
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-01-31-preview"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -276,7 +260,7 @@ def build_delete_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -305,12 +289,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -318,12 +302,12 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -334,15 +318,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
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
@@ -353,14 +335,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -370,10 +351,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -385,10 +367,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -396,7 +374,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -404,12 +381,12 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -420,16 +397,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
@@ -440,14 +415,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -457,10 +431,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -472,10 +447,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.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_associated_resources(
self,
@@ -508,7 +479,6 @@ def list_associated_resources(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either AzureResource or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2022_01_31_preview.models.AzureResource]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -516,12 +486,12 @@ def list_associated_resources(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.AssociatedResourcesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -532,7 +502,7 @@ def list_associated_resources(
def prepare_request(next_link=None):
if not next_link:
- request = build_list_associated_resources_request(
+ _request = build_list_associated_resources_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -542,12 +512,10 @@ def prepare_request(next_link=None):
skip=skip,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list_associated_resources.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -558,14 +526,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("AssociatedResourcesListResult", pipeline_response)
@@ -575,10 +542,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -590,10 +558,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_associated_resources.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/listAssociatedResources"
- }
-
@overload
def create_or_update(
self,
@@ -616,7 +580,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -627,7 +590,7 @@ def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -640,11 +603,10 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -652,7 +614,11 @@ def create_or_update(
@distributed_trace
def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -662,17 +628,13 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -683,8 +645,8 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -692,12 +654,12 @@ def create_or_update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -705,15 +667,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -722,21 +683,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
def update(
self,
@@ -759,7 +712,6 @@ def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -770,7 +722,7 @@ def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -783,11 +735,10 @@ def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -795,7 +746,11 @@ def update(
@distributed_trace
def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -804,18 +759,14 @@ def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2022_01_31_preview.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -826,8 +777,8 @@ def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
@@ -835,12 +786,12 @@ def update(
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -848,15 +799,14 @@ def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -865,16 +815,12 @@ def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -885,12 +831,11 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2022_01_31_preview.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -901,25 +846,24 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -928,16 +872,12 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -950,12 +890,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -966,25 +905,24 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2022-01-31-preview"] = kwargs.pop(
- "api_version", _params.pop("api-version", "2022-01-31-preview")
+ api_version: str = kwargs.pop(
+ "api_version", _params.pop("api-version", self._api_version or "2022-01-31-preview")
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -994,8 +932,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/__init__.py
index 785d352dea5b..6bbff1405f98 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/__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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_configuration.py
index 6540c8481888..a2e7754d7c12 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", "2023-01-31")
+ api_version: str = kwargs.pop("api_version", "2023-01-31")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_managed_service_identity_client.py
index 52f8d05b35e0..d17d7dda864d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
from . import models as _models
from .._serialization import Deserializer, Serializer
@@ -23,11 +26,10 @@
)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials import TokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -62,24 +64,42 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ ARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+ self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2023-01-31")
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
self.federated_identity_credentials = FederatedIdentityCredentialsOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
- 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
@@ -99,12 +119,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) -> "ManagedServiceIdentityClient":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_metadata.json b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_metadata.json
index 03b3f41aa5e1..bb94d810133f 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_metadata.json
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_metadata.json
@@ -8,10 +8,10 @@
"host_value": "\"https://management.azure.com\"",
"parameterized_host_template": null,
"azure_arm": true,
- "has_lro_operations": false,
+ "has_public_lro_operations": false,
"client_side_validation": false,
- "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"azurecore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"global_parameters": {
"sync": {
@@ -101,8 +101,8 @@
"credential_scopes": ["https://management.azure.com/.default"],
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
- "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
- "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+ "sync_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+ "async_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
},
"operation_groups": {
"system_assigned_identities": "SystemAssignedIdentitiesOperations",
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_vendor.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_vendor.py
deleted file mode 100644
index bd0df84f5319..000000000000
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_vendor.py
+++ /dev/null
@@ -1,30 +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 typing import List, cast
-
-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
-
-
-def _format_url_section(template, **kwargs):
- components = template.split("/")
- while components:
- try:
- return template.format(**kwargs)
- except KeyError as key:
- # Need the cast, as for some reasons "split" is typed as list[str | Any]
- formatted_components = cast(List[str], template.split("/"))
- components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
- template = "/".join(components)
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_version.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_version.py
index d00e82dfabad..e5754a47ce68 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_version.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/_version.py
@@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "7.1.0b1"
+VERSION = "1.0.0b1"
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/__init__.py
index 28cad922df0d..14c69894e88d 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/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 ._managed_service_identity_client import ManagedServiceIdentityClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._managed_service_identity_client import ManagedServiceIdentityClient # 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__ = [
"ManagedServiceIdentityClient",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_configuration.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_configuration.py
index ea50bfaa3462..bde74845cc58 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_configuration.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_configuration.py
@@ -6,26 +6,18 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
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 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 azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
+class ManagedServiceIdentityClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for ManagedServiceIdentityClient.
Note that all parameters used to create this instance are saved as instance
@@ -41,8 +33,7 @@ class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disab
"""
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
- super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", "2023-01-31")
+ api_version: str = kwargs.pop("api_version", "2023-01-31")
if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
@@ -54,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-msi/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -62,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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_managed_service_identity_client.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_managed_service_identity_client.py
index c679f7b0df78..b6ffba82a7f3 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_managed_service_identity_client.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/_managed_service_identity_client.py
@@ -8,9 +8,12 @@
from copy import deepcopy
from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
from .. import models as _models
from ..._serialization import Deserializer, Serializer
@@ -23,11 +26,10 @@
)
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-class ManagedServiceIdentityClient: # pylint: disable=client-accepts-api-version-keyword
+class ManagedServiceIdentityClient:
"""The Managed Service Identity Client.
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
@@ -62,24 +64,44 @@ def __init__(
self._config = ManagedServiceIdentityClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
- self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ AsyncARMAutoResourceProviderRegistrationPolicy(),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)
self._serialize.client_side_validation = False
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
- self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+ self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2023-01-31")
self.user_assigned_identities = UserAssignedIdentitiesOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
self.federated_identity_credentials = FederatedIdentityCredentialsOperations(
- self._client, self._config, self._serialize, self._deserialize
+ self._client, self._config, self._serialize, self._deserialize, "2023-01-31"
)
- 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
@@ -99,12 +121,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) -> "ManagedServiceIdentityClient":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/__init__.py
index 9296ec8c2232..b50b543ebd92 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
-from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # type: ignore
+from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations # 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 @@
"UserAssignedIdentitiesOperations",
"FederatedIdentityCredentialsOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_federated_identity_credentials_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_federated_identity_credentials_operations.py
index 8ffad7efe711..10d5181350df 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_federated_identity_credentials_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_federated_identity_credentials_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._federated_identity_credentials_operations import (
build_create_or_update_request,
build_delete_request,
@@ -36,10 +34,10 @@
build_list_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -62,6 +60,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(
@@ -86,7 +85,6 @@ def list(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either FederatedIdentityCredential or the result of
cls(response)
:rtype:
@@ -96,10 +94,10 @@ def list(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.FederatedIdentityCredentialsListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -110,19 +108,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,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
top=top,
skiptoken=skiptoken,
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -133,14 +129,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("FederatedIdentityCredentialsListResult", pipeline_response)
@@ -150,10 +145,11 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -165,10 +161,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials"
- }
-
@overload
async def create_or_update(
self,
@@ -195,7 +187,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -207,7 +198,7 @@ async def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -223,11 +214,10 @@ async def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. 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: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -239,7 +229,7 @@ async def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: Union[_models.FederatedIdentityCredential, IO],
+ parameters: Union[_models.FederatedIdentityCredential, IO[bytes]],
**kwargs: Any
) -> _models.FederatedIdentityCredential:
"""Create or update a federated identity credential under the specified user assigned identity.
@@ -253,17 +243,13 @@ async def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. Is either
- a FederatedIdentityCredential type or a IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential 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
+ a FederatedIdentityCredential type or a IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential or IO[bytes]
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -274,19 +260,19 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "FederatedIdentityCredential")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
@@ -295,15 +281,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -312,21 +297,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
-
@distributed_trace_async
async def get(
self,
@@ -345,12 +322,11 @@ async def get(
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -361,24 +337,23 @@ async def get(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -387,19 +362,15 @@ async def get(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", 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.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
+ async def delete(
self,
resource_group_name: str,
resource_name: str,
@@ -416,12 +387,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -432,24 +402,23 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -459,8 +428,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_operations.py
index e7e43d7b02ea..73c92e89a3c1 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._operations import build_list_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -56,12 +53,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2023_01_31.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -69,10 +66,10 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -83,14 +80,12 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
def prepare_request(next_link=None):
if not next_link:
- request = build_list_request(
+ _request = build_list_request(
api_version=api_version,
- template_url=self.list.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
else:
# make call to next link with the client's api-version
@@ -101,14 +96,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _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)
@@ -118,10 +112,11 @@ async def extract_data(pipeline_response):
return deserialized.next_link or None, AsyncList(list_of_elem)
async def get_next(next_link=None):
- request = prepare_request(next_link)
+ _request = prepare_request(next_link)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -132,5 +127,3 @@ async def get_next(next_link=None):
return pipeline_response
return AsyncItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_system_assigned_identities_operations.py
index d01e629108cb..bd0b357777cd 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._system_assigned_identities_operations import build_get_by_scope_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -54,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace_async
async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -62,12 +60,11 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -78,21 +75,20 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -101,11 +97,9 @@ async def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssigne
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_user_assigned_identities_operations.py
index 09056320a66f..0ec5f4677ce9 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/aio/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,15 +20,13 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from ... import models as _models
-from ..._vendor import _convert_request
from ...operations._user_assigned_identities_operations import (
build_create_or_update_request,
build_delete_request,
@@ -38,10 +36,10 @@
build_update_request,
)
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
@@ -64,12 +62,12 @@ def __init__(self, *args, **kwargs) -> None:
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2023_01_31.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -77,10 +75,10 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -91,15 +89,13 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Identity
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
@@ -110,14 +106,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -127,10 +122,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -142,10 +138,6 @@ async def get_next(next_link=None):
return AsyncItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -153,7 +145,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.msi.v2023_01_31.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -161,10 +152,10 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -175,16 +166,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
@@ -195,14 +184,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
async def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -212,10 +200,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -227,10 +216,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.ManagedIdentity/userAssignedIdentities"
- }
-
@overload
async def create_or_update(
self,
@@ -253,7 +238,6 @@ async def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -264,7 +248,7 @@ async def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -277,11 +261,10 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -289,7 +272,11 @@ async def create_or_update(
@distributed_trace_async
async def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -299,17 +286,13 @@ async def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -320,19 +303,19 @@ async def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -340,15 +323,14 @@ async def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -357,21 +339,13 @@ async def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
async def update(
self,
@@ -394,7 +368,6 @@ async def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -405,7 +378,7 @@ async def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -418,11 +391,10 @@ async def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -430,7 +402,11 @@ async def update(
@distributed_trace_async
async def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -439,18 +415,14 @@ async def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -461,19 +433,19 @@ async def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -481,15 +453,14 @@ async def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -498,16 +469,12 @@ async def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -518,12 +485,11 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -534,23 +500,22 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -559,21 +524,15 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any)
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete( # pylint: disable=inconsistent-return-statements
- self, resource_group_name: str, resource_name: str, **kwargs: Any
- ) -> None:
+ async def delete(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> None:
"""Deletes the identity.
:param resource_group_name: The name of the Resource Group to which the identity belongs.
@@ -581,12 +540,11 @@ async def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -597,23 +555,22 @@ async def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -623,8 +580,4 @@ async def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/__init__.py
index 79e98c05d609..24c4535d9b18 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/__init__.py
@@ -5,25 +5,36 @@
# 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 CloudErrorBody
-from ._models_py3 import FederatedIdentityCredential
-from ._models_py3 import FederatedIdentityCredentialsListResult
-from ._models_py3 import Identity
-from ._models_py3 import IdentityUpdate
-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 SystemAssignedIdentity
-from ._models_py3 import SystemData
-from ._models_py3 import TrackedResource
-from ._models_py3 import UserAssignedIdentitiesListResult
+from typing import TYPE_CHECKING
-from ._managed_service_identity_client_enums import CreatedByType
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import ( # type: ignore
+ CloudErrorBody,
+ FederatedIdentityCredential,
+ FederatedIdentityCredentialsListResult,
+ Identity,
+ IdentityUpdate,
+ Operation,
+ OperationDisplay,
+ OperationListResult,
+ ProxyResource,
+ Resource,
+ SystemAssignedIdentity,
+ SystemData,
+ TrackedResource,
+ UserAssignedIdentitiesListResult,
+)
+
+from ._managed_service_identity_client_enums import ( # type: ignore
+ CreatedByType,
+)
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__ = [
@@ -43,5 +54,5 @@
"UserAssignedIdentitiesListResult",
"CreatedByType",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/_models_py3.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/_models_py3.py
index db2462fa5d5e..8c9ce37ff87c 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/_models_py3.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/models/_models_py3.py
@@ -1,5 +1,4 @@
# 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.
@@ -13,7 +12,6 @@
from ... import _serialization
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
@@ -73,7 +71,7 @@ class Resource(_serialization.Model):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. E.g.
- "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -115,7 +113,7 @@ class ProxyResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. E.g.
- "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -127,24 +125,6 @@ class ProxyResource(Resource):
:vartype system_data: ~azure.mgmt.msi.v2023_01_31.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 FederatedIdentityCredential(ProxyResource):
"""Describes a federated identity credential.
@@ -152,7 +132,7 @@ class FederatedIdentityCredential(ProxyResource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. E.g.
- "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -249,10 +229,10 @@ class TrackedResource(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
- All required parameters must be populated in order to send to Azure.
+ All required parameters must be populated in order to send to server.
:ivar id: Fully qualified resource ID for the resource. E.g.
- "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -302,10 +282,10 @@ class Identity(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}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -371,7 +351,7 @@ class IdentityUpdate(Resource):
Variables are only populated by the server, and will be ignored when sending a request.
:ivar id: Fully qualified resource ID for the resource. E.g.
- "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
@@ -541,10 +521,10 @@ class SystemAssignedIdentity(ProxyResource):
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}".
+ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}". # pylint: disable=line-too-long
:vartype id: str
:ivar name: The name of the resource.
:vartype name: str
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/__init__.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/__init__.py
index 9296ec8c2232..b50b543ebd92 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/__init__.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/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 ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations
-from ._operations import Operations
-from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations
-from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._system_assigned_identities_operations import SystemAssignedIdentitiesOperations # type: ignore
+from ._operations import Operations # type: ignore
+from ._user_assigned_identities_operations import UserAssignedIdentitiesOperations # type: ignore
+from ._federated_identity_credentials_operations import FederatedIdentityCredentialsOperations # 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 @@
"UserAssignedIdentitiesOperations",
"FederatedIdentityCredentialsOperations",
]
-__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/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_federated_identity_credentials_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_federated_identity_credentials_operations.py
index 91bbc01876f4..4d72b943c3e0 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_federated_identity_credentials_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_federated_identity_credentials_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -53,7 +51,7 @@ def build_list_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -69,7 +67,7 @@ def build_list_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
if top is not None:
@@ -94,7 +92,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -117,7 +115,7 @@ def build_create_or_update_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -140,7 +138,7 @@ def build_get_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -162,7 +160,7 @@ def build_get_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -183,7 +181,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -205,7 +203,7 @@ def build_delete_request(
),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -234,6 +232,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(
@@ -258,7 +257,6 @@ def list(
element will include a skipToken parameter that specifies a starting point to use for
subsequent calls. Default value is None.
:type skiptoken: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either FederatedIdentityCredential or the result of
cls(response)
:rtype:
@@ -268,10 +266,10 @@ def list(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.FederatedIdentityCredentialsListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -282,19 +280,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,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
top=top,
skiptoken=skiptoken,
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
@@ -305,14 +301,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("FederatedIdentityCredentialsListResult", pipeline_response)
@@ -322,10 +317,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -337,10 +333,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials"
- }
-
@overload
def create_or_update(
self,
@@ -367,7 +359,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -379,7 +370,7 @@ def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -395,11 +386,10 @@ def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. 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: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
@@ -411,7 +401,7 @@ def create_or_update(
resource_group_name: str,
resource_name: str,
federated_identity_credential_resource_name: str,
- parameters: Union[_models.FederatedIdentityCredential, IO],
+ parameters: Union[_models.FederatedIdentityCredential, IO[bytes]],
**kwargs: Any
) -> _models.FederatedIdentityCredential:
"""Create or update a federated identity credential under the specified user assigned identity.
@@ -425,17 +415,13 @@ def create_or_update(
credential resource. Required.
:type federated_identity_credential_resource_name: str
:param parameters: Parameters to create or update the federated identity credential. Is either
- a FederatedIdentityCredential type or a IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential 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
+ a FederatedIdentityCredential type or a IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential or IO[bytes]
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -446,19 +432,19 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "FederatedIdentityCredential")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
@@ -467,15 +453,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -484,21 +469,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
-
@distributed_trace
def get(
self,
@@ -517,12 +494,11 @@ def get(
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: FederatedIdentityCredential or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.FederatedIdentityCredential
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -533,24 +509,23 @@ def get(
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.FederatedIdentityCredential] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -559,16 +534,12 @@ def get(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("FederatedIdentityCredential", pipeline_response)
+ deserialized = self._deserialize("FederatedIdentityCredential", 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.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -588,12 +559,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:param federated_identity_credential_resource_name: The name of the federated identity
credential resource. Required.
:type federated_identity_credential_resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -604,24 +574,23 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
federated_identity_credential_resource_name=federated_identity_credential_resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -631,8 +600,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/federatedIdentityCredentials/{federatedIdentityCredentialResourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_operations.py
index 02d8b5bde328..7842ef30a6c7 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -20,20 +19,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +42,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -78,12 +75,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
"""Lists available operations for the Microsoft.ManagedIdentity provider.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Operation or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2023_01_31.models.Operation]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -91,10 +88,10 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -105,14 +102,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
@@ -123,14 +118,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -140,10 +134,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -154,5 +149,3 @@ def get_next(next_link=None):
return pipeline_response
return ItemPaged(get_next, extract_data)
-
- list.metadata = {"url": "/providers/Microsoft.ManagedIdentity/operations"}
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_system_assigned_identities_operations.py
index 7bab8c29318e..2a575413f443 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_system_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_system_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -18,20 +17,18 @@
map_error,
)
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -43,7 +40,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -52,7 +49,7 @@ def build_get_by_scope_request(scope: str, **kwargs: Any) -> HttpRequest:
"scope": _SERIALIZER.url("scope", scope, "str", skip_quote=True),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -81,6 +78,7 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdentity:
@@ -89,12 +87,11 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
:param scope: The resource provider scope of the resource. Parent resource being extended by
Managed Identities. Required.
:type scope: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: SystemAssignedIdentity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.SystemAssignedIdentity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -105,21 +102,20 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.SystemAssignedIdentity] = kwargs.pop("cls", None)
- request = build_get_by_scope_request(
+ _request = build_get_by_scope_request(
scope=scope,
api_version=api_version,
- template_url=self.get_by_scope.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -128,11 +124,9 @@ def get_by_scope(self, scope: str, **kwargs: Any) -> _models.SystemAssignedIdent
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response)
+ deserialized = self._deserialize("SystemAssignedIdentity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- return deserialized
-
- get_by_scope.metadata = {"url": "/{scope}/providers/Microsoft.ManagedIdentity/identities/default"}
+ return deserialized # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_user_assigned_identities_operations.py
index 7de2659de99a..f7140bd6d797 100644
--- a/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_user_assigned_identities_operations.py
+++ b/sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2023_01_31/operations/_user_assigned_identities_operations.py
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,6 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from io import IOBase
import sys
from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
import urllib.parse
@@ -20,20 +20,18 @@
)
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from azure.mgmt.core.exceptions import ARMErrorFormat
from .. import models as _models
from ..._serialization import Serializer
-from .._vendor import _convert_request, _format_url_section
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+ from collections.abc import MutableMapping
else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+ from typing import MutableMapping # type: ignore
T = TypeVar("T")
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -45,7 +43,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -56,7 +54,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H
"subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -71,7 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -84,7 +82,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_
"resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -101,7 +99,7 @@ def build_create_or_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -116,7 +114,7 @@ def build_create_or_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -135,7 +133,7 @@ def build_update_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
accept = _headers.pop("Accept", "application/json")
@@ -150,7 +148,7 @@ def build_update_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -167,7 +165,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -181,7 +179,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -198,7 +196,7 @@ def build_delete_request(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -212,7 +210,7 @@ def build_delete_request(
"resourceName": _SERIALIZER.url("resource_name", resource_name, "str"),
}
- _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore
+ _url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
_params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -241,12 +239,12 @@ def __init__(self, *args, **kwargs):
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._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
@distributed_trace
def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified subscription.
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2023_01_31.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -254,10 +252,10 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -268,15 +266,13 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Identity"]:
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
@@ -287,14 +283,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -304,10 +299,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -319,10 +315,6 @@ def get_next(next_link=None):
return ItemPaged(get_next, extract_data)
- list_by_subscription.metadata = {
- "url": "/subscriptions/{subscriptionId}/providers/Microsoft.ManagedIdentity/userAssignedIdentities"
- }
-
@distributed_trace
def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.Identity"]:
"""Lists all the userAssignedIdentities available under the specified ResourceGroup.
@@ -330,7 +322,6 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
:param resource_group_name: The name of the Resource Group to which the identity belongs.
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 Identity or the result of cls(response)
:rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.msi.v2023_01_31.models.Identity]
:raises ~azure.core.exceptions.HttpResponseError:
@@ -338,10 +329,10 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.UserAssignedIdentitiesListResult] = kwargs.pop("cls", None)
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -352,16 +343,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
@@ -372,14 +361,13 @@ def prepare_request(next_link=None):
for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
}
)
- _next_request_params["api-version"] = self._config.api_version
- request = HttpRequest(
+ _next_request_params["api-version"] = self._api_version
+ _request = HttpRequest(
"GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
- request.method = "GET"
- return request
+ _request.url = self._client.format_url(_request.url)
+ _request.method = "GET"
+ return _request
def extract_data(pipeline_response):
deserialized = self._deserialize("UserAssignedIdentitiesListResult", pipeline_response)
@@ -389,10 +377,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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -404,10 +393,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.ManagedIdentity/userAssignedIdentities"
- }
-
@overload
def create_or_update(
self,
@@ -430,7 +415,6 @@ def create_or_update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -441,7 +425,7 @@ def create_or_update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -454,11 +438,10 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -466,7 +449,11 @@ def create_or_update(
@distributed_trace
def create_or_update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.Identity, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.Identity, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Create or update an identity in the specified subscription and resource group.
@@ -476,17 +463,13 @@ def create_or_update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to create or update the identity. Is either a Identity type or a
- IO type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.Identity or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.Identity or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -497,19 +480,19 @@ def create_or_update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "Identity")
- request = build_create_or_update_request(
+ _request = build_create_or_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -517,15 +500,14 @@ def create_or_update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.create_or_update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -534,21 +516,13 @@ def create_or_update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- if response.status_code == 200:
- deserialized = self._deserialize("Identity", pipeline_response)
-
- if response.status_code == 201:
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
return cls(pipeline_response, deserialized, {}) # type: ignore
return deserialized # type: ignore
- create_or_update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
-
@overload
def update(
self,
@@ -571,7 +545,6 @@ def update(
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -582,7 +555,7 @@ def update(
self,
resource_group_name: str,
resource_name: str,
- parameters: IO,
+ parameters: IO[bytes],
*,
content_type: str = "application/json",
**kwargs: Any
@@ -595,11 +568,10 @@ def update(
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
:param parameters: Parameters to update the identity. 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: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
@@ -607,7 +579,11 @@ def update(
@distributed_trace
def update(
- self, resource_group_name: str, resource_name: str, parameters: Union[_models.IdentityUpdate, IO], **kwargs: Any
+ self,
+ resource_group_name: str,
+ resource_name: str,
+ parameters: Union[_models.IdentityUpdate, IO[bytes]],
+ **kwargs: Any
) -> _models.Identity:
"""Update an identity in the specified subscription and resource group.
@@ -616,18 +592,14 @@ def update(
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a IO
- type. Required.
- :type parameters: ~azure.mgmt.msi.v2023_01_31.models.IdentityUpdate or IO
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
- :keyword callable cls: A custom type or function that will be passed the direct response
+ :param parameters: Parameters to update the identity. Is either a IdentityUpdate type or a
+ IO[bytes] type. Required.
+ :type parameters: ~azure.mgmt.msi.v2023_01_31.models.IdentityUpdate or IO[bytes]
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -638,19 +610,19 @@ def update(
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
content_type = content_type or "application/json"
_json = None
_content = None
- if isinstance(parameters, (IO, bytes)):
+ if isinstance(parameters, (IOBase, bytes)):
_content = parameters
else:
_json = self._serialize.body(parameters, "IdentityUpdate")
- request = build_update_request(
+ _request = build_update_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
@@ -658,15 +630,14 @@ def update(
content_type=content_type,
json=_json,
content=_content,
- template_url=self.update.metadata["url"],
headers=_headers,
params=_params,
)
- request = _convert_request(request)
- request.url = self._client.format_url(request.url)
+ _request.url = self._client.format_url(_request.url)
+ _stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -675,16 +646,12 @@ def update(
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", pipeline_response.http_response)
if cls:
- return cls(pipeline_response, deserialized, {})
-
- return deserialized
+ return cls(pipeline_response, deserialized, {}) # type: ignore
- update.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.Identity:
@@ -695,12 +662,11 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: Identity or the result of cls(response)
:rtype: ~azure.mgmt.msi.v2023_01_31.models.Identity
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -711,23 +677,22 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[_models.Identity] = kwargs.pop("cls", None)
- request = build_get_request(
+ _request = build_get_request(
resource_group_name=resource_group_name,
resource_name=resource_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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -736,16 +701,12 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m
map_error(status_code=response.status_code, response=response, error_map=error_map)
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
- deserialized = self._deserialize("Identity", pipeline_response)
+ deserialized = self._deserialize("Identity", 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.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return deserialized # type: ignore
@distributed_trace
def delete( # pylint: disable=inconsistent-return-statements
@@ -758,12 +719,11 @@ def delete( # pylint: disable=inconsistent-return-statements
:type resource_group_name: str
:param resource_name: The name of the identity resource. Required.
:type resource_name: str
- :keyword callable cls: A custom type or function that will be passed the direct response
:return: None or the result of cls(response)
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -774,23 +734,22 @@ def delete( # pylint: disable=inconsistent-return-statements
_headers = kwargs.pop("headers", {}) or {}
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- api_version: Literal["2023-01-31"] = kwargs.pop("api_version", _params.pop("api-version", "2023-01-31"))
+ api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-31"))
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_delete_request(
+ _request = build_delete_request(
resource_group_name=resource_group_name,
resource_name=resource_name,
subscription_id=self._config.subscription_id,
api_version=api_version,
- template_url=self.delete.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=False, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
@@ -800,8 +759,4 @@ def delete( # pylint: disable=inconsistent-return-statements
raise HttpResponseError(response=response, error_format=ARMErrorFormat)
if cls:
- return cls(pipeline_response, None, {})
-
- delete.metadata = {
- "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}"
- }
+ return cls(pipeline_response, None, {}) # type: ignore
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_create.py b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_create.py
index d29987c1e946..7030a2d1ade7 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_create.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_create.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_delete.py b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_delete.py
index 6d58d618c929..f334b1d09bc2 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_delete.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_delete.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
@@ -29,12 +30,11 @@ def main():
subscription_id="c267c0e7-0a73-4789-9e17-d26aeb0904e5",
)
- response = client.federated_identity_credentials.delete(
+ client.federated_identity_credentials.delete(
resource_group_name="rgName",
resource_name="resourceName",
federated_identity_credential_resource_name="ficResourceName",
)
- print(response)
# x-ms-original-file: specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2023-01-31/examples/FederatedIdentityCredentialDelete.json
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_get.py b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_get.py
index 6caae283a4ef..2e46ceed6d59 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_get.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_list.py b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_list.py
index 981cdad844ce..ffc0e2471e9e 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_list.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/federated_identity_credential_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_create.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_create.py
index 2ef50936b846..554dbc9b7698 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_create.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_create.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_delete.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_delete.py
index 443714cec665..e8ac54cfece5 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_delete.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_delete.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
@@ -29,11 +30,10 @@ def main():
subscription_id="subid",
)
- response = client.user_assigned_identities.delete(
+ client.user_assigned_identities.delete(
resource_group_name="rgName",
resource_name="resourceName",
)
- print(response)
# x-ms-original-file: specification/msi/resource-manager/Microsoft.ManagedIdentity/stable/2023-01-31/examples/IdentityDelete.json
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_get.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_get.py
index c84cf6c87cd9..4f6f5fc775dc 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_get.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_resource_group.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_resource_group.py
index 6c5a965d1479..7f52133c9d12 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_resource_group.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_resource_group.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_subscription.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_subscription.py
index f63c85b91cf1..026fbf2f3736 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_subscription.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_list_by_subscription.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/identity_update.py b/sdk/resources/azure-mgmt-msi/generated_samples/identity_update.py
index 19f4fd2ab2cc..1c8d6eb64a8f 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/identity_update.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/identity_update.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/msi_operations_list.py b/sdk/resources/azure-mgmt-msi/generated_samples/msi_operations_list.py
index 89015f5e744a..d355e116bf4c 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/msi_operations_list.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/msi_operations_list.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_samples/system_assigned_identity_get.py b/sdk/resources/azure-mgmt-msi/generated_samples/system_assigned_identity_get.py
index 172180ab2abc..435718f38613 100644
--- a/sdk/resources/azure-mgmt-msi/generated_samples/system_assigned_identity_get.py
+++ b/sdk/resources/azure-mgmt-msi/generated_samples/system_assigned_identity_get.py
@@ -7,6 +7,7 @@
# --------------------------------------------------------------------------
from azure.identity import DefaultAzureCredential
+
from azure.mgmt.msi import ManagedServiceIdentityClient
"""
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/conftest.py b/sdk/resources/azure-mgmt-msi/generated_tests/conftest.py
new file mode 100644
index 000000000000..ee793b8ffac3
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/conftest.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import 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):
+ managedserviceidentity_subscription_id = os.environ.get(
+ "AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000"
+ )
+ managedserviceidentity_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000")
+ managedserviceidentity_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000")
+ managedserviceidentity_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(
+ regex=managedserviceidentity_subscription_id, value="00000000-0000-0000-0000-000000000000"
+ )
+ add_general_regex_sanitizer(regex=managedserviceidentity_tenant_id, value="00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(regex=managedserviceidentity_client_id, value="00000000-0000-0000-0000-000000000000")
+ add_general_regex_sanitizer(
+ regex=managedserviceidentity_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/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations.py
new file mode 100644
index 000000000000..c75cf38dc1ba
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations.py
@@ -0,0 +1,86 @@
+# 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.msi import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityFederatedIdentityCredentialsOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_federated_identity_credentials_list(self, resource_group):
+ response = self.client.federated_identity_credentials.list(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_federated_identity_credentials_create_or_update(self, resource_group):
+ response = self.client.federated_identity_credentials.create_or_update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ parameters={
+ "audiences": ["str"],
+ "id": "str",
+ "issuer": "str",
+ "name": "str",
+ "subject": "str",
+ "systemData": {
+ "createdAt": "2020-02-20 00:00:00",
+ "createdBy": "str",
+ "createdByType": "str",
+ "lastModifiedAt": "2020-02-20 00:00:00",
+ "lastModifiedBy": "str",
+ "lastModifiedByType": "str",
+ },
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_federated_identity_credentials_get(self, resource_group):
+ response = self.client.federated_identity_credentials.get(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_federated_identity_credentials_delete(self, resource_group):
+ response = self.client.federated_identity_credentials.delete(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations_async.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations_async.py
new file mode 100644
index 000000000000..3bc5c871f3ca
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_federated_identity_credentials_operations_async.py
@@ -0,0 +1,87 @@
+# 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.msi.aio import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityFederatedIdentityCredentialsOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_federated_identity_credentials_list(self, resource_group):
+ response = self.client.federated_identity_credentials.list(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+ 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_federated_identity_credentials_create_or_update(self, resource_group):
+ response = await self.client.federated_identity_credentials.create_or_update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ parameters={
+ "audiences": ["str"],
+ "id": "str",
+ "issuer": "str",
+ "name": "str",
+ "subject": "str",
+ "systemData": {
+ "createdAt": "2020-02-20 00:00:00",
+ "createdBy": "str",
+ "createdByType": "str",
+ "lastModifiedAt": "2020-02-20 00:00:00",
+ "lastModifiedBy": "str",
+ "lastModifiedByType": "str",
+ },
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_federated_identity_credentials_get(self, resource_group):
+ response = await self.client.federated_identity_credentials.get(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_federated_identity_credentials_delete(self, resource_group):
+ response = await self.client.federated_identity_credentials.delete(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ federated_identity_credential_resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_operations.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_operations.py
new file mode 100644
index 000000000000..73f3d2ee91b2
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_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.msi import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_operations_list(self, resource_group):
+ response = self.client.operations.list(
+ api_version="2023-01-31",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_operations_async.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_operations_async.py
new file mode 100644
index 000000000000..c4284e6a8392
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_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.msi.aio import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient, 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-31",
+ )
+ result = [r async for r in response]
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations.py
new file mode 100644
index 000000000000..23ec0f33f91b
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations.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.msi import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentitySystemAssignedIdentitiesOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_system_assigned_identities_get_by_scope(self, resource_group):
+ response = self.client.system_assigned_identities.get_by_scope(
+ scope="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations_async.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations_async.py
new file mode 100644
index 000000000000..69bdbc9a8b75
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_system_assigned_identities_operations_async.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.msi.aio import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentitySystemAssignedIdentitiesOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_system_assigned_identities_get_by_scope(self, resource_group):
+ response = await self.client.system_assigned_identities.get_by_scope(
+ scope="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations.py
new file mode 100644
index 000000000000..469d24e01d74
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations.py
@@ -0,0 +1,124 @@
+# 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.msi import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityUserAssignedIdentitiesOperations(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_list_by_subscription(self, resource_group):
+ response = self.client.user_assigned_identities.list_by_subscription(
+ api_version="2023-01-31",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_list_by_resource_group(self, resource_group):
+ response = self.client.user_assigned_identities.list_by_resource_group(
+ resource_group_name=resource_group.name,
+ api_version="2023-01-31",
+ )
+ result = [r for r in response]
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_create_or_update(self, resource_group):
+ response = self.client.user_assigned_identities.create_or_update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ parameters={
+ "location": "str",
+ "clientId": "str",
+ "id": "str",
+ "name": "str",
+ "principalId": "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"},
+ "tenantId": "str",
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_update(self, resource_group):
+ response = self.client.user_assigned_identities.update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ parameters={
+ "clientId": "str",
+ "id": "str",
+ "location": "str",
+ "name": "str",
+ "principalId": "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"},
+ "tenantId": "str",
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_get(self, resource_group):
+ response = self.client.user_assigned_identities.get(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy
+ def test_user_assigned_identities_delete(self, resource_group):
+ response = self.client.user_assigned_identities.delete(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations_async.py b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations_async.py
new file mode 100644
index 000000000000..889667740f71
--- /dev/null
+++ b/sdk/resources/azure-mgmt-msi/generated_tests/test_managed_service_identity_user_assigned_identities_operations_async.py
@@ -0,0 +1,125 @@
+# 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.msi.aio import ManagedServiceIdentityClient
+
+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 TestManagedServiceIdentityUserAssignedIdentitiesOperationsAsync(AzureMgmtRecordedTestCase):
+ def setup_method(self, method):
+ self.client = self.create_mgmt_client(ManagedServiceIdentityClient, is_async=True)
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_user_assigned_identities_list_by_subscription(self, resource_group):
+ response = self.client.user_assigned_identities.list_by_subscription(
+ api_version="2023-01-31",
+ )
+ 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_user_assigned_identities_list_by_resource_group(self, resource_group):
+ response = self.client.user_assigned_identities.list_by_resource_group(
+ resource_group_name=resource_group.name,
+ api_version="2023-01-31",
+ )
+ 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_user_assigned_identities_create_or_update(self, resource_group):
+ response = await self.client.user_assigned_identities.create_or_update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ parameters={
+ "location": "str",
+ "clientId": "str",
+ "id": "str",
+ "name": "str",
+ "principalId": "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"},
+ "tenantId": "str",
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_user_assigned_identities_update(self, resource_group):
+ response = await self.client.user_assigned_identities.update(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ parameters={
+ "clientId": "str",
+ "id": "str",
+ "location": "str",
+ "name": "str",
+ "principalId": "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"},
+ "tenantId": "str",
+ "type": "str",
+ },
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_user_assigned_identities_get(self, resource_group):
+ response = await self.client.user_assigned_identities.get(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
+
+ @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+ @recorded_by_proxy_async
+ async def test_user_assigned_identities_delete(self, resource_group):
+ response = await self.client.user_assigned_identities.delete(
+ resource_group_name=resource_group.name,
+ resource_name="str",
+ api_version="2023-01-31",
+ )
+
+ # please add some check logic here by yourself
+ # ...
diff --git a/sdk/resources/azure-mgmt-msi/setup.py b/sdk/resources/azure-mgmt-msi/setup.py
index 39a31243d5ff..e2193f525ee4 100644
--- a/sdk/resources/azure-mgmt-msi/setup.py
+++ b/sdk/resources/azure-mgmt-msi/setup.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python
-#-------------------------------------------------------------------------
+# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
-#--------------------------------------------------------------------------
+# --------------------------------------------------------------------------
import re
import os.path
@@ -16,64 +16,68 @@
PACKAGE_PPRINT_NAME = "Msi Management"
# a-b-c => a/b/c
-package_folder_path = PACKAGE_NAME.replace('-', '/')
+package_folder_path = PACKAGE_NAME.replace("-", "/")
# a-b-c => a.b.c
-namespace_name = PACKAGE_NAME.replace('-', '.')
+namespace_name = PACKAGE_NAME.replace("-", ".")
# Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, 'version.py')
- if os.path.exists(os.path.join(package_folder_path, 'version.py'))
- else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
- version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
- fd.read(), re.MULTILINE).group(1)
+with open(
+ os.path.join(package_folder_path, "version.py")
+ if os.path.exists(os.path.join(package_folder_path, "version.py"))
+ else os.path.join(package_folder_path, "_version.py"),
+ "r",
+) as fd:
+ version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
if not version:
- raise RuntimeError('Cannot find version information')
+ raise RuntimeError("Cannot find version information")
-with open('README.md', encoding='utf-8') as f:
+with open("README.md", encoding="utf-8") as f:
readme = f.read()
-with open('CHANGELOG.md', encoding='utf-8') as f:
+with open("CHANGELOG.md", encoding="utf-8") as f:
changelog = f.read()
setup(
name=PACKAGE_NAME,
version=version,
- description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
- long_description=readme + '\n\n' + changelog,
- long_description_content_type='text/markdown',
- license='MIT License',
- author='Microsoft Corporation',
- author_email='azpysdkhelp@microsoft.com',
- url='https://github.com/Azure/azure-sdk-for-python',
+ description="Microsoft Azure {} Client Library for Python".format(PACKAGE_PPRINT_NAME),
+ long_description=readme + "\n\n" + changelog,
+ long_description_content_type="text/markdown",
+ license="MIT License",
+ author="Microsoft Corporation",
+ author_email="azpysdkhelp@microsoft.com",
+ url="https://github.com/Azure/azure-sdk-for-python",
keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product
classifiers=[
- 'Development Status :: 4 - Beta',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3 :: Only',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.7',
- 'Programming Language :: Python :: 3.8',
- 'Programming Language :: Python :: 3.9',
- 'Programming Language :: Python :: 3.10',
- 'Programming Language :: Python :: 3.11',
- 'License :: OSI Approved :: MIT License',
+ "Development Status :: 4 - Beta",
+ "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",
+ "Programming Language :: Python :: 3.12",
+ "License :: OSI Approved :: MIT License",
],
zip_safe=False,
- packages=find_packages(exclude=[
- 'tests',
- # Exclude packages that will be covered by PEP420 or nspkg
- 'azure',
- 'azure.mgmt',
- ]),
+ packages=find_packages(
+ exclude=[
+ "tests",
+ # Exclude packages that will be covered by PEP420 or nspkg
+ "azure",
+ "azure.mgmt",
+ ]
+ ),
include_package_data=True,
package_data={
- 'pytyped': ['py.typed'],
+ "pytyped": ["py.typed"],
},
install_requires=[
- "msrest>=0.7.1",
- "azure-common~=1.1",
- "azure-mgmt-core>=1.3.2,<2.0.0",
- "typing-extensions>=4.3.0; python_version<'3.8.0'",
+ "isodate>=0.6.1",
+ "typing-extensions>=4.6.0",
+ "azure-common>=1.1",
+ "azure-mgmt-core>=1.3.2",
],
- python_requires=">=3.7"
+ python_requires=">=3.8",
)