diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/_meta.json b/sdk/managementgroups/azure-mgmt-managementgroups/_meta.json index 2057fb195769..768d33bcda16 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/_meta.json +++ b/sdk/managementgroups/azure-mgmt-managementgroups/_meta.json @@ -1,11 +1,11 @@ { - "commit": "4522e1d3fb6dcb81bc63e3414d11dd7eaf08264b", + "commit": "37e3f2431502f3486d1da424f7e991dc877c5bb2", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest": "3.9.2", + "autorest": "3.9.6", "use": [ - "@autorest/python@6.2.1", - "@autorest/modelerfour@4.24.3" + "@autorest/python@6.6.0", + "@autorest/modelerfour@4.26.2" ], - "autorest_command": "autorest specification/managementgroups/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.2.1 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/managementgroups/resource-manager/readme.md --generate-sample=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.6.0 --use=@autorest/modelerfour@4.26.2 --version=3.9.6 --version-tolerant=False", "readme": "specification/managementgroups/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/__init__.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/__init__.py index db986cb4f5e1..8e9886cca32f 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/__init__.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/__init__.py @@ -13,7 +13,7 @@ try: from ._patch import __all__ as _patch_all - from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import + from ._patch import * # pylint: disable=unused-wildcard-import except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_configuration.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_configuration.py index 4a024e8a9b57..5c4e3d9b52c4 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_configuration.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_configuration.py @@ -6,7 +6,6 @@ # 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 @@ -15,11 +14,6 @@ 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 @@ -33,14 +27,14 @@ class ManagementGroupsAPIConfiguration(Configuration): # pylint: disable=too-ma :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential - :keyword api_version: Api Version. Default value is "2021-04-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None: super(ManagementGroupsAPIConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop("api_version", "2021-04-01") # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", "2023-04-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -51,10 +45,7 @@ def __init__(self, credential: "TokenCredential", **kwargs: Any) -> None: kwargs.setdefault("sdk_moniker", "mgmt-managementgroups/{}".format(VERSION)) self._configure(**kwargs) - def _configure( - self, **kwargs # type: Any - ): - # type: (...) -> None + def _configure(self, **kwargs: Any) -> None: self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_management_groups_api.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_management_groups_api.py index 8fd919b71a46..6c6758cc94cc 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_management_groups_api.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_management_groups_api.py @@ -12,7 +12,7 @@ from azure.core.rest import HttpRequest, HttpResponse from azure.mgmt.core import ARMPipelineClient -from . import models +from . import models as _models from ._configuration import ManagementGroupsAPIConfiguration from ._serialization import Deserializer, Serializer from .operations import ( @@ -49,7 +49,7 @@ class ManagementGroupsAPI(ManagementGroupsAPIOperationsMixin): # pylint: disabl :type credential: ~azure.core.credentials.TokenCredential :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2021-04-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -60,9 +60,9 @@ def __init__( self, credential: "TokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: self._config = ManagementGroupsAPIConfiguration(credential=credential, **kwargs) - self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) - client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + 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 @@ -100,15 +100,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: request_copy.url = self._client.format_url(request_copy.url) return self._client.send_request(request_copy, **kwargs) - def close(self): - # type: () -> None + def close(self) -> None: self._client.close() - def __enter__(self): - # type: () -> ManagementGroupsAPI + def __enter__(self) -> "ManagementGroupsAPI": self._client.__enter__() return self - def __exit__(self, *exc_details): - # type: (Any) -> None + def __exit__(self, *exc_details: Any) -> None: self._client.__exit__(*exc_details) diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_serialization.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_serialization.py index 7c1dedb5133d..842ae727fbbc 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_serialization.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_serialization.py @@ -25,6 +25,7 @@ # -------------------------------------------------------------------------- # pylint: skip-file +# pyright: reportUnnecessaryTypeIgnoreComment=false from base64 import b64decode, b64encode import calendar @@ -37,23 +38,38 @@ import re import sys import codecs +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + TypeVar, + MutableMapping, + Type, + List, + Mapping, +) try: from urllib import quote # type: ignore except ImportError: - from urllib.parse import quote # type: ignore + from urllib.parse import quote import xml.etree.ElementTree as ET -import isodate - -from typing import Dict, Any, cast, TYPE_CHECKING +import isodate # type: ignore from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback +from azure.core.serialization import NULL as AzureCoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") -if TYPE_CHECKING: - from typing import Optional, Union, AnyStr, IO, Mapping +ModelType = TypeVar("ModelType", bound="Model") +JSON = MutableMapping[str, Any] class RawDeserializer: @@ -65,8 +81,7 @@ class RawDeserializer: CONTEXT_NAME = "deserialized_data" @classmethod - def deserialize_from_text(cls, data, content_type=None): - # type: (Optional[Union[AnyStr, IO]], Optional[str]) -> Any + def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: """Decode data according to content-type. Accept a stream of data as well, but will be load at once in memory for now. @@ -132,8 +147,7 @@ def _json_attemp(data): raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) @classmethod - def deserialize_from_http_generics(cls, body_bytes, headers): - # type: (Optional[Union[AnyStr, IO]], Mapping) -> Any + def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: """Deserialize from HTTP response. Use bytes and headers to NOT use any requests/aiohttp or whatever @@ -160,8 +174,8 @@ def deserialize_from_http_generics(cls, body_bytes, headers): basestring # type: ignore unicode_str = unicode # type: ignore except NameError: - basestring = str # type: ignore - unicode_str = str # type: ignore + basestring = str + unicode_str = str _LOGGER = logging.getLogger(__name__) @@ -188,7 +202,7 @@ def dst(self, dt): try: - from datetime import timezone as _FixedOffset + from datetime import timezone as _FixedOffset # type: ignore except ImportError: # Python 2.7 class _FixedOffset(datetime.tzinfo): # type: ignore @@ -219,7 +233,7 @@ def __getinitargs__(self): try: from datetime import timezone - TZ_UTC = timezone.utc # type: ignore + TZ_UTC = timezone.utc except ImportError: TZ_UTC = UTC() # type: ignore @@ -276,12 +290,12 @@ class Model(object): serialization and deserialization. """ - _subtype_map = {} # type: Dict[str, Dict[str, Any]] - _attribute_map = {} # type: Dict[str, Dict[str, Any]] - _validation = {} # type: Dict[str, Dict[str, Any]] + _subtype_map: Dict[str, Dict[str, Any]] = {} + _attribute_map: Dict[str, Dict[str, Any]] = {} + _validation: Dict[str, Dict[str, Any]] = {} - def __init__(self, **kwargs): - self.additional_properties = {} + def __init__(self, **kwargs: Any) -> None: + self.additional_properties: Dict[str, Any] = {} for k in kwargs: 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__) @@ -290,27 +304,27 @@ def __init__(self, **kwargs): else: setattr(self, k, kwargs[k]) - def __eq__(self, other): + def __eq__(self, other: Any) -> bool: """Compare objects by comparing all attributes.""" if isinstance(other, self.__class__): return self.__dict__ == other.__dict__ return False - def __ne__(self, other): + def __ne__(self, other: Any) -> bool: """Compare objects by comparing all attributes.""" return not self.__eq__(other) - def __str__(self): + def __str__(self) -> str: return str(self.__dict__) @classmethod - def enable_additional_properties_sending(cls): + def enable_additional_properties_sending(cls) -> None: cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} @classmethod - def is_xml_model(cls): + def is_xml_model(cls) -> bool: try: - cls._xml_map + cls._xml_map # type: ignore except AttributeError: return False return True @@ -319,13 +333,13 @@ def is_xml_model(cls): def _create_xml_node(cls): """Create XML node.""" try: - xml_map = cls._xml_map + xml_map = cls._xml_map # type: ignore except AttributeError: xml_map = {} 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=False, **kwargs): + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: """Return the JSON that would be sent to azure from this model. This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. @@ -339,8 +353,13 @@ def serialize(self, keep_readonly=False, **kwargs): serializer = Serializer(self._infer_class_models()) return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) - def as_dict(self, keep_readonly=True, key_transformer=attribute_transformer, **kwargs): - """Return a dict that can be JSONify using json.dump. + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. Advanced usage might optionally use a callback as parameter: @@ -387,7 +406,7 @@ def _infer_class_models(cls): return client_models @classmethod - def deserialize(cls, data, content_type=None): + def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = None) -> ModelType: """Parse a str using the RestAPI syntax and return a model. :param str data: A str using RestAPI structure. JSON by default. @@ -399,7 +418,12 @@ def deserialize(cls, data, content_type=None): return deserializer(cls.__name__, data, content_type=content_type) @classmethod - def from_dict(cls, data, key_extractors=None, content_type=None): + def from_dict( + cls: Type[ModelType], + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> ModelType: """Parse a dict using given key extractor return a model. By default consider key @@ -412,8 +436,8 @@ def from_dict(cls, data, key_extractors=None, content_type=None): :raises: DeserializationError if something went wrong """ deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( - [ + deserializer.key_extractors = ( # type: ignore + [ # type: ignore attribute_key_case_insensitive_extractor, rest_key_case_insensitive_extractor, last_rest_key_case_insensitive_extractor, @@ -453,7 +477,7 @@ def _classify(cls, response, objects): return cls flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) try: - return objects[flatten_mapping_type[subtype_value]] + return objects[flatten_mapping_type[subtype_value]] # type: ignore except KeyError: _LOGGER.warning( "Subtype value %s has no mapping, use base class %s.", @@ -521,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -537,7 +561,7 @@ def __init__(self, classes=None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -605,14 +629,14 @@ 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) - serialized.set(xml_name, new_attr) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): - serialized.text = new_attr + serialized.text = new_attr # type: ignore continue if isinstance(new_attr, list): - serialized.extend(new_attr) + 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 "name" not in getattr(orig_attr, "_xml_map", {}): @@ -621,23 +645,22 @@ def _serialize(self, target_obj, data_type=None, **kwargs): new_attr.tag = "}".join([splitted_tag[0], xml_name]) else: new_attr.tag = xml_name - serialized.append(new_attr) + serialized.append(new_attr) # type: ignore 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) - serialized.append(local_node) + serialized.append(local_node) # type: ignore else: # JSON - for k in reversed(keys): - unflattened = {k: new_attr} - new_attr = unflattened + for k in reversed(keys): # type: ignore + new_attr = {k: new_attr} _new_attr = new_attr _serialized = serialized - for k in keys: + for k in keys: # type: ignore if k not in _serialized: - _serialized.update(_new_attr) - _new_attr = _new_attr[k] + _serialized.update(_new_attr) # type: ignore + _new_attr = _new_attr[k] # type: ignore _serialized = _serialized[k] except ValueError: continue @@ -659,8 +682,8 @@ def body(self, data, data_type, **kwargs): """ # Just in case this is a dict - internal_data_type = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type, None) + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) try: is_xml_model_serialization = kwargs["is_xml"] except KeyError: @@ -675,7 +698,7 @@ def body(self, data, data_type, **kwargs): # We're not able to deal with additional properties for now. deserializer.additional_properties_detection = False if is_xml_model_serialization: - deserializer.key_extractors = [ + deserializer.key_extractors = [ # type: ignore attribute_key_case_insensitive_extractor, ] else: @@ -780,6 +803,8 @@ def serialize_data(self, data, data_type, **kwargs): raise ValueError("No value for given attribute") try: + if data is AzureCoreNull: + return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) @@ -843,7 +868,7 @@ def serialize_unicode(cls, data): pass try: - if isinstance(data, unicode): + if isinstance(data, unicode): # type: ignore # Don't change it, JSON and XML ElementTree are totally able # to serialize correctly u'' strings return data @@ -1001,10 +1026,10 @@ def serialize_enum(attr, enum_obj=None): except AttributeError: result = attr try: - enum_obj(result) + enum_obj(result) # type: ignore return result except ValueError: - for enum_value in enum_obj: + 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}" @@ -1164,7 +1189,8 @@ def rest_key_extractor(attr, attr_desc, data): working_data = data while "." in key: - dict_keys = _FLATTEN.split(key) + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1245,7 +1271,7 @@ 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 @@ -1269,7 +1295,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): @@ -1335,7 +1361,7 @@ class Deserializer(object): 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}]?") - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1355,7 +1381,7 @@ def __init__(self, classes=None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = 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 @@ -1416,7 +1442,7 @@ def _deserialize(self, target_obj, data): if data is None: return data try: - attributes = response._attribute_map + attributes = response._attribute_map # type: ignore d_attrs = {} for attr, attr_desc in attributes.items(): # Check empty string. If it's not empty, someone has a real "additionalProperties"... @@ -1444,7 +1470,7 @@ def _deserialize(self, target_obj, data): value = self.deserialize_data(raw_value, attr_desc["type"]) d_attrs[attr] = value except (AttributeError, TypeError, KeyError) as err: - msg = "Unable to deserialize to object: " + class_name + 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) @@ -1474,7 +1500,7 @@ def _classify_target(self, target, data): Once classification has been determined, initialize object. :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. """ if target is None: return None, None @@ -1489,7 +1515,7 @@ def _classify_target(self, target, data): target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify - return target, target.__class__.__name__ + return target, target.__class__.__name__ # type: ignore def failsafe_deserialize(self, target_obj, data, content_type=None): """Ignores any errors encountered in deserialization, @@ -1499,7 +1525,7 @@ def failsafe_deserialize(self, target_obj, data, content_type=None): a deserialization error. :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. :param str content_type: Swagger "produces" if available. """ try: @@ -1543,7 +1569,7 @@ def _unpack_content(raw_data, content_type=None): return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): - return RawDeserializer.deserialize_from_text(raw_data, content_type) + return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore return raw_data def _instantiate_model(self, response, attrs, additional_properties=None): @@ -1565,7 +1591,7 @@ def _instantiate_model(self, response, attrs, additional_properties=None): response_obj.additional_properties = additional_properties return response_obj except TypeError as err: - msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore raise DeserializationError(msg + str(err)) else: try: @@ -1747,7 +1773,7 @@ def deserialize_unicode(data): # Consider this is real string try: - if isinstance(data, unicode): + if isinstance(data, unicode): # type: ignore return data except NameError: return str(data) @@ -1798,7 +1824,7 @@ def deserialize_bytearray(attr): """ if isinstance(attr, ET.Element): attr = attr.text - return bytearray(b64decode(attr)) + return bytearray(b64decode(attr)) # type: ignore @staticmethod def deserialize_base64(attr): @@ -1810,8 +1836,8 @@ def deserialize_base64(attr): """ if isinstance(attr, ET.Element): attr = attr.text - padding = "=" * (3 - (len(attr) + 3) % 4) - attr = attr + padding + padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore + attr = attr + padding # type: ignore encoded = attr.replace("-", "+").replace("_", "/") return b64decode(encoded) @@ -1826,7 +1852,7 @@ def deserialize_decimal(attr): if isinstance(attr, ET.Element): attr = attr.text try: - return decimal.Decimal(attr) + return decimal.Decimal(attr) # type: ignore except decimal.DecimalException as err: msg = "Invalid decimal {}".format(attr) raise_with_traceback(DeserializationError, msg, err) @@ -1841,7 +1867,7 @@ def deserialize_long(attr): """ if isinstance(attr, ET.Element): attr = attr.text - return _long_type(attr) + return _long_type(attr) # type: ignore @staticmethod def deserialize_duration(attr): @@ -1871,7 +1897,7 @@ def deserialize_date(attr): """ if isinstance(attr, ET.Element): attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): + 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) @@ -1886,7 +1912,7 @@ def deserialize_time(attr): """ if isinstance(attr, ET.Element): attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): + if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore raise DeserializationError("Date must have only digits and -. Received: %s" % attr) return isodate.parse_time(attr) @@ -1901,7 +1927,7 @@ def deserialize_rfc(attr): if isinstance(attr, ET.Element): attr = attr.text try: - parsed_date = email.utils.parsedate_tz(attr) + parsed_date = email.utils.parsedate_tz(attr) # type: ignore date_obj = datetime.datetime( *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) ) @@ -1924,7 +1950,7 @@ def deserialize_iso(attr): if isinstance(attr, ET.Element): attr = attr.text try: - attr = attr.upper() + attr = attr.upper() # type: ignore match = Deserializer.valid_date.match(attr) if not match: raise ValueError("Invalid datetime string: " + attr) @@ -1960,7 +1986,7 @@ def deserialize_unix(attr): :raises: DeserializationError if format invalid """ if isinstance(attr, ET.Element): - attr = int(attr.text) + attr = int(attr.text) # type: ignore try: date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) except ValueError as err: diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_vendor.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_vendor.py index 4ea910bfc12f..82ed14070e36 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_vendor.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_vendor.py @@ -6,7 +6,7 @@ # -------------------------------------------------------------------------- from abc import ABC -from typing import TYPE_CHECKING +from typing import List, TYPE_CHECKING, cast from azure.core.pipeline.transport import HttpRequest @@ -33,7 +33,8 @@ def _format_url_section(template, **kwargs): try: return template.format(**kwargs) except KeyError as key: - formatted_components = template.split("/") + # 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/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_version.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_version.py index 653b73a4a199..e5754a47ce68 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_version.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.0b1" +VERSION = "1.0.0b1" diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/__init__.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/__init__.py index e87251407abe..311e06c2a36d 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/__init__.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/__init__.py @@ -10,7 +10,7 @@ try: from ._patch import __all__ as _patch_all - from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import + from ._patch import * # pylint: disable=unused-wildcard-import except ImportError: _patch_all = [] from ._patch import patch_sdk as _patch_sdk diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_configuration.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_configuration.py index d63c043d8829..c96aa62d3e26 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_configuration.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_configuration.py @@ -6,7 +6,6 @@ # 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 @@ -15,11 +14,6 @@ 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 @@ -33,14 +27,14 @@ class ManagementGroupsAPIConfiguration(Configuration): # pylint: disable=too-ma :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential - :keyword api_version: Api Version. Default value is "2021-04-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ def __init__(self, credential: "AsyncTokenCredential", **kwargs: Any) -> None: super(ManagementGroupsAPIConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop("api_version", "2021-04-01") # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", "2023-04-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_management_groups_api.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_management_groups_api.py index ae895d186241..fc922a211942 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_management_groups_api.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/_management_groups_api.py @@ -12,7 +12,7 @@ from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient -from .. import models +from .. import models as _models from .._serialization import Deserializer, Serializer from ._configuration import ManagementGroupsAPIConfiguration from .operations import ( @@ -51,7 +51,7 @@ class ManagementGroupsAPI(ManagementGroupsAPIOperationsMixin): # pylint: disabl :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2021-04-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no @@ -62,9 +62,9 @@ def __init__( self, credential: "AsyncTokenCredential", base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: self._config = ManagementGroupsAPIConfiguration(credential=credential, **kwargs) - self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) - client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + 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 @@ -109,5 +109,5 @@ async def __aenter__(self) -> "ManagementGroupsAPI": await self._client.__aenter__() return self - async def __aexit__(self, *exc_details) -> None: + async def __aexit__(self, *exc_details: Any) -> None: await self._client.__aexit__(*exc_details) diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/__init__.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/__init__.py index 2d20b499bdbe..17da0c8d00e0 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/__init__.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/__init__.py @@ -14,7 +14,7 @@ from ._entities_operations import EntitiesOperations from ._patch import __all__ as _patch_all -from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import * # pylint: disable=unused-wildcard-import from ._patch import patch_sdk as _patch_sdk __all__ = [ diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_entities_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_entities_operations.py index cba69970343f..d3cc7caa33ee 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_entities_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_entities_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union import urllib.parse @@ -31,10 +30,6 @@ from ...operations._entities_operations import build_list_request from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -133,10 +128,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.EntityListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.EntityListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -165,7 +158,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -181,7 +174,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -189,14 +182,15 @@ async def extract_data(pipeline_response): deserialized = self._deserialize("EntityListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -209,4 +203,4 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/getEntities"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/getEntities"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_hierarchy_settings_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_hierarchy_settings_operations.py index 25161f2aed6a..a042f40e423e 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_hierarchy_settings_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_hierarchy_settings_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ ) from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -85,10 +81,8 @@ async def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsL _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettingsList] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.HierarchySettingsList] = kwargs.pop("cls", None) request = build_list_request( group_id=group_id, @@ -98,10 +92,11 @@ async def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsL params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -118,7 +113,7 @@ async def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsL return deserialized - list.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings"} @distributed_trace_async async def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: @@ -143,10 +138,8 @@ async def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) request = build_get_request( group_id=group_id, @@ -156,10 +149,11 @@ async def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -176,7 +170,7 @@ async def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: return deserialized - get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @overload async def create_or_update( @@ -239,7 +233,7 @@ async def create_or_update( :param group_id: Management Group ID. Required. :type group_id: str :param create_tenant_settings_request: Tenant level settings request parameter. Is either a - model type or a IO type. Required. + CreateOrUpdateSettingsRequest type or a IO type. Required. :type create_tenant_settings_request: ~azure.mgmt.managementgroups.models.CreateOrUpdateSettingsRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -261,16 +255,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_tenant_settings_request, (IO, bytes)): + if isinstance(create_tenant_settings_request, (IOBase, bytes)): _content = create_tenant_settings_request else: _json = self._serialize.body(create_tenant_settings_request, "CreateOrUpdateSettingsRequest") @@ -286,10 +278,11 @@ async def create_or_update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -306,7 +299,7 @@ async def create_or_update( return deserialized - create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @overload async def update( @@ -369,7 +362,7 @@ async def update( :param group_id: Management Group ID. Required. :type group_id: str :param create_tenant_settings_request: Tenant level settings request parameter. Is either a - model type or a IO type. Required. + CreateOrUpdateSettingsRequest type or a IO type. Required. :type create_tenant_settings_request: ~azure.mgmt.managementgroups.models.CreateOrUpdateSettingsRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -391,16 +384,14 @@ async def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_tenant_settings_request, (IO, bytes)): + if isinstance(create_tenant_settings_request, (IOBase, bytes)): _content = create_tenant_settings_request else: _json = self._serialize.body(create_tenant_settings_request, "CreateOrUpdateSettingsRequest") @@ -416,10 +407,11 @@ async def update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -436,7 +428,7 @@ async def update( return deserialized - update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @distributed_trace_async async def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements @@ -460,10 +452,8 @@ async def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[None] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -473,10 +463,11 @@ async def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -489,4 +480,4 @@ async def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable if cls: return cls(pipeline_response, None, {}) - delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_group_subscriptions_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_group_subscriptions_operations.py index 6d746a95dccf..28db947dc407 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_group_subscriptions_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_group_subscriptions_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse @@ -37,10 +36,6 @@ ) from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -93,10 +88,8 @@ async def create( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.SubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.SubscriptionUnderManagementGroup] = kwargs.pop("cls", None) request = build_create_request( group_id=group_id, @@ -108,10 +101,11 @@ async def create( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -128,7 +122,9 @@ async def create( return deserialized - create.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + create.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements @@ -159,10 +155,8 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[None] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -174,10 +168,11 @@ async def delete( # pylint: disable=inconsistent-return-statements params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -190,7 +185,9 @@ async def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + delete.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace_async async def get_subscription( @@ -221,10 +218,8 @@ async def get_subscription( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.SubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.SubscriptionUnderManagementGroup] = kwargs.pop("cls", None) request = build_get_subscription_request( group_id=group_id, @@ -236,10 +231,11 @@ async def get_subscription( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -256,7 +252,9 @@ async def get_subscription( return deserialized - get_subscription.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + get_subscription.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace def get_subscriptions_under_management_group( @@ -282,10 +280,8 @@ def get_subscriptions_under_management_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ListSubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ListSubscriptionUnderManagementGroup] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -307,7 +303,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -323,7 +319,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -331,14 +327,15 @@ async def extract_data(pipeline_response): deserialized = self._deserialize("ListSubscriptionUnderManagementGroup", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -351,4 +348,6 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - get_subscriptions_under_management_group.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions"} # type: ignore + get_subscriptions_under_management_group.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions" + } diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_api_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_api_operations.py index d39a831e3226..6a66b6871bdb 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_api_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_api_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -33,10 +33,6 @@ ) from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -90,7 +86,7 @@ async def check_name_availability( """Checks if the specified management group name is valid and unique. :param check_name_availability_request: Management group name availability check parameters. Is - either a model type or a IO type. Required. + either a CheckNameAvailabilityRequest type or a IO type. Required. :type check_name_availability_request: ~azure.mgmt.managementgroups.models.CheckNameAvailabilityRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -112,16 +108,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(check_name_availability_request, (IO, bytes)): + if isinstance(check_name_availability_request, (IOBase, bytes)): _content = check_name_availability_request else: _json = self._serialize.body(check_name_availability_request, "CheckNameAvailabilityRequest") @@ -136,10 +130,11 @@ async def check_name_availability( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -156,7 +151,7 @@ async def check_name_availability( return deserialized - check_name_availability.metadata = {"url": "/providers/Microsoft.Management/checkNameAvailability"} # type: ignore + check_name_availability.metadata = {"url": "/providers/Microsoft.Management/checkNameAvailability"} @distributed_trace_async async def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillStatusResult: @@ -178,10 +173,8 @@ async def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillSt _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.TenantBackfillStatusResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.TenantBackfillStatusResult] = kwargs.pop("cls", None) request = build_start_tenant_backfill_request( api_version=api_version, @@ -190,10 +183,11 @@ async def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillSt params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -210,7 +204,7 @@ async def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillSt return deserialized - start_tenant_backfill.metadata = {"url": "/providers/Microsoft.Management/startTenantBackfill"} # type: ignore + start_tenant_backfill.metadata = {"url": "/providers/Microsoft.Management/startTenantBackfill"} @distributed_trace_async async def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillStatusResult: @@ -232,10 +226,8 @@ async def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillS _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.TenantBackfillStatusResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.TenantBackfillStatusResult] = kwargs.pop("cls", None) request = build_tenant_backfill_status_request( api_version=api_version, @@ -244,10 +236,11 @@ async def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillS params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -264,4 +257,4 @@ async def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillS return deserialized - tenant_backfill_status.metadata = {"url": "/providers/Microsoft.Management/tenantBackfillStatus"} # type: ignore + tenant_backfill_status.metadata = {"url": "/providers/Microsoft.Management/tenantBackfillStatus"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_operations.py index eb65996b9ec6..fc164a830d40 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_management_groups_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -41,10 +41,6 @@ ) from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -92,10 +88,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroupListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ManagementGroupListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -117,7 +111,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -133,7 +127,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -141,14 +135,15 @@ async def extract_data(pipeline_response): deserialized = self._deserialize("ManagementGroupListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -161,7 +156,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/managementGroups"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/managementGroups"} @distributed_trace_async async def get( @@ -208,10 +203,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) request = build_get_request( group_id=group_id, @@ -225,10 +218,11 @@ async def get( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -245,7 +239,7 @@ async def get( return deserialized - get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} async def _create_or_update_initial( self, @@ -265,18 +259,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop( - "cls", None - ) # type: ClsType[Union[_models.ManagementGroup, _models.AzureAsyncOperationResults]] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[Union[_models.ManagementGroup, _models.AzureAsyncOperationResults]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_management_group_request, (IO, bytes)): + if isinstance(create_management_group_request, (IOBase, bytes)): _content = create_management_group_request else: _json = self._serialize.body(create_management_group_request, "CreateManagementGroupRequest") @@ -293,10 +283,11 @@ async def _create_or_update_initial( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -319,11 +310,11 @@ async def _create_or_update_initial( deserialized = self._deserialize("AzureAsyncOperationResults", pipeline_response) if cls: - return cls(pipeline_response, deserialized, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized + return deserialized # type: ignore - _create_or_update_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @overload async def begin_create_or_update( @@ -334,7 +325,7 @@ async def begin_create_or_update( *, content_type: str = "application/json", **kwargs: Any - ) -> Union[AsyncLROPoller[_models.ManagementGroup], AsyncLROPoller[_models.AzureAsyncOperationResults]]: + ) -> AsyncLROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. @@ -375,7 +366,7 @@ async def begin_create_or_update( *, content_type: str = "application/json", **kwargs: Any - ) -> Union[AsyncLROPoller[_models.ManagementGroup], AsyncLROPoller[_models.AzureAsyncOperationResults]]: + ) -> AsyncLROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. @@ -413,15 +404,15 @@ async def begin_create_or_update( create_management_group_request: Union[_models.CreateManagementGroupRequest, IO], cache_control: str = "no-cache", **kwargs: Any - ) -> Union[AsyncLROPoller[_models.ManagementGroup], AsyncLROPoller[_models.AzureAsyncOperationResults]]: + ) -> AsyncLROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. :param group_id: Management Group ID. Required. :type group_id: str - :param create_management_group_request: Management group creation parameters. Is either a model - type or a IO type. Required. + :param create_management_group_request: Management group creation parameters. Is either a + CreateManagementGroupRequest type or a IO type. Required. :type create_management_group_request: ~azure.mgmt.managementgroups.models.CreateManagementGroupRequest or IO :param cache_control: Indicates whether the request should utilize any caches. Populate the @@ -448,16 +439,14 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] - polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) + polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] + cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._create_or_update_initial( # type: ignore + raw_result = await self._create_or_update_initial( group_id=group_id, create_management_group_request=create_management_group_request, cache_control=cache_control, @@ -477,10 +466,10 @@ def get_long_running_output(pipeline_response): return deserialized if polling is True: - polling_method = cast( + polling_method: AsyncPollingMethod = cast( AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs), - ) # type: AsyncPollingMethod + ) elif polling is False: polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) else: @@ -492,9 +481,9 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - begin_create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + begin_create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @overload async def update( @@ -564,8 +553,8 @@ async def update( :param group_id: Management Group ID. Required. :type group_id: str - :param patch_group_request: Management group patch parameters. Is either a model type or a IO - type. Required. + :param patch_group_request: Management group patch parameters. Is either a + PatchManagementGroupRequest type or a IO type. Required. :type patch_group_request: ~azure.mgmt.managementgroups.models.PatchManagementGroupRequest or IO :param cache_control: Indicates whether the request should utilize any caches. Populate the @@ -590,16 +579,14 @@ async def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(patch_group_request, (IO, bytes)): + if isinstance(patch_group_request, (IOBase, bytes)): _content = patch_group_request else: _json = self._serialize.body(patch_group_request, "PatchManagementGroupRequest") @@ -616,10 +603,11 @@ async def update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -636,7 +624,7 @@ async def update( return deserialized - update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} async def _delete_initial( self, group_id: str, cache_control: str = "no-cache", **kwargs: Any @@ -652,10 +640,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.AzureAsyncOperationResults]] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[Optional[_models.AzureAsyncOperationResults]] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -666,10 +652,11 @@ async def _delete_initial( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -694,7 +681,7 @@ async def _delete_initial( return deserialized - _delete_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + _delete_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @distributed_trace_async async def begin_delete( @@ -725,15 +712,13 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.AzureAsyncOperationResults] - polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.AzureAsyncOperationResults] = kwargs.pop("cls", None) + polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] + cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = await self._delete_initial( # type: ignore + raw_result = await self._delete_initial( group_id=group_id, cache_control=cache_control, api_version=api_version, @@ -758,10 +743,10 @@ def get_long_running_output(pipeline_response): return deserialized if polling is True: - polling_method = cast( + polling_method: AsyncPollingMethod = cast( AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs), - ) # type: AsyncPollingMethod + ) elif polling is False: polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) else: @@ -773,9 +758,9 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - begin_delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + begin_delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @distributed_trace def get_descendants( @@ -803,10 +788,8 @@ def get_descendants( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.DescendantListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.DescendantListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -829,7 +812,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -845,7 +828,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -853,14 +836,15 @@ async def extract_data(pipeline_response): deserialized = self._deserialize("DescendantListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -873,4 +857,4 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - get_descendants.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/descendants"} # type: ignore + get_descendants.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/descendants"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_operations.py index 49a474cb2bf6..243259497108 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/aio/operations/_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse @@ -31,10 +30,6 @@ from ...operations._operations import build_list_request from .._vendor import ManagementGroupsAPIMixinABC -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -70,10 +65,8 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.OperationListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -93,7 +86,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -109,7 +102,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -117,14 +110,15 @@ async def extract_data(pipeline_response): deserialized = self._deserialize("OperationListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, AsyncList(list_of_elem) async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -137,4 +131,4 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/operations"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/operations"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/__init__.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/__init__.py index 54fb93ced4c1..118960055d79 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/__init__.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/__init__.py @@ -37,7 +37,6 @@ from ._models_py3 import OperationDisplayProperties from ._models_py3 import OperationListResult from ._models_py3 import OperationResults -from ._models_py3 import ParentGroupBagInfo from ._models_py3 import ParentGroupInfo from ._models_py3 import PatchManagementGroupRequest from ._models_py3 import SubscriptionUnderManagementGroup @@ -51,7 +50,7 @@ from ._management_groups_api_enums import Reason from ._management_groups_api_enums import Status from ._patch import __all__ as _patch_all -from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import * # pylint: disable=unused-wildcard-import from ._patch import patch_sdk as _patch_sdk __all__ = [ @@ -86,7 +85,6 @@ "OperationDisplayProperties", "OperationListResult", "OperationResults", - "ParentGroupBagInfo", "ParentGroupInfo", "PatchManagementGroupRequest", "SubscriptionUnderManagementGroup", diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/_models_py3.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/_models_py3.py index 50b3f7130433..0606518e8d7f 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/_models_py3.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/models/_models_py3.py @@ -9,7 +9,7 @@ import datetime import sys -from typing import List, Optional, TYPE_CHECKING, Union +from typing import Any, List, Optional, TYPE_CHECKING, Union from .. import _serialization @@ -62,7 +62,7 @@ class AzureAsyncOperationResults(_serialization.Model): "display_name": {"key": "properties.displayName", "type": "str"}, } - def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs): + def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs: Any) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the management group. For example, 00000000-0000-0000-0000-000000000000. @@ -99,8 +99,8 @@ def __init__( *, name: Optional[str] = None, type: Optional[Literal["Microsoft.Management/managementGroups"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword name: the name to check for availability. :paramtype name: str @@ -145,7 +145,7 @@ class CheckNameAvailabilityResult(_serialization.Model): "message": {"key": "message", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.name_available = None @@ -190,7 +190,7 @@ class CreateManagementGroupChildInfo(_serialization.Model): "children": {"key": "children", "type": "[CreateManagementGroupChildInfo]"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.type = None @@ -228,7 +228,7 @@ class CreateManagementGroupDetails(_serialization.Model): "parent": {"key": "parent", "type": "CreateParentGroupInfo"}, } - def __init__(self, *, parent: Optional["_models.CreateParentGroupInfo"] = None, **kwargs): + def __init__(self, *, parent: Optional["_models.CreateParentGroupInfo"] = None, **kwargs: Any) -> None: """ :keyword parent: (Optional) The ID of the parent management group used during creation. :paramtype parent: ~azure.mgmt.managementgroups.models.CreateParentGroupInfo @@ -288,8 +288,8 @@ def __init__( name: Optional[str] = None, display_name: Optional[str] = None, details: Optional["_models.CreateManagementGroupDetails"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword name: The name of the management group. For example, 00000000-0000-0000-0000-000000000000. @@ -338,8 +338,8 @@ def __init__( *, require_authorization_for_group_creation: Optional[bool] = None, default_management_group: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword require_authorization_for_group_creation: Indicates whether RBAC access is required upon group creation under the root Management Group. If set to true, user will require @@ -382,7 +382,7 @@ class CreateParentGroupInfo(_serialization.Model): "display_name": {"key": "displayName", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=redefined-builtin + def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin """ :keyword id: The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. @@ -433,8 +433,8 @@ def __init__( *, display_name: Optional[str] = None, parent: Optional["_models.DescendantParentGroupInfo"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword display_name: The friendly name of the management group. :paramtype display_name: str @@ -469,7 +469,7 @@ class DescendantListResult(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.DescendantInfo"]] = None, **kwargs): + def __init__(self, *, value: Optional[List["_models.DescendantInfo"]] = None, **kwargs: Any) -> None: """ :keyword value: The list of descendants. :paramtype value: list[~azure.mgmt.managementgroups.models.DescendantInfo] @@ -491,7 +491,7 @@ class DescendantParentGroupInfo(_serialization.Model): "id": {"key": "id", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=redefined-builtin + def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin """ :keyword id: The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. @@ -544,8 +544,8 @@ def __init__( display_name: Optional[str] = None, permissions: Optional[Union[str, "_models.Permissions"]] = None, children: Optional[List["_models.EntityHierarchyItem"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword display_name: The friendly name of the management group. :paramtype display_name: str @@ -639,8 +639,8 @@ def __init__( number_of_child_groups: Optional[int] = None, parent_display_name_chain: Optional[List[str]] = None, parent_name_chain: Optional[List[str]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the entity. For example, 00000000-0000-0000-0000-000000000000. @@ -709,7 +709,7 @@ class EntityListResult(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.EntityInfo"]] = None, **kwargs): + def __init__(self, *, value: Optional[List["_models.EntityInfo"]] = None, **kwargs: Any) -> None: """ :keyword value: The list of entities. :paramtype value: list[~azure.mgmt.managementgroups.models.EntityInfo] @@ -732,7 +732,7 @@ class EntityParentGroupInfo(_serialization.Model): "id": {"key": "id", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=redefined-builtin + def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin """ :keyword id: The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. @@ -760,8 +760,8 @@ class ErrorDetails(_serialization.Model): } def __init__( - self, *, code: Optional[str] = None, message: Optional[str] = None, details: Optional[str] = None, **kwargs - ): + self, *, code: Optional[str] = None, message: Optional[str] = None, details: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword code: One of a server-defined set of error codes. :paramtype code: str @@ -787,7 +787,7 @@ class ErrorResponse(_serialization.Model): "error": {"key": "error", "type": "ErrorDetails"}, } - def __init__(self, *, error: Optional["_models.ErrorDetails"] = None, **kwargs): + def __init__(self, *, error: Optional["_models.ErrorDetails"] = None, **kwargs: Any) -> None: """ :keyword error: The details of the error. :paramtype error: ~azure.mgmt.managementgroups.models.ErrorDetails @@ -848,8 +848,8 @@ def __init__( tenant_id: Optional[str] = None, require_authorization_for_group_creation: Optional[bool] = None, default_management_group: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the hierarchy settings. For example, 00000000-0000-0000-0000-000000000000. @@ -926,8 +926,8 @@ def __init__( tenant_id: Optional[str] = None, require_authorization_for_group_creation: Optional[bool] = None, default_management_group: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the hierarchy settings. For example, 00000000-0000-0000-0000-000000000000. @@ -969,10 +969,10 @@ class HierarchySettingsList(_serialization.Model): _attribute_map = { "value": {"key": "value", "type": "[HierarchySettingsInfo]"}, - "next_link": {"key": "nextLink", "type": "str"}, + "next_link": {"key": "@nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.HierarchySettingsInfo"]] = None, **kwargs): + def __init__(self, *, value: Optional[List["_models.HierarchySettingsInfo"]] = None, **kwargs: Any) -> None: """ :keyword value: The list of hierarchy settings. :paramtype value: list[~azure.mgmt.managementgroups.models.HierarchySettingsInfo] @@ -1002,7 +1002,9 @@ class ListSubscriptionUnderManagementGroup(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.SubscriptionUnderManagementGroup"]] = None, **kwargs): + def __init__( + self, *, value: Optional[List["_models.SubscriptionUnderManagementGroup"]] = None, **kwargs: Any + ) -> None: """ :keyword value: The list of subscriptions. :paramtype value: list[~azure.mgmt.managementgroups.models.SubscriptionUnderManagementGroup] @@ -1059,8 +1061,8 @@ def __init__( display_name: Optional[str] = None, details: Optional["_models.ManagementGroupDetails"] = None, children: Optional[List["_models.ManagementGroupChildInfo"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the management group. For example, 00000000-0000-0000-0000-000000000000. @@ -1117,8 +1119,8 @@ def __init__( name: Optional[str] = None, display_name: Optional[str] = None, children: Optional[List["_models.ManagementGroupChildInfo"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword type: The fully qualified resource type which includes provider namespace (e.g. Microsoft.Management/managementGroups). Known values are: @@ -1187,8 +1189,8 @@ def __init__( path: Optional[List["_models.ManagementGroupPathElement"]] = None, management_group_ancestors: Optional[List[str]] = None, management_group_ancestors_chain: Optional[List["_models.ManagementGroupPathElement"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword version: The version number of the object. :paramtype version: int @@ -1251,7 +1253,7 @@ class ManagementGroupInfo(_serialization.Model): "display_name": {"key": "properties.displayName", "type": "str"}, } - def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs): + def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs: Any) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the management group. For example, 00000000-0000-0000-0000-000000000000. @@ -1284,10 +1286,10 @@ class ManagementGroupListResult(_serialization.Model): _attribute_map = { "value": {"key": "value", "type": "[ManagementGroupInfo]"}, - "next_link": {"key": "nextLink", "type": "str"}, + "next_link": {"key": "@nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.ManagementGroupInfo"]] = None, **kwargs): + def __init__(self, *, value: Optional[List["_models.ManagementGroupInfo"]] = None, **kwargs: Any) -> None: """ :keyword value: The list of management groups. :paramtype value: list[~azure.mgmt.managementgroups.models.ManagementGroupInfo] @@ -1311,7 +1313,7 @@ class ManagementGroupPathElement(_serialization.Model): "display_name": {"key": "displayName", "type": "str"}, } - def __init__(self, *, name: Optional[str] = None, display_name: Optional[str] = None, **kwargs): + def __init__(self, *, name: Optional[str] = None, display_name: Optional[str] = None, **kwargs: Any) -> None: """ :keyword name: The name of the group. :paramtype name: str @@ -1343,7 +1345,7 @@ class Operation(_serialization.Model): "display": {"key": "display", "type": "OperationDisplayProperties"}, } - def __init__(self, *, display: Optional["_models.OperationDisplayProperties"] = None, **kwargs): + def __init__(self, *, display: Optional["_models.OperationDisplayProperties"] = None, **kwargs: Any) -> None: """ :keyword display: The object that represents the operation. :paramtype display: ~azure.mgmt.managementgroups.models.OperationDisplayProperties @@ -1382,7 +1384,7 @@ class OperationDisplayProperties(_serialization.Model): "description": {"key": "description", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.provider = None @@ -1412,7 +1414,7 @@ class OperationListResult(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.value = None @@ -1453,7 +1455,7 @@ class OperationResults(_serialization.Model): "display_name": {"key": "properties.displayName", "type": "str"}, } - def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs): + def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[str] = None, **kwargs: Any) -> None: """ :keyword tenant_id: The AAD Tenant ID associated with the management group. For example, 00000000-0000-0000-0000-000000000000. @@ -1469,49 +1471,6 @@ def __init__(self, *, tenant_id: Optional[str] = None, display_name: Optional[st self.display_name = display_name -class ParentGroupBagInfo(_serialization.Model): - """The ID, name and displayName of the parent management group. - - :ivar id: The fully qualified ID for the parent management group. For example, - /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. - :vartype id: str - :ivar name: The name of the parent management group. For example, - 00000000-0000-0000-0000-000000000000. - :vartype name: str - :ivar display_name: The friendly name of the parent management group. - :vartype display_name: str - """ - - _attribute_map = { - "id": {"key": "id", "type": "str"}, - "name": {"key": "name", "type": "str"}, - "display_name": {"key": "displayName", "type": "str"}, - } - - def __init__( - self, - *, - id: Optional[str] = None, # pylint: disable=redefined-builtin - name: Optional[str] = None, - display_name: Optional[str] = None, - **kwargs - ): - """ - :keyword id: The fully qualified ID for the parent management group. For example, - /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. - :paramtype id: str - :keyword name: The name of the parent management group. For example, - 00000000-0000-0000-0000-000000000000. - :paramtype name: str - :keyword display_name: The friendly name of the parent management group. - :paramtype display_name: str - """ - super().__init__(**kwargs) - self.id = id - self.name = name - self.display_name = display_name - - class ParentGroupInfo(_serialization.Model): """(Optional) The ID of the parent management group. @@ -1536,8 +1495,8 @@ def __init__( id: Optional[str] = None, # pylint: disable=redefined-builtin name: Optional[str] = None, display_name: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword id: The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000. @@ -1568,7 +1527,9 @@ class PatchManagementGroupRequest(_serialization.Model): "parent_group_id": {"key": "parentGroupId", "type": "str"}, } - def __init__(self, *, display_name: Optional[str] = None, parent_group_id: Optional[str] = None, **kwargs): + def __init__( + self, *, display_name: Optional[str] = None, parent_group_id: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword display_name: The friendly name of the management group. :paramtype display_name: str @@ -1601,8 +1562,8 @@ class SubscriptionUnderManagementGroup(_serialization.Model): :vartype tenant: str :ivar display_name: The friendly name of the subscription. :vartype display_name: str - :ivar parent: The ID, name and displayName of the parent management group. - :vartype parent: ~azure.mgmt.managementgroups.models.ParentGroupBagInfo + :ivar parent: The ID of the parent management group. + :vartype parent: ~azure.mgmt.managementgroups.models.DescendantParentGroupInfo :ivar state: The state of the subscription. :vartype state: str """ @@ -1619,7 +1580,7 @@ class SubscriptionUnderManagementGroup(_serialization.Model): "name": {"key": "name", "type": "str"}, "tenant": {"key": "properties.tenant", "type": "str"}, "display_name": {"key": "properties.displayName", "type": "str"}, - "parent": {"key": "properties.parent", "type": "ParentGroupBagInfo"}, + "parent": {"key": "properties.parent", "type": "DescendantParentGroupInfo"}, "state": {"key": "properties.state", "type": "str"}, } @@ -1628,18 +1589,18 @@ def __init__( *, tenant: Optional[str] = None, display_name: Optional[str] = None, - parent: Optional["_models.ParentGroupBagInfo"] = None, + parent: Optional["_models.DescendantParentGroupInfo"] = None, state: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tenant: The AAD Tenant ID associated with the subscription. For example, 00000000-0000-0000-0000-000000000000. :paramtype tenant: str :keyword display_name: The friendly name of the subscription. :paramtype display_name: str - :keyword parent: The ID, name and displayName of the parent management group. - :paramtype parent: ~azure.mgmt.managementgroups.models.ParentGroupBagInfo + :keyword parent: The ID of the parent management group. + :paramtype parent: ~azure.mgmt.managementgroups.models.DescendantParentGroupInfo :keyword state: The state of the subscription. :paramtype state: str """ @@ -1676,7 +1637,7 @@ class TenantBackfillStatusResult(_serialization.Model): "status": {"key": "status", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.tenant_id = None diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/__init__.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/__init__.py index 2d20b499bdbe..17da0c8d00e0 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/__init__.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/__init__.py @@ -14,7 +14,7 @@ from ._entities_operations import EntitiesOperations from ._patch import __all__ as _patch_all -from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import * # pylint: disable=unused-wildcard-import from ._patch import patch_sdk as _patch_sdk __all__ = [ diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_entities_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_entities_operations.py index f48b3816c479..515c92dc8d04 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_entities_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_entities_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union import urllib.parse @@ -30,10 +29,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -57,7 +52,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -184,10 +179,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.EntityListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.EntityListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -216,7 +209,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -232,7 +225,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -240,14 +233,15 @@ def extract_data(pipeline_response): deserialized = self._deserialize("EntityListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -260,4 +254,4 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/getEntities"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/getEntities"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_hierarchy_settings_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_hierarchy_settings_operations.py index ef3c8ad2a1fc..7afce80df8bd 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_hierarchy_settings_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_hierarchy_settings_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -28,10 +28,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request, _format_url_section -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -43,7 +39,7 @@ def build_list_request(group_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +48,7 @@ def build_list_request(group_id: str, **kwargs: Any) -> HttpRequest: "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -67,7 +63,7 @@ def build_get_request(group_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -76,7 +72,7 @@ def build_get_request(group_id: str, **kwargs: Any) -> HttpRequest: "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -91,8 +87,8 @@ def build_create_or_update_request(group_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -101,7 +97,7 @@ def build_create_or_update_request(group_id: str, **kwargs: Any) -> HttpRequest: "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -118,8 +114,8 @@ def build_update_request(group_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -128,7 +124,7 @@ def build_update_request(group_id: str, **kwargs: Any) -> HttpRequest: "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -145,7 +141,7 @@ def build_delete_request(group_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -154,7 +150,7 @@ def build_delete_request(group_id: str, **kwargs: Any) -> HttpRequest: "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -207,10 +203,8 @@ def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsList: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettingsList] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.HierarchySettingsList] = kwargs.pop("cls", None) request = build_list_request( group_id=group_id, @@ -220,10 +214,11 @@ def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsList: params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -240,7 +235,7 @@ def list(self, group_id: str, **kwargs: Any) -> _models.HierarchySettingsList: return deserialized - list.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings"} @distributed_trace def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: @@ -265,10 +260,8 @@ def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) request = build_get_request( group_id=group_id, @@ -278,10 +271,11 @@ def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -298,7 +292,7 @@ def get(self, group_id: str, **kwargs: Any) -> _models.HierarchySettings: return deserialized - get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @overload def create_or_update( @@ -361,7 +355,7 @@ def create_or_update( :param group_id: Management Group ID. Required. :type group_id: str :param create_tenant_settings_request: Tenant level settings request parameter. Is either a - model type or a IO type. Required. + CreateOrUpdateSettingsRequest type or a IO type. Required. :type create_tenant_settings_request: ~azure.mgmt.managementgroups.models.CreateOrUpdateSettingsRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -383,16 +377,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_tenant_settings_request, (IO, bytes)): + if isinstance(create_tenant_settings_request, (IOBase, bytes)): _content = create_tenant_settings_request else: _json = self._serialize.body(create_tenant_settings_request, "CreateOrUpdateSettingsRequest") @@ -408,10 +400,11 @@ def create_or_update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -428,7 +421,7 @@ def create_or_update( return deserialized - create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @overload def update( @@ -491,7 +484,7 @@ def update( :param group_id: Management Group ID. Required. :type group_id: str :param create_tenant_settings_request: Tenant level settings request parameter. Is either a - model type or a IO type. Required. + CreateOrUpdateSettingsRequest type or a IO type. Required. :type create_tenant_settings_request: ~azure.mgmt.managementgroups.models.CreateOrUpdateSettingsRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -513,16 +506,14 @@ def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.HierarchySettings] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.HierarchySettings] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_tenant_settings_request, (IO, bytes)): + if isinstance(create_tenant_settings_request, (IOBase, bytes)): _content = create_tenant_settings_request else: _json = self._serialize.body(create_tenant_settings_request, "CreateOrUpdateSettingsRequest") @@ -538,10 +529,11 @@ def update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -558,7 +550,7 @@ def update( return deserialized - update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} @distributed_trace def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements @@ -582,10 +574,8 @@ def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable=incon _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[None] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -595,10 +585,11 @@ def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable=incon params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -611,4 +602,4 @@ def delete(self, group_id: str, **kwargs: Any) -> None: # pylint: disable=incon if cls: return cls(pipeline_response, None, {}) - delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} # type: ignore + delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/settings/default"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_group_subscriptions_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_group_subscriptions_operations.py index db2fb22bc452..5644b5d4a243 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_group_subscriptions_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_group_subscriptions_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse @@ -30,10 +29,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request, _format_url_section -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -47,7 +42,7 @@ def build_create_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +54,7 @@ def build_create_request( "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +73,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -90,7 +85,7 @@ def build_delete_request( "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -109,7 +104,7 @@ def build_get_subscription_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -121,7 +116,7 @@ def build_get_subscription_request( "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -140,7 +135,7 @@ def build_get_subscriptions_under_management_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -149,7 +144,7 @@ def build_get_subscriptions_under_management_group_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,10 +205,8 @@ def create( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.SubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.SubscriptionUnderManagementGroup] = kwargs.pop("cls", None) request = build_create_request( group_id=group_id, @@ -225,10 +218,11 @@ def create( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -245,7 +239,9 @@ def create( return deserialized - create.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + create.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace def delete( # pylint: disable=inconsistent-return-statements @@ -276,10 +272,8 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[None] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -291,10 +285,11 @@ def delete( # pylint: disable=inconsistent-return-statements params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -307,7 +302,9 @@ def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + delete.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace def get_subscription( @@ -338,10 +335,8 @@ def get_subscription( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.SubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.SubscriptionUnderManagementGroup] = kwargs.pop("cls", None) request = build_get_subscription_request( group_id=group_id, @@ -353,10 +348,11 @@ def get_subscription( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -373,7 +369,9 @@ def get_subscription( return deserialized - get_subscription.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}"} # type: ignore + get_subscription.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions/{subscriptionId}" + } @distributed_trace def get_subscriptions_under_management_group( @@ -399,10 +397,8 @@ def get_subscriptions_under_management_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ListSubscriptionUnderManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ListSubscriptionUnderManagementGroup] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -424,7 +420,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -440,7 +436,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -448,14 +444,15 @@ def extract_data(pipeline_response): deserialized = self._deserialize("ListSubscriptionUnderManagementGroup", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -468,4 +465,6 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - get_subscriptions_under_management_group.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions"} # type: ignore + get_subscriptions_under_management_group.metadata = { + "url": "/providers/Microsoft.Management/managementGroups/{groupId}/subscriptions" + } diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_api_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_api_operations.py index ba664f389d09..59148b9d6505 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_api_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_api_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload from azure.core.exceptions import ( @@ -28,10 +28,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -43,8 +39,8 @@ def build_check_name_availability_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -65,7 +61,7 @@ def build_start_tenant_backfill_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -84,7 +80,7 @@ def build_tenant_backfill_status_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -148,7 +144,7 @@ def check_name_availability( """Checks if the specified management group name is valid and unique. :param check_name_availability_request: Management group name availability check parameters. Is - either a model type or a IO type. Required. + either a CheckNameAvailabilityRequest type or a IO type. Required. :type check_name_availability_request: ~azure.mgmt.managementgroups.models.CheckNameAvailabilityRequest or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -170,16 +166,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(check_name_availability_request, (IO, bytes)): + if isinstance(check_name_availability_request, (IOBase, bytes)): _content = check_name_availability_request else: _json = self._serialize.body(check_name_availability_request, "CheckNameAvailabilityRequest") @@ -194,10 +188,11 @@ def check_name_availability( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -214,7 +209,7 @@ def check_name_availability( return deserialized - check_name_availability.metadata = {"url": "/providers/Microsoft.Management/checkNameAvailability"} # type: ignore + check_name_availability.metadata = {"url": "/providers/Microsoft.Management/checkNameAvailability"} @distributed_trace def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillStatusResult: @@ -236,10 +231,8 @@ def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillStatusRe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.TenantBackfillStatusResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.TenantBackfillStatusResult] = kwargs.pop("cls", None) request = build_start_tenant_backfill_request( api_version=api_version, @@ -248,10 +241,11 @@ def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillStatusRe params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -268,7 +262,7 @@ def start_tenant_backfill(self, **kwargs: Any) -> _models.TenantBackfillStatusRe return deserialized - start_tenant_backfill.metadata = {"url": "/providers/Microsoft.Management/startTenantBackfill"} # type: ignore + start_tenant_backfill.metadata = {"url": "/providers/Microsoft.Management/startTenantBackfill"} @distributed_trace def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillStatusResult: @@ -290,10 +284,8 @@ def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillStatusR _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.TenantBackfillStatusResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.TenantBackfillStatusResult] = kwargs.pop("cls", None) request = build_tenant_backfill_status_request( api_version=api_version, @@ -302,10 +294,11 @@ def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillStatusR params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -322,4 +315,4 @@ def tenant_backfill_status(self, **kwargs: Any) -> _models.TenantBackfillStatusR return deserialized - tenant_backfill_status.metadata = {"url": "/providers/Microsoft.Management/tenantBackfillStatus"} # type: ignore + tenant_backfill_status.metadata = {"url": "/providers/Microsoft.Management/tenantBackfillStatus"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_operations.py index cc4bd933384a..9d1ffbc3cd02 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_management_groups_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -32,10 +32,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request, _format_url_section -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,7 +45,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,7 +76,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -89,7 +85,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -112,8 +108,8 @@ def build_create_or_update_request(group_id: str, *, cache_control: str = "no-ca _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -122,7 +118,7 @@ def build_create_or_update_request(group_id: str, *, cache_control: str = "no-ca "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -141,8 +137,8 @@ def build_update_request(group_id: str, *, cache_control: str = "no-cache", **kw _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -151,7 +147,7 @@ def build_update_request(group_id: str, *, cache_control: str = "no-cache", **kw "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -170,7 +166,7 @@ def build_delete_request(group_id: str, *, cache_control: str = "no-cache", **kw _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -179,7 +175,7 @@ def build_delete_request(group_id: str, *, cache_control: str = "no-cache", **kw "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -198,7 +194,7 @@ def build_get_descendants_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -207,7 +203,7 @@ def build_get_descendants_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url = _format_url_section(_url, **path_format_arguments) + _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -264,10 +260,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroupListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ManagementGroupListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -289,7 +283,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -305,7 +299,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -313,14 +307,15 @@ def extract_data(pipeline_response): deserialized = self._deserialize("ManagementGroupListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -333,7 +328,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/managementGroups"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/managementGroups"} @distributed_trace def get( @@ -380,10 +375,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) request = build_get_request( group_id=group_id, @@ -397,10 +390,11 @@ def get( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -417,7 +411,7 @@ def get( return deserialized - get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + get.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} def _create_or_update_initial( self, @@ -437,18 +431,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop( - "cls", None - ) # type: ClsType[Union[_models.ManagementGroup, _models.AzureAsyncOperationResults]] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[Union[_models.ManagementGroup, _models.AzureAsyncOperationResults]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(create_management_group_request, (IO, bytes)): + if isinstance(create_management_group_request, (IOBase, bytes)): _content = create_management_group_request else: _json = self._serialize.body(create_management_group_request, "CreateManagementGroupRequest") @@ -465,10 +455,11 @@ def _create_or_update_initial( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -491,11 +482,11 @@ def _create_or_update_initial( deserialized = self._deserialize("AzureAsyncOperationResults", pipeline_response) if cls: - return cls(pipeline_response, deserialized, response_headers) + return cls(pipeline_response, deserialized, response_headers) # type: ignore - return deserialized + return deserialized # type: ignore - _create_or_update_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @overload def begin_create_or_update( @@ -506,7 +497,7 @@ def begin_create_or_update( *, content_type: str = "application/json", **kwargs: Any - ) -> Union[LROPoller[_models.ManagementGroup], LROPoller[_models.AzureAsyncOperationResults]]: + ) -> LROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. @@ -546,7 +537,7 @@ def begin_create_or_update( *, content_type: str = "application/json", **kwargs: Any - ) -> Union[LROPoller[_models.ManagementGroup], LROPoller[_models.AzureAsyncOperationResults]]: + ) -> LROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. @@ -583,15 +574,15 @@ def begin_create_or_update( create_management_group_request: Union[_models.CreateManagementGroupRequest, IO], cache_control: str = "no-cache", **kwargs: Any - ) -> Union[LROPoller[_models.ManagementGroup], LROPoller[_models.AzureAsyncOperationResults]]: + ) -> LROPoller[_models.ManagementGroup]: """Create or update a management group. If a management group is already created and a subsequent create request is issued with different properties, the management group properties will be updated. :param group_id: Management Group ID. Required. :type group_id: str - :param create_management_group_request: Management group creation parameters. Is either a model - type or a IO type. Required. + :param create_management_group_request: Management group creation parameters. Is either a + CreateManagementGroupRequest type or a IO type. Required. :type create_management_group_request: ~azure.mgmt.managementgroups.models.CreateManagementGroupRequest or IO :param cache_control: Indicates whether the request should utilize any caches. Populate the @@ -617,16 +608,14 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] - polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) + polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] + cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._create_or_update_initial( # type: ignore + raw_result = self._create_or_update_initial( group_id=group_id, create_management_group_request=create_management_group_request, cache_control=cache_control, @@ -646,9 +635,9 @@ def get_long_running_output(pipeline_response): return deserialized if polling is True: - polling_method = cast( + polling_method: PollingMethod = cast( PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs) - ) # type: PollingMethod + ) elif polling is False: polling_method = cast(PollingMethod, NoPolling()) else: @@ -660,9 +649,9 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - begin_create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + begin_create_or_update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @overload def update( @@ -732,8 +721,8 @@ def update( :param group_id: Management Group ID. Required. :type group_id: str - :param patch_group_request: Management group patch parameters. Is either a model type or a IO - type. Required. + :param patch_group_request: Management group patch parameters. Is either a + PatchManagementGroupRequest type or a IO type. Required. :type patch_group_request: ~azure.mgmt.managementgroups.models.PatchManagementGroupRequest or IO :param cache_control: Indicates whether the request should utilize any caches. Populate the @@ -758,16 +747,14 @@ def update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] - cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagementGroup] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) + cls: ClsType[_models.ManagementGroup] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(patch_group_request, (IO, bytes)): + if isinstance(patch_group_request, (IOBase, bytes)): _content = patch_group_request else: _json = self._serialize.body(patch_group_request, "PatchManagementGroupRequest") @@ -784,10 +771,11 @@ def update( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -804,7 +792,7 @@ def update( return deserialized - update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + update.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} def _delete_initial( self, group_id: str, cache_control: str = "no-cache", **kwargs: Any @@ -820,10 +808,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[Optional[_models.AzureAsyncOperationResults]] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[Optional[_models.AzureAsyncOperationResults]] = kwargs.pop("cls", None) request = build_delete_request( group_id=group_id, @@ -834,10 +820,11 @@ def _delete_initial( params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -862,7 +849,7 @@ def _delete_initial( return deserialized - _delete_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + _delete_initial.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @distributed_trace def begin_delete( @@ -893,15 +880,13 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.AzureAsyncOperationResults] - polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.AzureAsyncOperationResults] = kwargs.pop("cls", None) + polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) - cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] + cont_token: Optional[str] = kwargs.pop("continuation_token", None) if cont_token is None: - raw_result = self._delete_initial( # type: ignore + raw_result = self._delete_initial( group_id=group_id, cache_control=cache_control, api_version=api_version, @@ -926,9 +911,9 @@ def get_long_running_output(pipeline_response): return deserialized if polling is True: - polling_method = cast( + polling_method: PollingMethod = cast( PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs) - ) # type: PollingMethod + ) elif polling is False: polling_method = cast(PollingMethod, NoPolling()) else: @@ -940,9 +925,9 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) # type: ignore - begin_delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} # type: ignore + begin_delete.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}"} @distributed_trace def get_descendants( @@ -969,10 +954,8 @@ def get_descendants( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.DescendantListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.DescendantListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -995,7 +978,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -1011,7 +994,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -1019,14 +1002,15 @@ def extract_data(pipeline_response): deserialized = self._deserialize("DescendantListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1039,4 +1023,4 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - get_descendants.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/descendants"} # type: ignore + get_descendants.metadata = {"url": "/providers/Microsoft.Management/managementGroups/{groupId}/descendants"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_operations.py index 4e175edc59bc..004bbd182976 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/azure/mgmt/managementgroups/operations/_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse @@ -30,10 +29,6 @@ from .._serialization import Serializer from .._vendor import ManagementGroupsAPIMixinABC, _convert_request -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 T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,7 +40,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 = kwargs.pop("api_version", _params.pop("api-version", "2021-04-01")) # type: Literal["2021-04-01"] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,10 +86,8 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) # type: Literal["2021-04-01"] - cls = kwargs.pop("cls", None) # type: ClsType[_models.OperationListResult] + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) + cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { 401: ClientAuthenticationError, @@ -114,7 +107,7 @@ def prepare_request(next_link=None): params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) # type: ignore + request.url = self._client.format_url(request.url) else: # make call to next link with the client's api-version @@ -130,7 +123,7 @@ def prepare_request(next_link=None): "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) # type: ignore + request.url = self._client.format_url(request.url) request.method = "GET" return request @@ -138,14 +131,15 @@ def extract_data(pipeline_response): deserialized = self._deserialize("OperationListResult", pipeline_response) list_of_elem = deserialized.value if cls: - list_of_elem = cls(list_of_elem) + list_of_elem = cls(list_of_elem) # type: ignore return deserialized.next_link or None, iter(list_of_elem) def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - request, stream=False, **kwargs + _stream = False + pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -158,4 +152,4 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) - list.metadata = {"url": "/providers/Microsoft.Management/operations"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.Management/operations"} diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_subscription_to_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_management_group_subscription.py similarity index 92% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_subscription_to_management_group.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_management_group_subscription.py index 3f6eb8fca9e5..1bca37ff4d54 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_subscription_to_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/add_management_group_subscription.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python add_subscription_to_management_group.py + python add_management_group_subscription.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -35,6 +35,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/AddManagementGroupSubscription.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/check_management_group_name_availability.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/check_management_group_name_availability.py index be3c3f89842a..be16ead6d2da 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/check_management_group_name_availability.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/check_management_group_name_availability.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/CheckManagementGroupNameAvailability.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/CheckManagementGroupNameAvailability.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_hierarchy_settings.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_hierarchy_settings.py new file mode 100644 index 000000000000..6599c6931bc4 --- /dev/null +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_hierarchy_settings.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.managementgroups import ManagementGroupsAPI + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-managementgroups +# USAGE + python delete_hierarchy_settings.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = ManagementGroupsAPI( + credential=DefaultAzureCredential(), + ) + + client.hierarchy_settings.delete( + group_id="root", + ) + + +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/DeleteHierarchySettings.json +if __name__ == "__main__": + main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_management_group.py index 95e19eb2fda3..54a1e6866b0c 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_management_group.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/DeleteManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/DeleteManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_all_subscriptions_from_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_all_subscriptions_from_management_group.py index 292c1603db16..7263afea0784 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_all_subscriptions_from_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_all_subscriptions_from_management_group.py @@ -35,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetAllSubscriptionsFromManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_descendants.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_descendants.py index be178f479bdb..ec2528dedfee 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_descendants.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_descendants.py @@ -35,6 +35,6 @@ def main(): print(item) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetDescendants.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetDescendants.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_entities.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_entities.py index 040a6a57ac54..3664e61e5490 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_entities.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_entities.py @@ -33,6 +33,6 @@ def main(): print(item) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetEntities.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetEntities.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_group_settings.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_hierarchy_settings.py similarity index 93% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_group_settings.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_hierarchy_settings.py index dd25c14f9ccd..88a04b4aad8a 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_group_settings.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_hierarchy_settings.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python get_group_settings.py + python get_hierarchy_settings.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetHierarchySettings.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetHierarchySettings.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group.py index 3a764da8439a..4c3aa62c018f 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_ancestors.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_ancestors.py index fabee1b1ea0c..44b050107261 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_ancestors.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_ancestors.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetManagementGroupWithAncestors.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetManagementGroupWithAncestors.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand.py index a072863a8965..eb00cda20b0d 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetManagementGroupWithExpand.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetManagementGroupWithExpand.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_groups_with_expand_and_recurse.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand_and_recurse.py similarity index 91% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_groups_with_expand_and_recurse.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand_and_recurse.py index 665cdc610d34..cbee8668aab3 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_groups_with_expand_and_recurse.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_expand_and_recurse.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python get_management_groups_with_expand_and_recurse.py + python get_management_group_with_expand_and_recurse.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetManagementGroupWithExpandAndRecurse.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetManagementGroupWithExpandAndRecurse.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_path.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_path.py index 43196f9607de..e1f7c904939a 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_path.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_management_group_with_path.py @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetManagementGroupWithPath.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetManagementGroupWithPath.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_subscription_from_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_subscription_from_management_group.py index 05d10e574c19..f09af44bfc31 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_subscription_from_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/get_subscription_from_management_group.py @@ -35,6 +35,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetSubscriptionFromManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/GetSubscriptionFromManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_group_settings.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_hierarchy_settings.py similarity index 93% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_group_settings.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_hierarchy_settings.py index 0c8be379b7e9..2150ee5709e2 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_group_settings.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_hierarchy_settings.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python list_group_settings.py + python list_hierarchy_settings.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -34,6 +34,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/ListHierarchySettings.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/ListHierarchySettings.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_management_groups.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_management_groups.py index 5ff45083374a..693ec24b7690 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_management_groups.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_management_groups.py @@ -33,6 +33,6 @@ def main(): print(item) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/ListManagementGroups.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/ListManagementGroups.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_operations.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_operations.py index ec5b5eab63d8..9ead65b67cb2 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_operations.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/list_operations.py @@ -33,6 +33,6 @@ def main(): print(item) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/ListOperations.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/ListOperations.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_hierarchy_settings.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_hierarchy_settings.py new file mode 100644 index 000000000000..e30f86d33836 --- /dev/null +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_hierarchy_settings.py @@ -0,0 +1,45 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.managementgroups import ManagementGroupsAPI + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-managementgroups +# USAGE + python patch_hierarchy_settings.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = ManagementGroupsAPI( + credential=DefaultAzureCredential(), + ) + + response = client.hierarchy_settings.update( + group_id="root", + create_tenant_settings_request={ + "properties": { + "defaultManagementGroup": "/providers/Microsoft.Management/managementGroups/DefaultGroup", + "requireAuthorizationForGroupCreation": True, + } + }, + ) + print(response) + + +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/PatchHierarchySettings.json +if __name__ == "__main__": + main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_management_group.py index 14a85c519473..b44f20304815 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/patch_management_group.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/PatchManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/PatchManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_hierarchy_settings.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_hierarchy_settings.py new file mode 100644 index 000000000000..e9d265b5745e --- /dev/null +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_hierarchy_settings.py @@ -0,0 +1,45 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.managementgroups import ManagementGroupsAPI + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-managementgroups +# USAGE + python put_hierarchy_settings.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = ManagementGroupsAPI( + credential=DefaultAzureCredential(), + ) + + response = client.hierarchy_settings.create_or_update( + group_id="root", + create_tenant_settings_request={ + "properties": { + "defaultManagementGroup": "/providers/Microsoft.Management/managementGroups/DefaultGroup", + "requireAuthorizationForGroupCreation": True, + } + }, + ) + print(response) + + +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/PutHierarchySettings.json +if __name__ == "__main__": + main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_management_group.py index aabd30662673..3d5ce0d97af2 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/put_management_group.py @@ -40,6 +40,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/PutManagementGroup.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/PutManagementGroup.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_subscription_from_management_group.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/remove_management_group_subscription.py similarity index 87% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_subscription_from_management_group.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/remove_management_group_subscription.py index 1915a4a85541..344cbc6f5aea 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/delete_subscription_from_management_group.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/remove_management_group_subscription.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python delete_subscription_from_management_group.py + python remove_management_group_subscription.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -28,13 +28,12 @@ def main(): credential=DefaultAzureCredential(), ) - response = client.management_group_subscriptions.delete( + client.management_group_subscriptions.delete( group_id="Group", subscription_id="728bcbe4-8d56-4510-86c2-4921b8beefbc", ) - print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/RemoveManagementGroupSubscription.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/RemoveManagementGroupSubscription.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill_request.py similarity index 92% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill_request.py index f5a2b9bcb862..f7059ed460c0 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/start_tenant_backfill_request.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python start_tenant_backfill.py + python start_tenant_backfill_request.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -32,6 +32,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/StartTenantBackfillRequest.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/StartTenantBackfillRequest.json if __name__ == "__main__": main() diff --git a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status.py b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status_request.py similarity index 92% rename from sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status.py rename to sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status_request.py index fc1370507a7d..c3963f92e9fc 100644 --- a/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status.py +++ b/sdk/managementgroups/azure-mgmt-managementgroups/generated_samples/tenant_backfill_status_request.py @@ -14,7 +14,7 @@ pip install azure-identity pip install azure-mgmt-managementgroups # USAGE - python tenant_backfill_status.py + python tenant_backfill_status_request.py Before run the sample, please set the values of the client ID, tenant ID and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, @@ -32,6 +32,6 @@ def main(): print(response) -# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/TenantBackfillStatusRequest.json +# x-ms-original-file: specification/managementgroups/resource-manager/Microsoft.Management/stable/2023-04-01/examples/TenantBackfillStatusRequest.json if __name__ == "__main__": main()