diff --git a/sdk/iothub/azure-mgmt-iothub/_meta.json b/sdk/iothub/azure-mgmt-iothub/_meta.json index 89e810bfbd5e..dd4e7ee4b1f0 100644 --- a/sdk/iothub/azure-mgmt-iothub/_meta.json +++ b/sdk/iothub/azure-mgmt-iothub/_meta.json @@ -1,11 +1,26 @@ { - "commit": "396209531039d3e211cb1ec0982606dbbdf64ac2", + "commit": "c268b7b1a60779900f77d8d5bcb141ff35c797fb", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest": "3.9.2", + "autorest": "3.9.7", "use": [ - "@autorest/python@6.4.3", - "@autorest/modelerfour@4.24.3" + "@autorest/python@6.7.1", + "@autorest/modelerfour@4.26.2" ], - "autorest_command": "autorest specification/iothub/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.3 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", - "readme": "specification/iothub/resource-manager/readme.md" + "autorest_command": "autorest specification/iothub/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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False", + "readme": "specification/iothub/resource-manager/readme.md", + "package-preview-2022-11": "2023-03-14 21:37:19 -0700 7e5861ad01a796a72617080e89e42f428e66242e Microsoft.Devices/preview/2022-11-15-preview/iothub.json", + "package-preview-2022-04-30": "2022-08-09 20:31:29 -0700 1f75c8b5d3f55387d6e07e7f2f879a88f529180d Microsoft.Devices/preview/2022-04-30-preview/iothub.json", + "package-2021-07-02": "2023-01-27 19:16:47 -0800 0b0f8d5b088da606ffbb8b2828dc366982f106e5 Microsoft.Devices/stable/2021-07-02/iothub.json", + "package-2021-07": "2023-01-27 19:16:47 -0800 0b0f8d5b088da606ffbb8b2828dc366982f106e5 Microsoft.Devices/stable/2021-07-02/iothub.json", + "package-2021-03": "2021-05-07 19:43:30 -0700 4b7dca50a9a7559865803927a87a06ad0d73ff06 Microsoft.Devices/stable/2021-03-31/iothub.json", + "package-preview-2021-03": "2021-04-05 22:04:32 -0700 2331a635ead0549b8c0f3891bf9bf2e5e5ad76bc Microsoft.Devices/preview/2021-03-03-preview/iothub.json", + "package-2020-03": "2021-05-05 01:19:33 -0700 8c76ee1ab76c977e1bdd4abc5369704684576111 Microsoft.Devices/stable/2020-03-01/iothub.json", + "package-2019-11": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2019-11-04/iothub.json", + "package-preview-2019-07": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/preview/2019-07-01-preview/iothub.json", + "package-2019-03": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2019-03-22/iothub.json", + "package-2018-04": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2018-04-01/iothub.json", + "package-2018-01": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2018-01-22/iothub.json", + "package-2017-07": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2017-07-01/iothub.json", + "package-2017-01": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2017-01-19/iothub.json", + "package-2016-02": "2021-04-27 02:22:18 -0700 8873dabb56a800c037ca56beab11dd5a9ed988ad Microsoft.Devices/stable/2016-02-03/iothub.json" } \ No newline at end of file diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_iot_hub_client.py index 755034c47738..8b3eeeb0cae7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_iot_hub_client.py @@ -71,6 +71,8 @@ def __init__( profile: KnownProfiles=KnownProfiles.default, **kwargs: Any ): + if api_version: + kwargs.setdefault('api_version', api_version) self._config = IotHubClientConfiguration(credential, subscription_id, **kwargs) self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) super(IotHubClient, self).__init__( @@ -197,7 +199,7 @@ def certificates(self): else: raise ValueError("API version {} does not have operation group 'certificates'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def iot_hub(self): @@ -238,7 +240,7 @@ def iot_hub(self): else: raise ValueError("API version {} does not have operation group 'iot_hub'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def iot_hub_resource(self): @@ -294,7 +296,7 @@ def iot_hub_resource(self): else: raise ValueError("API version {} does not have operation group 'iot_hub_resource'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def operations(self): @@ -344,7 +346,7 @@ def operations(self): else: raise ValueError("API version {} does not have operation group 'operations'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def private_endpoint_connections(self): @@ -376,7 +378,7 @@ def private_endpoint_connections(self): else: raise ValueError("API version {} does not have operation group 'private_endpoint_connections'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def private_link_resources(self): @@ -408,7 +410,7 @@ def private_link_resources(self): else: raise ValueError("API version {} does not have operation group 'private_link_resources'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def resource_provider_common(self): @@ -452,7 +454,7 @@ def resource_provider_common(self): else: raise ValueError("API version {} does not have operation group 'resource_provider_common'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) def close(self): self._client.close() diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_serialization.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_serialization.py index 25467dfc00bb..a00658b1fc19 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_serialization.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/_serialization.py @@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -664,8 +664,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs): _serialized.update(_new_attr) # type: ignore _new_attr = _new_attr[k] # type: ignore _serialized = _serialized[k] - except ValueError: - continue + except ValueError as err: + if isinstance(err, SerializationError): + raise except (AttributeError, KeyError, TypeError) as err: msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) @@ -743,6 +744,8 @@ def query(self, name, data, data_type, **kwargs): :param data: The data to be serialized. :param str data_type: The type to be serialized from. + :keyword bool skip_quote: Whether to skip quote the serialized result. + Defaults to False. :rtype: str :raises: TypeError if serialization fails. :raises: ValueError if data is None @@ -751,10 +754,8 @@ def query(self, name, data, data_type, **kwargs): # Treat the list aside, since we don't want to encode the div separator if data_type.startswith("["): internal_data_type = data_type[1:-1] - data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data] - if not kwargs.get("skip_quote", False): - data = [quote(str(d), safe="") for d in data] - return str(self.serialize_iter(data, internal_data_type, **kwargs)) + do_quote = not kwargs.get('skip_quote', False) + return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)) # Not a list, regular serialization output = self.serialize_data(data, data_type, **kwargs) @@ -893,6 +894,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs): not be None or empty. :param str div: If set, this str will be used to combine the elements in the iterable into a combined string. Default is 'None'. + :keyword bool do_quote: Whether to quote the serialized result of each iterable element. + Defaults to False. :rtype: list, str """ if isinstance(data, str): @@ -905,9 +908,18 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs): for d in data: try: serialized.append(self.serialize_data(d, iter_type, **kwargs)) - except ValueError: + except ValueError as err: + if isinstance(err, SerializationError): + raise serialized.append(None) + if kwargs.get('do_quote', False): + serialized = [ + '' if s is None else quote(str(s), safe='') + for s + in serialized + ] + if div: serialized = ["" if s is None else str(s) for s in serialized] serialized = div.join(serialized) @@ -952,7 +964,9 @@ def serialize_dict(self, attr, dict_type, **kwargs): for key, value in attr.items(): try: serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) - except ValueError: + except ValueError as err: + if isinstance(err, SerializationError): + raise serialized[self.serialize_unicode(key)] = None if "xml" in serialization_ctxt: @@ -1273,7 +1287,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 @@ -1297,7 +1311,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): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/aio/_iot_hub_client.py index 84e2ac460fe0..d9bfc84a362c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/aio/_iot_hub_client.py @@ -71,6 +71,8 @@ def __init__( profile: KnownProfiles = KnownProfiles.default, **kwargs: Any ) -> None: + if api_version: + kwargs.setdefault('api_version', api_version) self._config = IotHubClientConfiguration(credential, subscription_id, **kwargs) self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) super(IotHubClient, self).__init__( @@ -197,7 +199,7 @@ def certificates(self): else: raise ValueError("API version {} does not have operation group 'certificates'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def iot_hub(self): @@ -238,7 +240,7 @@ def iot_hub(self): else: raise ValueError("API version {} does not have operation group 'iot_hub'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def iot_hub_resource(self): @@ -294,7 +296,7 @@ def iot_hub_resource(self): else: raise ValueError("API version {} does not have operation group 'iot_hub_resource'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def operations(self): @@ -344,7 +346,7 @@ def operations(self): else: raise ValueError("API version {} does not have operation group 'operations'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def private_endpoint_connections(self): @@ -376,7 +378,7 @@ def private_endpoint_connections(self): else: raise ValueError("API version {} does not have operation group 'private_endpoint_connections'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def private_link_resources(self): @@ -408,7 +410,7 @@ def private_link_resources(self): else: raise ValueError("API version {} does not have operation group 'private_link_resources'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) @property def resource_provider_common(self): @@ -452,7 +454,7 @@ def resource_provider_common(self): else: raise ValueError("API version {} does not have operation group 'resource_provider_common'".format(api_version)) self._config.api_version = api_version - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version) async def close(self): await self._client.close() diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_configuration.py index 83e3cf977747..2bd099b647b0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", "2016-02-03") + api_version: str = kwargs.pop("api_version", "2016-02-03") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_iot_hub_client.py index 165f9173ddc2..bd57604d1c4a 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_iot_hub_client.py @@ -54,7 +54,9 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2016-02-03" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_configuration.py index fecc19feceaa..2a14e4e3cae1 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", "2016-02-03") + api_version: str = kwargs.pop("api_version", "2016-02-03") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_iot_hub_client.py index 1cb2d3b3dac5..fe379c896db3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/_iot_hub_client.py @@ -55,7 +55,9 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2016-02-03" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/operations/_iot_hub_resource_operations.py index 2650b53920fa..9d080ec80a47 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/aio/operations/_iot_hub_resource_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 @@ -53,10 +53,6 @@ build_list_keys_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -79,6 +75,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -106,7 +103,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -162,14 +159,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: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -343,7 +340,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -402,7 +399,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -478,7 +475,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -535,7 +532,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -624,7 +621,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -724,7 +721,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -784,7 +781,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -881,7 +878,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -988,7 +985,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1061,7 +1058,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1134,7 +1131,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1193,7 +1190,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1298,7 +1295,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1359,7 +1356,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1502,14 +1499,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1574,7 +1571,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -1679,7 +1676,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -1829,14 +1826,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -1990,14 +1987,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_iot_hub_client_enums.py index d36ac303bb1f..dfcfe92b4aa7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_iot_hub_client_enums.py @@ -101,6 +101,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class OperationMonitoringLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_models_py3.py index f5a423435543..d1c62bb56a20 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/models/_models_py3.py @@ -967,7 +967,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2016_02_03.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/operations/_iot_hub_resource_operations.py index 663ef287e4e7..e877bae44dbc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2016_02_03/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json, text/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -112,7 +108,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -126,7 +122,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -141,7 +137,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -150,7 +146,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -165,7 +161,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -178,7 +174,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -195,7 +191,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -209,7 +205,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -226,7 +222,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -240,7 +236,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -257,7 +253,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -272,7 +268,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -294,7 +290,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -310,7 +306,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -332,7 +328,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -348,7 +344,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -370,7 +366,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -386,7 +382,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -403,7 +399,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -417,7 +413,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -434,7 +430,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -449,7 +445,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -466,7 +462,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -480,7 +476,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -495,7 +491,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json, text/json") @@ -507,7 +503,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -526,7 +522,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -540,7 +536,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -557,7 +553,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) accept = _headers.pop("Accept", "application/json, text/json") # Construct URL @@ -572,7 +568,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -589,7 +585,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json, text/json") @@ -604,7 +600,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -623,7 +619,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json, text/json") @@ -638,7 +634,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -669,6 +665,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -696,7 +693,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -752,14 +749,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -930,7 +927,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -989,7 +986,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1064,7 +1061,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1120,7 +1117,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1206,7 +1203,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1304,7 +1301,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1364,7 +1361,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1461,7 +1458,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1568,7 +1565,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1641,7 +1638,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1714,7 +1711,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1770,7 +1767,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1873,7 +1870,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1934,7 +1931,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2077,14 +2074,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2149,7 +2146,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2254,7 +2251,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2404,14 +2401,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2565,14 +2562,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2016-02-03"] = kwargs.pop("api_version", _params.pop("api-version", "2016-02-03")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-02-03")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_configuration.py index 2c7d4dfbbf14..14db50baaf02 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", "2017-01-19") + api_version: str = kwargs.pop("api_version", "2017-01-19") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_iot_hub_client.py index 2da1f2d62936..d3dc2179b9cd 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_iot_hub_client.py @@ -54,7 +54,9 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-01-19" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_configuration.py index 43001a34920d..ff1cd674b074 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", "2017-01-19") + api_version: str = kwargs.pop("api_version", "2017-01-19") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_iot_hub_client.py index 7de77c63d16f..58f52f97d220 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/_iot_hub_client.py @@ -55,7 +55,9 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-01-19" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/operations/_iot_hub_resource_operations.py index cd4b3e2a1c08..e57a591a8718 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/aio/operations/_iot_hub_resource_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 @@ -53,10 +53,6 @@ build_list_keys_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -79,6 +75,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -106,7 +103,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -162,14 +159,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: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -343,7 +340,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -402,7 +399,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -478,7 +475,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -535,7 +532,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -624,7 +621,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -724,7 +721,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -784,7 +781,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -881,7 +878,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -988,7 +985,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1061,7 +1058,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1134,7 +1131,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1193,7 +1190,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1298,7 +1295,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1359,7 +1356,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1502,14 +1499,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1574,7 +1571,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -1679,7 +1676,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -1829,14 +1826,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -1990,14 +1987,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_iot_hub_client_enums.py index ab000036578c..ce288bade6cc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_iot_hub_client_enums.py @@ -101,6 +101,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class OperationMonitoringLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_models_py3.py index d6c0d7659470..cae982bc098d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/models/_models_py3.py @@ -1043,7 +1043,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2017_01_19.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/operations/_iot_hub_resource_operations.py index 8c16279e0753..0d9a4acea497 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_01_19/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -112,7 +108,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -126,7 +122,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -141,7 +137,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -150,7 +146,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -165,7 +161,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -195,7 +191,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -209,7 +205,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -226,7 +222,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -240,7 +236,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -257,7 +253,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -272,7 +268,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -294,7 +290,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -310,7 +306,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -332,7 +328,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -348,7 +344,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -370,7 +366,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -386,7 +382,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -403,7 +399,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -417,7 +413,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -434,7 +430,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -449,7 +445,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -466,7 +462,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -480,7 +476,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -495,7 +491,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -507,7 +503,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -526,7 +522,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -540,7 +536,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -557,7 +553,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -572,7 +568,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -589,7 +585,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -604,7 +600,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -623,7 +619,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -638,7 +634,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -669,6 +665,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -696,7 +693,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -752,14 +749,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -930,7 +927,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -989,7 +986,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1064,7 +1061,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1120,7 +1117,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1206,7 +1203,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1304,7 +1301,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1364,7 +1361,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1461,7 +1458,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1568,7 +1565,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1641,7 +1638,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1714,7 +1711,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1770,7 +1767,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1873,7 +1870,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1934,7 +1931,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2077,14 +2074,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2149,7 +2146,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2254,7 +2251,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2404,14 +2401,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2565,14 +2562,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-01-19"] = kwargs.pop("api_version", _params.pop("api-version", "2017-01-19")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-01-19")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_configuration.py index e38ae7135670..2cbd20a90d16 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", "2017-07-01") + api_version: str = kwargs.pop("api_version", "2017-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_iot_hub_client.py index d8c2715c89f7..eaa5568b5a6a 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_iot_hub_client.py @@ -58,9 +58,13 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2017-07-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-07-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-07-01" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_configuration.py index 584edefb0edc..6a55dc4d60e2 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", "2017-07-01") + api_version: str = kwargs.pop("api_version", "2017-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_iot_hub_client.py index 734f65b30fb6..3e74f2ff9349 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/_iot_hub_client.py @@ -59,9 +59,13 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2017-07-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-07-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2017-07-01" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_certificates_operations.py index 65ec7a769018..97469d71e00d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_iot_hub_resource_operations.py index d526db87ba85..83b4b5f9128f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_iot_hub_resource_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 @@ -53,10 +53,6 @@ build_list_keys_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -79,6 +75,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -106,7 +103,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -163,14 +160,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: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -357,7 +354,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -417,7 +414,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -493,7 +490,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -550,7 +547,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -638,7 +635,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -738,7 +735,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -798,7 +795,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -895,7 +892,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1002,7 +999,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1075,7 +1072,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1148,7 +1145,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1207,7 +1204,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1312,7 +1309,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1373,7 +1370,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1516,14 +1513,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1588,7 +1585,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -1693,7 +1690,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -1843,14 +1840,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2004,14 +2001,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_operations.py index 56b9cce358b9..0edb08373f8a 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_iot_hub_client_enums.py index ab000036578c..ce288bade6cc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_iot_hub_client_enums.py @@ -101,6 +101,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class OperationMonitoringLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_models_py3.py index 15965b3e1fe9..db97f7070cc3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/models/_models_py3.py @@ -1302,7 +1302,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2017_07_01.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_certificates_operations.py index 4094acf3c9d4..075fb4da87dc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_iot_hub_resource_operations.py index 8c3f68fa6175..7e02bef480f3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -128,7 +124,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -143,7 +139,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -152,7 +148,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,7 +163,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -180,7 +176,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -197,7 +193,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -211,7 +207,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -228,7 +224,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -242,7 +238,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -259,7 +255,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -274,7 +270,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -296,7 +292,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -312,7 +308,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -334,7 +330,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -350,7 +346,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -372,7 +368,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -388,7 +384,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -405,7 +401,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -419,7 +415,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -436,7 +432,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -451,7 +447,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -468,7 +464,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -482,7 +478,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -497,7 +493,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -509,7 +505,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -528,7 +524,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -542,7 +538,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -559,7 +555,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -574,7 +570,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -591,7 +587,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -606,7 +602,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -625,7 +621,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -640,7 +636,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -671,6 +667,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -698,7 +695,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -755,14 +752,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -946,7 +943,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1006,7 +1003,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1081,7 +1078,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1137,7 +1134,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1222,7 +1219,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1320,7 +1317,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1380,7 +1377,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1477,7 +1474,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1584,7 +1581,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1657,7 +1654,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1730,7 +1727,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1786,7 +1783,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1889,7 +1886,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1950,7 +1947,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2093,14 +2090,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2165,7 +2162,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2270,7 +2267,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2420,14 +2417,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2581,14 +2578,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_operations.py index 95cf125e0b0a..1dc093f8c3c9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2017_07_01/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 _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: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2017-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2017-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-07-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_configuration.py index c70e009c1afa..670b711f8e9f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", "2018-01-22") + api_version: str = kwargs.pop("api_version", "2018-01-22") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_iot_hub_client.py index ed611ac054d0..4d1f8dcd91ef 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_iot_hub_client.py @@ -58,9 +58,13 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-01-22") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-01-22" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-01-22" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_configuration.py index 48dd29af1cd4..499e0bcd128b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", "2018-01-22") + api_version: str = kwargs.pop("api_version", "2018-01-22") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_iot_hub_client.py index c4fdb6296e3b..3bd23ee6cdf7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/_iot_hub_client.py @@ -59,9 +59,13 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-01-22") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-01-22" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-01-22" + ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_certificates_operations.py index de520fdd801f..ea6bd33cce08 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_iot_hub_resource_operations.py index 81d9f20727d6..312ffa52056f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_iot_hub_resource_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 @@ -54,10 +54,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -80,6 +76,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -107,7 +104,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -164,14 +161,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: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -358,7 +355,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -418,14 +415,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -578,7 +575,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -637,7 +634,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -713,7 +710,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -770,7 +767,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -858,7 +855,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -958,7 +955,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1018,7 +1015,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1117,7 +1114,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1224,7 +1221,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1297,7 +1294,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1370,7 +1367,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1429,7 +1426,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1534,7 +1531,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1595,7 +1592,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1738,14 +1735,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1810,7 +1807,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -1915,7 +1912,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2065,14 +2062,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2226,14 +2223,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_operations.py index 98cc00e63bf4..0f18d766dcba 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_iot_hub_client_enums.py index ab000036578c..ce288bade6cc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_iot_hub_client_enums.py @@ -101,6 +101,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class OperationMonitoringLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_models_py3.py index 92f2b0b2eb5d..1c8a1aaabfdc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/models/_models_py3.py @@ -1303,7 +1303,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2018_01_22.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_certificates_operations.py index c3944bbc8a15..39bde7faf1a7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_iot_hub_resource_operations.py index 5d6bd7e16a7d..a7bb49bb5855 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -384,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -406,7 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -422,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -439,7 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -453,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -470,7 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -485,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -502,7 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -531,7 +527,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -543,7 +539,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -562,7 +558,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -576,7 +572,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -593,7 +589,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -608,7 +604,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -625,7 +621,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -640,7 +636,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -659,7 +655,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -674,7 +670,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -705,6 +701,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -732,7 +729,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -789,14 +786,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -980,7 +977,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1040,14 +1037,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1197,7 +1194,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1256,7 +1253,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1331,7 +1328,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1387,7 +1384,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1472,7 +1469,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1570,7 +1567,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1630,7 +1627,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1729,7 +1726,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1836,7 +1833,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1909,7 +1906,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1982,7 +1979,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2038,7 +2035,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2141,7 +2138,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2202,7 +2199,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2345,14 +2342,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2417,7 +2414,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2522,7 +2519,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2672,14 +2669,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2833,14 +2830,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_operations.py index 789e9ed4d68f..901d6096ccd3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_01_22/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 _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: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-01-22"] = kwargs.pop("api_version", _params.pop("api-version", "2018-01-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-01-22")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_configuration.py index b45f2e6a7f39..5445c0c1aef4 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", "2018-04-01") + api_version: str = kwargs.pop("api_version", "2018-04-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_iot_hub_client.py index 22ad5713296c..a2b280475f1f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_iot_hub_client.py @@ -61,12 +61,16 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-04-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_configuration.py index 5ed4bc5e6cc4..4220d50e8457 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", "2018-04-01") + api_version: str = kwargs.pop("api_version", "2018-04-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_iot_hub_client.py index 9a97ebde0490..765e8162fa96 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/_iot_hub_client.py @@ -62,12 +62,16 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2018-04-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2018-04-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_certificates_operations.py index f27971b407fa..4e449e5348e2 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_iot_hub_resource_operations.py index bea23e695650..b5b8299c85e3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1300,7 +1297,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1373,7 +1370,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1432,7 +1429,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1537,7 +1534,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1598,7 +1595,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1692,7 +1689,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1835,14 +1832,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1975,14 +1972,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2117,14 +2114,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2191,7 +2188,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2296,7 +2293,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2446,14 +2443,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2607,14 +2604,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_operations.py index 1697a622b9cf..ca06dfb055ae 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_resource_provider_common_operations.py index 3ad7fb5cc95f..ee2319a71eee 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_iot_hub_client_enums.py index 6331d5811554..ae98567cc465 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_iot_hub_client_enums.py @@ -114,6 +114,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class OperationMonitoringLevel(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_models_py3.py index 2d559720c36d..d2c01665a5f5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/models/_models_py3.py @@ -1389,7 +1389,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2018_04_01.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_certificates_operations.py index 3d335ee31bde..424dfeac9b0d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_iot_hub_resource_operations.py index 7d1d2f3ff826..e3b14cf0c143 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -384,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -406,7 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -422,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -439,7 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -453,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -470,7 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -485,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -502,7 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,7 +529,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -547,7 +543,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -562,7 +558,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -574,7 +570,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -593,7 +589,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -608,7 +604,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -627,7 +623,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -642,7 +638,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -661,7 +657,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -675,7 +671,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -692,7 +688,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -707,7 +703,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -724,7 +720,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -739,7 +735,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -758,7 +754,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -773,7 +769,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -804,6 +800,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -831,7 +828,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -888,14 +885,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1079,7 +1076,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1139,14 +1136,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1296,7 +1293,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1355,7 +1352,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1430,7 +1427,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1486,7 +1483,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1571,7 +1568,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1669,7 +1666,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1729,7 +1726,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1828,7 +1825,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1935,7 +1932,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2008,7 +2005,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -2081,7 +2078,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2137,7 +2134,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2240,7 +2237,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2301,7 +2298,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2537,14 +2534,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2677,14 +2674,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2819,14 +2816,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2893,7 +2890,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2998,7 +2995,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3148,14 +3145,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3309,14 +3306,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_operations.py index 03bef3960b7d..b721f6e37854 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/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 _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: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_resource_provider_common_operations.py index fe69fbc47469..3e4287e6951b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2018_04_01/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2018-04-01"] = kwargs.pop("api_version", _params.pop("api-version", "2018-04-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-04-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_configuration.py index 1652a7a9b244..74a45bbfe2f8 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", "2019-03-22") + api_version: str = kwargs.pop("api_version", "2019-03-22") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_iot_hub_client.py index b97447bc727a..da55c6371aa9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_iot_hub_client.py @@ -69,13 +69,17 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2019-03-22") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2019-03-22") def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_configuration.py index 02cbb7971fcf..c28354bb6ea1 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", "2019-03-22") + api_version: str = kwargs.pop("api_version", "2019-03-22") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_iot_hub_client.py index f7049cab0d2b..769a87917628 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/_iot_hub_client.py @@ -70,13 +70,17 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2019-03-22") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-03-22" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2019-03-22") def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_certificates_operations.py index 88315007ea70..c9bd39673aa8 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_operations.py index ec91b13b794b..0fdb6927fb6f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_resource_operations.py index 2e0a8f603b15..1b2907d7ffe4 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1300,7 +1297,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1373,7 +1370,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1432,7 +1429,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1537,7 +1534,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1598,7 +1595,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1692,7 +1689,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1835,14 +1832,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1975,14 +1972,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2117,14 +2114,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2191,7 +2188,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2296,7 +2293,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2446,14 +2443,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2607,14 +2604,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_operations.py index 59a83418bc59..2ceede85cd65 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_resource_provider_common_operations.py index daae2f92d08d..63c74bf05c60 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_iot_hub_client_enums.py index e59777721cda..2a2b2ef64ffa 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_iot_hub_client_enums.py @@ -133,6 +133,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class RouteErrorSeverity(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_models_py3.py index d9ee18b34cb8..427425db95dd 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/models/_models_py3.py @@ -1456,7 +1456,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2019_03_22.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_certificates_operations.py index 81c6c5b2665a..64d6ff335fe5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_operations.py index d3824f2a2512..dd27a483a98d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_resource_operations.py index 10180611fcbd..0ab5cd2bd40e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -384,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -406,7 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -422,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -439,7 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -453,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -470,7 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -485,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -502,7 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,7 +529,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -547,7 +543,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -562,7 +558,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -574,7 +570,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -593,7 +589,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -608,7 +604,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -627,7 +623,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -642,7 +638,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -661,7 +657,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -675,7 +671,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -692,7 +688,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -707,7 +703,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -724,7 +720,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -739,7 +735,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -758,7 +754,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -773,7 +769,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -804,6 +800,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -831,7 +828,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -888,14 +885,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1079,7 +1076,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1139,14 +1136,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1296,7 +1293,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1355,7 +1352,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1430,7 +1427,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1486,7 +1483,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1571,7 +1568,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1669,7 +1666,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1729,7 +1726,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1828,7 +1825,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1935,7 +1932,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2008,7 +2005,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -2081,7 +2078,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2137,7 +2134,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2240,7 +2237,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2301,7 +2298,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2537,14 +2534,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2677,14 +2674,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2819,14 +2816,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2893,7 +2890,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2998,7 +2995,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3148,14 +3145,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3309,14 +3306,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_operations.py index 7f46e2b67b03..c0cab2bb5252 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/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 _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: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_resource_provider_common_operations.py index 01aac4672da3..1c17604cf5f7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_03_22/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-03-22"] = kwargs.pop("api_version", _params.pop("api-version", "2019-03-22")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-03-22")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_configuration.py index 2fac9d2365e6..cbc572e65322 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-07-01-preview"] = kwargs.pop("api_version", "2019-07-01-preview") + api_version: str = kwargs.pop("api_version", "2019-07-01-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_iot_hub_client.py index 024e9cbf8ed5..fabd9ee4a2e9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_iot_hub_client.py @@ -70,13 +70,21 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_configuration.py index 132f273707f0..fcfc753fca1b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-07-01-preview"] = kwargs.pop("api_version", "2019-07-01-preview") + api_version: str = kwargs.pop("api_version", "2019-07-01-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_iot_hub_client.py index 659996fd640e..f254aabaa925 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/_iot_hub_client.py @@ -71,13 +71,21 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-07-01-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_certificates_operations.py index e0deb2b2b954..4702ae38700b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,8 +87,8 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -320,8 +317,8 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -329,7 +326,7 @@ async def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -410,8 +407,8 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -481,8 +478,8 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -642,8 +639,8 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -651,7 +648,7 @@ async def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_operations.py index f12309280864..ae54b25c900f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,8 +72,8 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -84,7 +81,7 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -232,8 +229,8 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_resource_operations.py index a2555506cd20..c2c9f047901e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,8 +107,8 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -169,8 +166,8 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -178,7 +175,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -366,8 +363,8 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -428,8 +425,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -437,7 +434,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -590,8 +587,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -651,8 +648,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -730,8 +727,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -789,8 +786,8 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -879,8 +876,8 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -981,8 +978,8 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1043,8 +1040,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1144,8 +1141,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -1253,8 +1250,8 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1328,8 +1325,8 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1403,8 +1400,8 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -1464,8 +1461,8 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -1571,8 +1568,8 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -1634,8 +1631,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -1730,8 +1727,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -1875,8 +1872,8 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -1884,7 +1881,7 @@ async def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2017,8 +2014,8 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2026,7 +2023,7 @@ async def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2161,8 +2158,8 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -2170,7 +2167,7 @@ async def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2237,8 +2234,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -2344,8 +2341,8 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -2497,8 +2494,8 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2506,7 +2503,7 @@ async def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2661,8 +2658,8 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2670,7 +2667,7 @@ async def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_operations.py index 7b03befad2e7..d4891c414712 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,8 +66,8 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_resource_provider_common_operations.py index 8abb83f074a2..6c5274a0d342 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,8 +73,8 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_iot_hub_client_enums.py index 35977cfabec3..d348e72d3242 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_iot_hub_client_enums.py @@ -130,6 +130,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class RouteErrorSeverity(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_models_py3.py index 48be276791f9..7e6adeff804a 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/models/_models_py3.py @@ -1530,7 +1530,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2019_07_01_preview.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_certificates_operations.py index b34a874069c5..fd00cfa5b1a5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -97,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,9 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -140,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,9 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -229,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -253,9 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -273,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -305,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -334,8 +319,8 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -404,8 +389,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -564,8 +549,8 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -573,7 +558,7 @@ def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -654,8 +639,8 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -725,8 +710,8 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -886,8 +871,8 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -895,7 +880,7 @@ def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_operations.py index 39c8a12576b2..c8f48d8848f1 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -64,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -95,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -114,8 +109,8 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -123,7 +118,7 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -271,8 +266,8 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_resource_operations.py index 3fff2f65c14d..d57fafb87215 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -80,9 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -97,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -118,9 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -135,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -154,9 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -170,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -185,9 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -196,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -211,9 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -226,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,9 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -259,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -276,9 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -292,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -309,9 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -326,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -348,9 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -366,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -388,9 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -406,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -428,9 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -446,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -463,9 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -479,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -496,9 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -513,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -530,9 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -546,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -563,9 +529,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -579,7 +543,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -594,9 +558,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -608,7 +570,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -627,9 +589,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -644,7 +604,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -663,9 +623,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -680,7 +638,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -699,9 +657,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -715,7 +671,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -732,9 +688,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -749,7 +703,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -766,9 +720,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -783,7 +735,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -802,9 +754,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -819,7 +769,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -850,6 +800,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -877,8 +828,8 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -936,8 +887,8 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -945,7 +896,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1133,8 +1084,8 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1195,8 +1146,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1204,7 +1155,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1357,8 +1308,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1418,8 +1369,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -1496,8 +1447,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1555,8 +1506,8 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1643,8 +1594,8 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1743,8 +1694,8 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1805,8 +1756,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1906,8 +1857,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -2015,8 +1966,8 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2090,8 +2041,8 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2165,8 +2116,8 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -2223,8 +2174,8 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -2328,8 +2279,8 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2391,8 +2342,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -2487,8 +2438,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -2632,8 +2583,8 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -2641,7 +2592,7 @@ def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2774,8 +2725,8 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2783,7 +2734,7 @@ def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2918,8 +2869,8 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -2927,7 +2878,7 @@ def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2994,8 +2945,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -3101,8 +3052,8 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -3254,8 +3205,8 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3263,7 +3214,7 @@ def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3418,8 +3369,8 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3427,7 +3378,7 @@ def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_operations.py index d8289d74242f..9a39f7b161d3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/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 _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,9 +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: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -93,8 +87,8 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_resource_provider_common_operations.py index b70b072a6734..73e17c0a9e8b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_07_01_preview/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-07-01-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -54,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -83,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -106,8 +100,8 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-07-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2019-07-01-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2019-07-01-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_configuration.py index 30b6bfd41547..70ebec4213b5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", "2019-11-04") + api_version: str = kwargs.pop("api_version", "2019-11-04") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_iot_hub_client.py index b2b88890047e..395f3e50c2fe 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_iot_hub_client.py @@ -69,13 +69,17 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2019-11-04") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2019-11-04") def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_configuration.py index 48384170c1d7..fa5d535c37cf 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", "2019-11-04") + api_version: str = kwargs.pop("api_version", "2019-11-04") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_iot_hub_client.py index 8624d0a8e0e1..ce58461dd33f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/_iot_hub_client.py @@ -70,13 +70,17 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2019-11-04") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2019-11-04" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2019-11-04") def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_certificates_operations.py index 3eb32dbc6936..2888458c3857 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_operations.py index 12052b01a526..b08dd921016d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_resource_operations.py index ac5d608520c0..5e714c02e6cc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1300,7 +1297,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1373,7 +1370,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1432,7 +1429,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1537,7 +1534,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1598,7 +1595,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1692,7 +1689,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1835,14 +1832,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1975,14 +1972,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2117,14 +2114,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2191,7 +2188,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2296,7 +2293,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2446,14 +2443,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2607,14 +2604,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_operations.py index 692c84a6afa0..bbde0f217924 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_resource_provider_common_operations.py index a65eca2da694..e7954150fdae 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_iot_hub_client_enums.py index e59777721cda..2a2b2ef64ffa 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_iot_hub_client_enums.py @@ -133,6 +133,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class RouteErrorSeverity(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_models_py3.py index 0c47213e5270..b7fabb8d6652 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/models/_models_py3.py @@ -1498,7 +1498,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2019_11_04.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_certificates_operations.py index 91e377764807..bc59c177c8a1 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_operations.py index 921820b71dbf..e5b73a4f47d7 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_resource_operations.py index 51d41fe52430..6561f4713497 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -384,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -406,7 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -422,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -439,7 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -453,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -470,7 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -485,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -502,7 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,7 +529,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -547,7 +543,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -562,7 +558,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -574,7 +570,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -593,7 +589,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -608,7 +604,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -627,7 +623,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -642,7 +638,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -661,7 +657,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -675,7 +671,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -692,7 +688,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -707,7 +703,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -724,7 +720,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -739,7 +735,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -758,7 +754,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -773,7 +769,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -804,6 +800,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -831,7 +828,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -888,14 +885,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1079,7 +1076,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1139,14 +1136,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1296,7 +1293,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1355,7 +1352,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1430,7 +1427,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1486,7 +1483,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1571,7 +1568,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1669,7 +1666,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1729,7 +1726,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1828,7 +1825,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1935,7 +1932,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2008,7 +2005,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -2081,7 +2078,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2137,7 +2134,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2240,7 +2237,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2301,7 +2298,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2537,14 +2534,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2677,14 +2674,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2819,14 +2816,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2893,7 +2890,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2998,7 +2995,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3148,14 +3145,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3309,14 +3306,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_operations.py index 803f3276d616..555a7f665e02 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/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 _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: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_resource_provider_common_operations.py index 7c7ea00bd940..69f67e3b836e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2019_11_04/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2019-11-04"] = kwargs.pop("api_version", _params.pop("api-version", "2019-11-04")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-11-04")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_configuration.py index 28592c37893e..7f588d0b3874 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", "2020-03-01") + api_version: str = kwargs.pop("api_version", "2020-03-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_iot_hub_client.py index 30641876e9b9..2c572660d7c3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_iot_hub_client.py @@ -77,18 +77,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2020-03-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2020-03-01") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_configuration.py index 308f9e521dc1..5d09ed364855 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", "2020-03-01") + api_version: str = kwargs.pop("api_version", "2020-03-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_iot_hub_client.py index 07823d7af8bf..6d5c11f73219 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/_iot_hub_client.py @@ -78,18 +78,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2020-03-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2020-03-01") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2020-03-01" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_certificates_operations.py index 42eae5610a37..c8632d7450f9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_operations.py index 082565e3380b..ebdb41af1982 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_resource_operations.py index 63544e33c0ec..ed36608ee9a5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1300,7 +1297,7 @@ async def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -1373,7 +1370,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1432,7 +1429,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1537,7 +1534,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1598,7 +1595,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1692,7 +1689,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1835,14 +1832,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -1975,14 +1972,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2117,14 +2114,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2191,7 +2188,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2296,7 +2293,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2446,14 +2443,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2607,14 +2604,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_operations.py index 99269c14696f..de642df03a74 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_endpoint_connections_operations.py index afa0c1eb4dec..3fbe4eb0f5c5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,7 +87,7 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -216,14 +213,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -399,7 +396,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -459,7 +456,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -534,7 +531,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_link_resources_operations.py index 9d141195b166..f1281326b9cd 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,7 +77,7 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -149,7 +145,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_resource_provider_common_operations.py index 049c87f2bb8a..c4be640fcd00 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_iot_hub_client_enums.py index c2b9398b02fd..79720b8e1e8d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_iot_hub_client_enums.py @@ -140,6 +140,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class PrivateLinkServiceConnectionStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_models_py3.py index 55d78598294e..d4daddb20061 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/models/_models_py3.py @@ -1665,7 +1665,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2020_03_01.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_certificates_operations.py index 119f00357707..dd89c491fd5f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateBodyDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_operations.py index 4ae4b10bc90d..2ece5df38a2b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_resource_operations.py index 645b5628748d..a0282abe3fbf 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -384,7 +380,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -406,7 +402,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -422,7 +418,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -439,7 +435,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -453,7 +449,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -470,7 +466,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -485,7 +481,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -502,7 +498,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +512,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,7 +529,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -547,7 +543,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -562,7 +558,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -574,7 +570,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -593,7 +589,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -608,7 +604,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -627,7 +623,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -642,7 +638,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -661,7 +657,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -675,7 +671,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -692,7 +688,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -707,7 +703,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -724,7 +720,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -739,7 +735,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -758,7 +754,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -773,7 +769,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -804,6 +800,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -831,7 +828,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -888,14 +885,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1079,7 +1076,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1139,14 +1136,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1296,7 +1293,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1355,7 +1352,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1430,7 +1427,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1486,7 +1483,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1571,7 +1568,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1669,7 +1666,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1729,7 +1726,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1828,7 +1825,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1935,7 +1932,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2008,7 +2005,7 @@ def create_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_create_event_hub_consumer_group_request( @@ -2081,7 +2078,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2137,7 +2134,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2240,7 +2237,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2301,7 +2298,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2537,14 +2534,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2677,14 +2674,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2819,14 +2816,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2893,7 +2890,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2998,7 +2995,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3148,14 +3145,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3309,14 +3306,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_operations.py index ca502b509ad4..732bab62ae02 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/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 _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: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_endpoint_connections_operations.py index 7ba30dfcb432..bd1330a1960a 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,7 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -138,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -207,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -236,7 +233,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -304,7 +301,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -362,14 +359,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -545,7 +542,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -605,7 +602,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -680,7 +677,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_link_resources_operations.py index ea3002a3de7e..68ae270ceac9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -147,7 +143,7 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -215,7 +211,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_resource_provider_common_operations.py index b759deb4b7c8..b512f8115173 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2020_03_01/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2020-03-01"] = kwargs.pop("api_version", _params.pop("api-version", "2020-03-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2020-03-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_configuration.py index 28a068897dd5..8fb9e914e732 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-03-03-preview"] = kwargs.pop("api_version", "2021-03-03-preview") + api_version: str = kwargs.pop("api_version", "2021-03-03-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_iot_hub_client.py index f3b52f38407b..0381c046d4e5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_iot_hub_client.py @@ -78,18 +78,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_configuration.py index 4c79a7fffbcb..e18805b40afc 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-03-03-preview"] = kwargs.pop("api_version", "2021-03-03-preview") + api_version: str = kwargs.pop("api_version", "2021-03-03-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_iot_hub_client.py index 3c5764fab43f..adfddddde828 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/_iot_hub_client.py @@ -79,18 +79,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-03-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_certificates_operations.py index 828fc8913839..a1909fb788e9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,8 +87,8 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -320,8 +317,8 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -329,7 +326,7 @@ async def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -410,8 +407,8 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -481,8 +478,8 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -642,8 +639,8 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -651,7 +648,7 @@ async def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_operations.py index e0f21467306d..b00cd27528f5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,8 +72,8 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -84,7 +81,7 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -243,8 +240,8 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_resource_operations.py index 3c4f31a090bc..4ff21797502d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,8 +107,8 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -169,8 +166,8 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -178,7 +175,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -360,8 +357,8 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -422,8 +419,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -431,7 +428,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -584,8 +581,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -645,8 +642,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -724,8 +721,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -783,8 +780,8 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -873,8 +870,8 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -975,8 +972,8 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1037,8 +1034,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1138,8 +1135,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -1247,8 +1244,8 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1408,8 +1405,8 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1417,7 +1414,7 @@ async def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1495,8 +1492,8 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -1556,8 +1553,8 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -1663,8 +1660,8 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -1726,8 +1723,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -1822,8 +1819,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -1967,8 +1964,8 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -1976,7 +1973,7 @@ async def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2109,8 +2106,8 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2118,7 +2115,7 @@ async def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2253,8 +2250,8 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -2262,7 +2259,7 @@ async def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2329,8 +2326,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -2436,8 +2433,8 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -2589,8 +2586,8 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2598,7 +2595,7 @@ async def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2753,8 +2750,8 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2762,7 +2759,7 @@ async def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_operations.py index 85a38f9a08f0..f6586471b6d0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,8 +66,8 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_endpoint_connections_operations.py index 9539dfaa9da4..e09814ee2651 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,8 +87,8 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -220,8 +217,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -229,7 +226,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -405,8 +402,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -467,8 +464,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -544,8 +541,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_link_resources_operations.py index df8ebb87ebdf..bf8840492bcf 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,8 +77,8 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -151,8 +147,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_resource_provider_common_operations.py index d1f153943e75..79692353d928 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,8 +73,8 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_iot_hub_client_enums.py index ee6a65a17273..4bc2b2973e9c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_iot_hub_client_enums.py @@ -148,6 +148,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_models_py3.py index 590069a2e493..bb0040fc2cd1 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/models/_models_py3.py @@ -1935,7 +1935,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2021_03_03_preview.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_certificates_operations.py index f294cc0f17f1..024138b7b246 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -97,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,9 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -140,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,9 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -229,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -253,9 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -273,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -305,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -334,8 +319,8 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -404,8 +389,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -564,8 +549,8 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -573,7 +558,7 @@ def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -654,8 +639,8 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -725,8 +710,8 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -886,8 +871,8 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -895,7 +880,7 @@ def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_operations.py index c54a23df4635..ca854ed4cef6 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -64,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -95,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -114,8 +109,8 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -123,7 +118,7 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -282,8 +277,8 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_resource_operations.py index 20744b885f42..b9441588d65e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -80,9 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -97,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -118,9 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -135,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -154,9 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -170,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -185,9 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -196,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -211,9 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -226,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,9 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -259,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -276,9 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -292,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -309,9 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -326,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -348,9 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -366,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -388,9 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -407,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -431,9 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -449,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -466,9 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -482,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -499,9 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,9 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -549,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -566,9 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -582,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -597,9 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,9 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -647,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -666,9 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -683,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -702,9 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -718,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -735,9 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -752,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -769,9 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -786,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -805,9 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -822,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -853,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -880,8 +831,8 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -939,8 +890,8 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -948,7 +899,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1130,8 +1081,8 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1192,8 +1143,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1201,7 +1152,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1354,8 +1305,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1415,8 +1366,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -1493,8 +1444,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1552,8 +1503,8 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1640,8 +1591,8 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1740,8 +1691,8 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1802,8 +1753,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1903,8 +1854,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -2012,8 +1963,8 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2173,8 +2124,8 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2182,7 +2133,7 @@ def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2260,8 +2211,8 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -2318,8 +2269,8 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -2423,8 +2374,8 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2486,8 +2437,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -2582,8 +2533,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -2727,8 +2678,8 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -2736,7 +2687,7 @@ def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2869,8 +2820,8 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2878,7 +2829,7 @@ def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -3013,8 +2964,8 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -3022,7 +2973,7 @@ def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -3089,8 +3040,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -3196,8 +3147,8 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -3349,8 +3300,8 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3358,7 +3309,7 @@ def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3513,8 +3464,8 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3522,7 +3473,7 @@ def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_operations.py index 7b56cfcfd859..f35d807fb90e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/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 _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,9 +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: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -93,8 +87,8 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_endpoint_connections_operations.py index a894f9dc221e..24223692dfdd 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -84,9 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -103,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,9 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -144,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -215,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -244,8 +233,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -314,8 +303,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -374,8 +363,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -383,7 +372,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -559,8 +548,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -621,8 +610,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -698,8 +687,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_link_resources_operations.py index b3d57c92b90b..32163dfede1f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +40,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -151,8 +143,8 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -221,8 +213,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_resource_provider_common_operations.py index 9d50f7401bac..2b5f4c3b9851 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_03_preview/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-03-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -54,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -83,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -106,8 +100,8 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-03-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2021-03-03-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2021-03-03-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_configuration.py index dd7091ed780e..0ecb3d75836c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", "2021-03-31") + api_version: str = kwargs.pop("api_version", "2021-03-31") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_iot_hub_client.py index ac53f968910c..3bc7d3ada88d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_iot_hub_client.py @@ -77,18 +77,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-03-31") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-03-31") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_configuration.py index bb36811bb171..804d5a3a2545 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", "2021-03-31") + api_version: str = kwargs.pop("api_version", "2021-03-31") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_iot_hub_client.py index 18aa85db39e7..81b9edf3b27c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/_iot_hub_client.py @@ -78,18 +78,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-03-31") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-03-31") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-03-31" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_certificates_operations.py index 064b1035331a..400ee3c1de8f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_operations.py index ef0e6027cfe6..9004b2035ab2 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_resource_operations.py index 30a46702706a..5873a9448628 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1386,14 +1383,14 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1471,7 +1468,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1530,7 +1527,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1635,7 +1632,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1696,7 +1693,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1790,7 +1787,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1933,14 +1930,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2073,14 +2070,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2215,14 +2212,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2289,7 +2286,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2544,14 +2541,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2705,14 +2702,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_operations.py index 4f7cbc6cef22..6e03c765cafa 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_endpoint_connections_operations.py index 8ab6669135c4..2dd4e9fe0bc4 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,7 +87,7 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -216,14 +213,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -399,7 +396,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -459,7 +456,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -534,7 +531,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_link_resources_operations.py index d8db197dee64..c51013ed947b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,7 +77,7 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -149,7 +145,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_resource_provider_common_operations.py index d43949d0404c..0f48265c2491 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_iot_hub_client_enums.py index 582048bfa653..4d9507b40cc5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_iot_hub_client_enums.py @@ -148,6 +148,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_models_py3.py index 4fd683d8042a..293d7c1abd72 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/models/_models_py3.py @@ -1893,7 +1893,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2021_03_31.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_certificates_operations.py index f580150e1b5e..96bb1cd45186 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_operations.py index 973c93294e21..1efbe4e75369 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_resource_operations.py index 776ee3db5902..dbd36ba36034 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -385,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -409,7 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -425,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -442,7 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -456,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -473,7 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -488,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -505,7 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -519,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -536,7 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -550,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -565,7 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -577,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -596,7 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,7 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -645,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -664,7 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -678,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -695,7 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -710,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -727,7 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -742,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -761,7 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -776,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -807,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -834,7 +831,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -891,14 +888,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1082,7 +1079,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1142,14 +1139,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1299,7 +1296,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1358,7 +1355,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1433,7 +1430,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1489,7 +1486,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1574,7 +1571,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1672,7 +1669,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1732,7 +1729,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1831,7 +1828,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1938,7 +1935,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2097,14 +2094,14 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2182,7 +2179,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2238,7 +2235,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2341,7 +2338,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2402,7 +2399,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2495,7 +2492,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2638,14 +2635,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2778,14 +2775,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2920,14 +2917,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2994,7 +2991,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -3099,7 +3096,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3249,14 +3246,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3410,14 +3407,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_operations.py index 64c7a28f8192..ebe46b1410b0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/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 _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: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_endpoint_connections_operations.py index a7591f71ee87..c527e3d93265 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,7 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -138,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -207,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -236,7 +233,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -304,7 +301,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -362,14 +359,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -545,7 +542,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -605,7 +602,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -680,7 +677,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_link_resources_operations.py index 77a93a2862c2..d84324aedee2 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -147,7 +143,7 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -215,7 +211,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_resource_provider_common_operations.py index 813bd13e510b..ea5402089bfb 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_03_31/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-03-31"] = kwargs.pop("api_version", _params.pop("api-version", "2021-03-31")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-03-31")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_configuration.py index a39f0d6e4b55..60d9f40def5d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", "2021-07-01") + api_version: str = kwargs.pop("api_version", "2021-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_iot_hub_client.py index 06fa09520f3c..d5d212bcc89e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_iot_hub_client.py @@ -77,18 +77,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-07-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-07-01") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_configuration.py index 2b857a5926f4..2e808994cc82 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", "2021-07-01") + api_version: str = kwargs.pop("api_version", "2021-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_iot_hub_client.py index 2dc51d6b16cf..2784b43ea2ac 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/_iot_hub_client.py @@ -78,18 +78,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-07-01") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-07-01") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-01" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_certificates_operations.py index eec796fe45dd..aa41d5f57a81 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_operations.py index 4ab59ce55e21..b6975c1d2e80 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_resource_operations.py index 0a935f147451..a8144ee7d8eb 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1386,14 +1383,14 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1471,7 +1468,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1530,7 +1527,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1635,7 +1632,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1696,7 +1693,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1790,7 +1787,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1933,14 +1930,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2073,14 +2070,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2215,14 +2212,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2289,7 +2286,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2544,14 +2541,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2705,14 +2702,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_operations.py index 49f6267df7bb..1aab95635061 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_endpoint_connections_operations.py index 57e9be3b5662..cc8744e51e33 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,7 +87,7 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -216,14 +213,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -399,7 +396,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -459,7 +456,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -534,7 +531,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_link_resources_operations.py index cbee173d62d7..2449c632c368 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,7 +77,7 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -149,7 +145,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_resource_provider_common_operations.py index 4be27189cb98..4dfaaf86943e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_iot_hub_client_enums.py index 582048bfa653..4d9507b40cc5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_iot_hub_client_enums.py @@ -148,6 +148,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_models_py3.py index 6f3451b6eec9..626371628752 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/models/_models_py3.py @@ -1947,7 +1947,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2021_07_01.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_certificates_operations.py index a010eacde859..cd34a0515309 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_operations.py index 8ad5413bf393..96ae5f3d2e99 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_resource_operations.py index fe0dbb79d65b..be199fe92250 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -385,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -409,7 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -425,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -442,7 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -456,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -473,7 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -488,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -505,7 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -519,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -536,7 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -550,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -565,7 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -577,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -596,7 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,7 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -645,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -664,7 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -678,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -695,7 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -710,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -727,7 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -742,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -761,7 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -776,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -807,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -834,7 +831,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -891,14 +888,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1082,7 +1079,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1142,14 +1139,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1299,7 +1296,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1358,7 +1355,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1433,7 +1430,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1489,7 +1486,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1574,7 +1571,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1672,7 +1669,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1732,7 +1729,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1831,7 +1828,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1938,7 +1935,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2097,14 +2094,14 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2182,7 +2179,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2238,7 +2235,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2341,7 +2338,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2402,7 +2399,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2495,7 +2492,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2638,14 +2635,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2778,14 +2775,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2920,14 +2917,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2994,7 +2991,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -3099,7 +3096,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3249,14 +3246,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3410,14 +3407,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_operations.py index eb5e7f4cc4cf..8e59822bea42 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/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 _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: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_endpoint_connections_operations.py index def772be4951..53bd5c820636 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,7 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -138,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -207,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -236,7 +233,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -304,7 +301,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -362,14 +359,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -545,7 +542,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -605,7 +602,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -680,7 +677,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_link_resources_operations.py index 159f4c94f056..2e0aa6fb6d6b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -147,7 +143,7 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -215,7 +211,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_resource_provider_common_operations.py index 42ab6273f39a..34465f867579 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_01/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-01")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_configuration.py index f648a2a2b80b..b506f9f41b4b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", "2021-07-02") + api_version: str = kwargs.pop("api_version", "2021-07-02") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_iot_hub_client.py index 71494c802314..3818a1ab6409 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_iot_hub_client.py @@ -77,18 +77,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-07-02") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-07-02") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_configuration.py index 82babdbe1b53..fb4f18f303d6 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", "2021-07-02") + api_version: str = kwargs.pop("api_version", "2021-07-02") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_iot_hub_client.py index 3464dc83b52b..163bec6e4b39 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/_iot_hub_client.py @@ -78,18 +78,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2021-07-02") + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) + self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize, "2021-07-02") self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2021-07-02" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_certificates_operations.py index d69c6734b9f3..edc5a80a7a45 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,7 +87,7 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -315,14 +312,14 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -403,7 +400,7 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -472,7 +469,7 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -631,14 +628,14 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_operations.py index 775a721da768..4da42bc474e0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,14 +72,14 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -241,7 +238,7 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_resource_operations.py index c16cf9ac34e4..412f907ffc15 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,7 +107,7 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -167,14 +164,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: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -361,7 +358,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -421,14 +418,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -581,7 +578,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -640,7 +637,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -716,7 +713,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -773,7 +770,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -861,7 +858,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -961,7 +958,7 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1021,7 +1018,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1120,7 +1117,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1227,7 +1224,7 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -1386,14 +1383,14 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1471,7 +1468,7 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -1530,7 +1527,7 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -1635,7 +1632,7 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -1696,7 +1693,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -1790,7 +1787,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -1933,14 +1930,14 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2073,14 +2070,14 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2215,14 +2212,14 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2289,7 +2286,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -2394,7 +2391,7 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -2544,14 +2541,14 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2705,14 +2702,14 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_operations.py index f11a880d852c..941a8adcc06c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,7 +66,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_endpoint_connections_operations.py index 24e9dbcd548c..ba7587ed3738 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,7 +87,7 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -158,7 +155,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -216,14 +213,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -399,7 +396,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -459,7 +456,7 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -534,7 +531,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_link_resources_operations.py index 81c7c16adc0b..b64e008fa0b2 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,7 +77,7 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -149,7 +145,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_resource_provider_common_operations.py index 4e24545ced9e..79569ba7fcaa 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,7 +73,7 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_iot_hub_client_enums.py index 5d5a95accb2b..2d31d1e7ac49 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_iot_hub_client_enums.py @@ -157,6 +157,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_models_py3.py index 9930b4d40fbc..99cdc2b590c6 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/models/_models_py3.py @@ -1961,7 +1961,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2021_07_02.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_certificates_operations.py index 5901a132a577..e7504ca8a218 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -202,7 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -219,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,7 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -261,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -322,7 +319,7 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) request = build_list_by_iot_hub_request( @@ -390,7 +387,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -547,14 +544,14 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -635,7 +632,7 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -704,7 +701,7 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) request = build_generate_verification_code_request( @@ -863,14 +860,14 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_operations.py index 2fd82f5f8e16..1cb67ee18521 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -62,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -93,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -112,14 +109,14 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -278,7 +275,7 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_resource_operations.py index 1c4f40f56ebf..8b7d717dd335 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,7 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -93,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -114,7 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -129,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -148,7 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -162,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -177,7 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -201,7 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -214,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -231,7 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -245,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -262,7 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -276,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -293,7 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -308,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -330,7 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -346,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -368,7 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -385,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -409,7 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -425,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -442,7 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -456,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -473,7 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -488,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -505,7 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -519,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -536,7 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -550,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -565,7 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -577,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -596,7 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,7 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -645,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -664,7 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -678,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -695,7 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -710,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -727,7 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -742,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -761,7 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -776,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -807,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -834,7 +831,7 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) request = build_get_request( @@ -891,14 +888,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1082,7 +1079,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1142,14 +1139,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1299,7 +1296,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1358,7 +1355,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) request = build_delete_request( @@ -1433,7 +1430,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1489,7 +1486,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1574,7 +1571,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1672,7 +1669,7 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) request = build_get_stats_request( @@ -1732,7 +1729,7 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) error_map = { @@ -1831,7 +1828,7 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) error_map = { @@ -1938,7 +1935,7 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) request = build_get_event_hub_consumer_group_request( @@ -2097,14 +2094,14 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2182,7 +2179,7 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_event_hub_consumer_group_request( @@ -2238,7 +2235,7 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) error_map = { @@ -2341,7 +2338,7 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) request = build_get_job_request( @@ -2402,7 +2399,7 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) error_map = { @@ -2495,7 +2492,7 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) error_map = { @@ -2638,14 +2635,14 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2778,14 +2775,14 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2920,14 +2917,14 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2994,7 +2991,7 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) error_map = { @@ -3099,7 +3096,7 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) request = build_get_keys_for_key_name_request( @@ -3249,14 +3246,14 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3410,14 +3407,14 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_operations.py index 19c412b63495..00f47f181c4e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/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 _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: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -78,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -91,7 +87,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_endpoint_connections_operations.py index 43e7a167abe2..336ed88920a0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,7 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,7 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -138,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -161,7 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -178,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -207,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -236,7 +233,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_list_request( @@ -304,7 +301,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -362,14 +359,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -545,7 +542,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -605,7 +602,7 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) request = build_delete_request( @@ -680,7 +677,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_link_resources_operations.py index e74a22a2564e..cd25a4917b2e 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -59,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -76,7 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -147,7 +143,7 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) request = build_list_request( @@ -215,7 +211,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_resource_provider_common_operations.py index d99dfbb7d85b..3ce1a3040bbf 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2021_07_02/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,7 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -52,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -81,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -104,7 +100,7 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2021-07-02"] = kwargs.pop("api_version", _params.pop("api-version", "2021-07-02")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-07-02")) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) request = build_get_subscription_quota_request( diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_configuration.py index 782c0b0e6df4..fffe98c1f99f 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-04-30-preview"] = kwargs.pop("api_version", "2022-04-30-preview") + api_version: str = kwargs.pop("api_version", "2022-04-30-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_iot_hub_client.py index 47230c84ab39..544fdfabd265 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_iot_hub_client.py @@ -78,18 +78,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_configuration.py index f6b98771b263..9f21c65c1b0d 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-04-30-preview"] = kwargs.pop("api_version", "2022-04-30-preview") + api_version: str = kwargs.pop("api_version", "2022-04-30-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_iot_hub_client.py index 36518f26b287..cc273a1fab57 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/_iot_hub_client.py @@ -79,18 +79,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-04-30-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_certificates_operations.py index 410c8d48543d..1115e34dd1ee 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,8 +87,8 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -320,8 +317,8 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -329,7 +326,7 @@ async def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -410,8 +407,8 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -481,8 +478,8 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -642,8 +639,8 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -651,7 +648,7 @@ async def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_operations.py index 9c480d56d286..599379248508 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,8 +72,8 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -84,7 +81,7 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -243,8 +240,8 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_resource_operations.py index 2b993427d3d9..d329e5a07a3b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,8 +107,8 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -169,8 +166,8 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -178,7 +175,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -365,8 +362,8 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -427,8 +424,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -436,7 +433,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -594,8 +591,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -661,8 +658,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -745,8 +742,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -804,8 +801,8 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -894,8 +891,8 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -996,8 +993,8 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1058,8 +1055,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1159,8 +1156,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -1268,8 +1265,8 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1429,8 +1426,8 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1438,7 +1435,7 @@ async def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1516,8 +1513,8 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -1577,8 +1574,8 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -1684,8 +1681,8 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -1747,8 +1744,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -1843,8 +1840,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -1988,8 +1985,8 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -1997,7 +1994,7 @@ async def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2130,8 +2127,8 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2139,7 +2136,7 @@ async def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2274,8 +2271,8 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -2283,7 +2280,7 @@ async def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2350,8 +2347,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -2457,8 +2454,8 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -2610,8 +2607,8 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2619,7 +2616,7 @@ async def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2774,8 +2771,8 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2783,7 +2780,7 @@ async def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_operations.py index fbcd166ee4a3..ea3f98181749 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,8 +66,8 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_endpoint_connections_operations.py index 8554807e3a68..9bc4a4cf0739 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,8 +87,8 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -220,8 +217,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -229,7 +226,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -410,8 +407,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -472,8 +469,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -554,8 +551,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_link_resources_operations.py index 245360d0aab4..137e98913442 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,8 +77,8 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -151,8 +147,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_resource_provider_common_operations.py index 1946e14b3916..b585409ab4d0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,8 +73,8 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_iot_hub_client_enums.py index 2562e239f8a9..ee0dc88b1223 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_iot_hub_client_enums.py @@ -157,6 +157,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_models_py3.py index 00a1e91a26c7..76e73704a1de 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/models/_models_py3.py @@ -2058,7 +2058,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2022_04_30_preview.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_certificates_operations.py index 50175e1d0bb5..47cc0ffb25ad 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -97,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,9 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -140,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,9 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -229,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -253,9 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -273,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -305,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -334,8 +319,8 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -404,8 +389,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -564,8 +549,8 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -573,7 +558,7 @@ def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -654,8 +639,8 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -725,8 +710,8 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -886,8 +871,8 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -895,7 +880,7 @@ def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_operations.py index af83b6046a7d..5cbc22662e25 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -64,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -95,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -114,8 +109,8 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -123,7 +118,7 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -282,8 +277,8 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_resource_operations.py index 0a650b0c6be6..ff622dec44c0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -80,9 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -97,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -118,9 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -135,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -154,9 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -170,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -185,9 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -196,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -211,9 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -226,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,9 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -259,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -276,9 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -292,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -309,9 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -326,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -348,9 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -366,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -388,9 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -407,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -431,9 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -449,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -466,9 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -482,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -499,9 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,9 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -549,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -566,9 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -582,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -597,9 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,9 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -647,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -666,9 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -683,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -702,9 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -718,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -735,9 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -752,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -769,9 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -786,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -805,9 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -822,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -853,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -880,8 +831,8 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -939,8 +890,8 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -948,7 +899,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1135,8 +1086,8 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1197,8 +1148,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1206,7 +1157,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1364,8 +1315,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1431,8 +1382,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -1514,8 +1465,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1573,8 +1524,8 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1661,8 +1612,8 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1761,8 +1712,8 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1823,8 +1774,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1924,8 +1875,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -2033,8 +1984,8 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2194,8 +2145,8 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2203,7 +2154,7 @@ def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2281,8 +2232,8 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -2339,8 +2290,8 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -2444,8 +2395,8 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2507,8 +2458,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -2603,8 +2554,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -2748,8 +2699,8 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -2757,7 +2708,7 @@ def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2890,8 +2841,8 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2899,7 +2850,7 @@ def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -3034,8 +2985,8 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -3043,7 +2994,7 @@ def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -3110,8 +3061,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -3217,8 +3168,8 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -3370,8 +3321,8 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3379,7 +3330,7 @@ def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3534,8 +3485,8 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3543,7 +3494,7 @@ def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_operations.py index e456e04dabe3..4743e73e9087 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/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 _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,9 +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: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -93,8 +87,8 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_endpoint_connections_operations.py index 0189733563ef..a21d8a7d812b 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -84,9 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -103,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,9 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -144,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -215,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -244,8 +233,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -314,8 +303,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -374,8 +363,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -383,7 +372,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -564,8 +553,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -626,8 +615,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -708,8 +697,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_link_resources_operations.py index 95585d4554d7..1fb3070fd220 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +40,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -151,8 +143,8 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -221,8 +213,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_resource_provider_common_operations.py index 656aae9b80c5..8dc50894e754 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_04_30_preview/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-04-30-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -54,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -83,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -106,8 +100,8 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-30-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-30-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-04-30-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_configuration.py index 5906e1d9efa8..a2df4dc00cd0 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-11-15-preview"] = kwargs.pop("api_version", "2022-11-15-preview") + api_version: str = kwargs.pop("api_version", "2022-11-15-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_iot_hub_client.py index b0d894205995..9bd8c4d66755 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_iot_hub_client.py @@ -78,18 +78,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_vendor.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_vendor.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_vendor.py @@ -5,8 +5,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import List, cast - from azure.core.pipeline.transport import HttpRequest @@ -16,15 +14,3 @@ def _convert_request(request, files=None): if files: request.set_formdata_body(files) return request - - -def _format_url_section(template, **kwargs): - components = template.split("/") - while components: - try: - return template.format(**kwargs) - except KeyError as key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - formatted_components = cast(List[str], template.split("/")) - components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] - template = "/".join(components) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_version.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_version.py index 1d9186e2318f..e5754a47ce68 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_version.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "2.4.0" +VERSION = "1.0.0b1" diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_configuration.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_configuration.py index 424a07e8c5fd..b4b74e6e4896 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_configuration.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/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 @@ -42,7 +36,7 @@ class IotHubClientConfiguration(Configuration): # pylint: disable=too-many-inst def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(IotHubClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-11-15-preview"] = kwargs.pop("api_version", "2022-11-15-preview") + api_version: str = kwargs.pop("api_version", "2022-11-15-preview") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_iot_hub_client.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_iot_hub_client.py index 887319bebe8d..c4bff0c4297c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_iot_hub_client.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/_iot_hub_client.py @@ -79,18 +79,26 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub_resource = IotHubResourceOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.iot_hub_resource = IotHubResourceOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) self.resource_provider_common = ResourceProviderCommonOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.certificates = CertificatesOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" + ) + self.iot_hub = IotHubOperations( + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) - self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.iot_hub = IotHubOperations(self._client, self._config, self._serialize, self._deserialize) self.private_link_resources = PrivateLinkResourcesOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) self.private_endpoint_connections = PrivateEndpointConnectionsOperations( - self._client, self._config, self._serialize, self._deserialize + self._client, self._config, self._serialize, self._deserialize, "2022-11-15-preview" ) def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_certificates_operations.py index 812e0824575f..d1a05b4324d3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_certificates_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 @@ build_verify_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list_by_iot_hub( @@ -90,8 +87,8 @@ async def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -320,8 +317,8 @@ async def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -329,7 +326,7 @@ async def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -410,8 +407,8 @@ async def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -481,8 +478,8 @@ async def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -642,8 +639,8 @@ async def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -651,7 +648,7 @@ async def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_operations.py index a869cb8964a9..17ba8747c709 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -30,10 +30,6 @@ from ..._vendor import _convert_request from ...operations._iot_hub_operations import build_manual_failover_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -56,6 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") async def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -75,8 +72,8 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -84,7 +81,7 @@ async def _manual_failover_initial( # pylint: disable=inconsistent-return-state content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -250,8 +247,8 @@ async def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_resource_operations.py index 39176bdf4d81..6688f7ad80cb 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_iot_hub_resource_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 @@ -57,10 +57,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,6 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -110,8 +107,8 @@ async def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -169,8 +166,8 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -178,7 +175,7 @@ async def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -365,8 +362,8 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -427,8 +424,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -436,7 +433,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -594,8 +591,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -661,8 +658,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -745,8 +742,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -804,8 +801,8 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.IotHubDe _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -894,8 +891,8 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -996,8 +993,8 @@ async def get_stats( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1058,8 +1055,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1159,8 +1156,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -1268,8 +1265,8 @@ async def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1429,8 +1426,8 @@ async def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -1438,7 +1435,7 @@ async def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -1516,8 +1513,8 @@ async def delete_event_hub_consumer_group( # pylint: disable=inconsistent-retur _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -1577,8 +1574,8 @@ def list_jobs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -1684,8 +1681,8 @@ async def get_job( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -1747,8 +1744,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -1843,8 +1840,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -1988,8 +1985,8 @@ async def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -1997,7 +1994,7 @@ async def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2130,8 +2127,8 @@ async def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2139,7 +2136,7 @@ async def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -2274,8 +2271,8 @@ async def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -2283,7 +2280,7 @@ async def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -2350,8 +2347,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -2457,8 +2454,8 @@ async def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -2610,8 +2607,8 @@ async def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2619,7 +2616,7 @@ async def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -2774,8 +2771,8 @@ async def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2783,7 +2780,7 @@ async def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_operations.py index d58800706708..c99e6d8e50f5 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/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 @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -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]] @@ -56,6 +51,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: @@ -70,8 +66,8 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_endpoint_connections_operations.py index 64931e95c17c..61a0f6f007ed 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -35,10 +35,6 @@ build_update_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -61,6 +57,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list( @@ -90,8 +87,8 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -160,8 +157,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -220,8 +217,8 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -229,7 +226,7 @@ async def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -410,8 +407,8 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -472,8 +469,8 @@ async def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -554,8 +551,8 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_link_resources_operations.py index 49017be5825a..fbac3975abc4 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -81,8 +77,8 @@ async def list(self, resource_group_name: str, resource_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -151,8 +147,8 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_resource_provider_common_operations.py index abff905b81cd..5058d8c9f0d9 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/aio/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._resource_provider_common_operations import build_get_subscription_quota_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, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -54,6 +49,7 @@ def __init__(self, *args, **kwargs) -> None: self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace_async async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -77,8 +73,8 @@ async def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptio _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_iot_hub_client_enums.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_iot_hub_client_enums.py index faf4c32c1f5c..8e8bf07cccb6 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_iot_hub_client_enums.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_iot_hub_client_enums.py @@ -165,6 +165,7 @@ class JobType(str, Enum, metaclass=CaseInsensitiveEnumMeta): REBOOT_DEVICE = "rebootDevice" FACTORY_RESET_DEVICE = "factoryResetDevice" FIRMWARE_UPDATE = "firmwareUpdate" + IMPORT_ENUM = "import" class NetworkRuleIPAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_models_py3.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_models_py3.py index 7a589416a3b4..ee2b42a2a43c 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_models_py3.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/models/_models_py3.py @@ -2067,7 +2067,7 @@ class JobResponse(_serialization.Model): :vartype end_time_utc: ~datetime.datetime :ivar type: The type of the job. Known values are: "unknown", "export", "import", "backup", "readDeviceProperties", "writeDeviceProperties", "updateDeviceConfiguration", "rebootDevice", - "factoryResetDevice", and "firmwareUpdate". + "factoryResetDevice", "firmwareUpdate", and "import". :vartype type: str or ~azure.mgmt.iothub.v2022_11_15_preview.models.JobType :ivar status: The status of the job. Known values are: "unknown", "enqueued", "running", "completed", "failed", and "cancelled". diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_certificates_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_certificates_operations.py index cde4d9858aa5..c202a3741653 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_certificates_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_certificates_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 ( @@ -26,12 +26,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +41,7 @@ def build_list_by_iot_hub_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +55,7 @@ def build_list_by_iot_hub_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +72,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -97,7 +89,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -120,9 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -140,7 +130,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -210,9 +198,7 @@ def build_generate_verification_code_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -229,7 +215,7 @@ def build_generate_verification_code_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -253,9 +239,7 @@ def build_verify_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -273,7 +257,7 @@ def build_verify_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -305,6 +289,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list_by_iot_hub( @@ -334,8 +319,8 @@ def list_by_iot_hub( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateListDescription] = kwargs.pop("cls", None) @@ -404,8 +389,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -564,8 +549,8 @@ def create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -573,7 +558,7 @@ def create_or_update( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_description, (IO, bytes)): + if isinstance(certificate_description, (IOBase, bytes)): _content = certificate_description else: _json = self._serialize.body(certificate_description, "CertificateDescription") @@ -654,8 +639,8 @@ def delete( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -725,8 +710,8 @@ def generate_verification_code( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.CertificateWithNonceDescription] = kwargs.pop("cls", None) @@ -886,8 +871,8 @@ def verify( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.CertificateDescription] = kwargs.pop("cls", None) @@ -895,7 +880,7 @@ def verify( content_type = content_type or "application/json" _json = None _content = None - if isinstance(certificate_verification_body, (IO, bytes)): + if isinstance(certificate_verification_body, (IOBase, bytes)): _content = certificate_verification_body else: _json = self._serialize.body(certificate_verification_body, "CertificateVerificationDescription") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_operations.py index 23abf318752f..6a3a98ea9200 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_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, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_manual_failover_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -64,7 +58,7 @@ def build_manual_failover_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -95,6 +89,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") def _manual_failover_initial( # pylint: disable=inconsistent-return-statements self, @@ -114,8 +109,8 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) @@ -123,7 +118,7 @@ def _manual_failover_initial( # pylint: disable=inconsistent-return-statements content_type = content_type or "application/json" _json = None _content = None - if isinstance(failover_input, (IO, bytes)): + if isinstance(failover_input, (IOBase, bytes)): _content = failover_input else: _json = self._serialize.body(failover_input, "FailoverInput") @@ -289,8 +284,8 @@ def begin_manual_failover( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[None] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_resource_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_resource_operations.py index 72fa1b637cff..e0e417990fbf 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_resource_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_iot_hub_resource_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 @@ -30,12 +30,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_get_request(resource_group_name: str, resource_name: str, subscription "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -80,9 +74,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -97,7 +89,7 @@ def build_create_or_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -118,9 +110,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -135,7 +125,7 @@ def build_update_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -154,9 +144,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -170,7 +158,7 @@ def build_delete_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -185,9 +173,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -196,7 +182,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -211,9 +197,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -226,7 +210,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -243,9 +227,7 @@ def build_get_stats_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -259,7 +241,7 @@ def build_get_stats_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -276,9 +258,7 @@ def build_get_valid_skus_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -292,7 +272,7 @@ def build_get_valid_skus_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -309,9 +289,7 @@ def build_list_event_hub_consumer_groups_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -326,7 +304,7 @@ def build_list_event_hub_consumer_groups_request( "eventHubEndpointName": _SERIALIZER.url("event_hub_endpoint_name", event_hub_endpoint_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -348,9 +326,7 @@ def build_get_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -366,7 +342,7 @@ def build_get_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -388,9 +364,7 @@ def build_create_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -407,7 +381,7 @@ def build_create_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -431,9 +405,7 @@ def build_delete_event_hub_consumer_group_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -449,7 +421,7 @@ def build_delete_event_hub_consumer_group_request( "name": _SERIALIZER.url("name", name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -466,9 +438,7 @@ def build_list_jobs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -482,7 +452,7 @@ def build_list_jobs_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -499,9 +469,7 @@ def build_get_job_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -516,7 +484,7 @@ def build_get_job_request( "jobId": _SERIALIZER.url("job_id", job_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -533,9 +501,7 @@ def build_get_quota_metrics_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -549,7 +515,7 @@ def build_get_quota_metrics_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -566,9 +532,7 @@ def build_get_endpoint_health_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -582,7 +546,7 @@ def build_get_endpoint_health_request( "iotHubName": _SERIALIZER.url("iot_hub_name", iot_hub_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -597,9 +561,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -611,7 +573,7 @@ def build_check_name_availability_request(subscription_id: str, **kwargs: Any) - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -630,9 +592,7 @@ def build_test_all_routes_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -647,7 +607,7 @@ def build_test_all_routes_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -666,9 +626,7 @@ def build_test_route_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -683,7 +641,7 @@ def build_test_route_request( "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -702,9 +660,7 @@ def build_list_keys_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -718,7 +674,7 @@ def build_list_keys_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -735,9 +691,7 @@ def build_get_keys_for_key_name_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -752,7 +706,7 @@ def build_get_keys_for_key_name_request( "keyName": _SERIALIZER.url("key_name", key_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -769,9 +723,7 @@ def build_export_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -786,7 +738,7 @@ def build_export_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -805,9 +757,7 @@ def build_import_devices_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -822,7 +772,7 @@ def build_import_devices_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -853,6 +803,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.IotHubDescription: @@ -880,8 +831,8 @@ def get(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _m _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -939,8 +890,8 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -948,7 +899,7 @@ def _create_or_update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_description, (IO, bytes)): + if isinstance(iot_hub_description, (IOBase, bytes)): _content = iot_hub_description else: _json = self._serialize.body(iot_hub_description, "IotHubDescription") @@ -1135,8 +1086,8 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1197,8 +1148,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1206,7 +1157,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(iot_hub_tags, (IO, bytes)): + if isinstance(iot_hub_tags, (IOBase, bytes)): _content = iot_hub_tags else: _json = self._serialize.body(iot_hub_tags, "TagsResource") @@ -1364,8 +1315,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) @@ -1431,8 +1382,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[Union[_models.IotHubDescription, _models.ErrorDetails]] = kwargs.pop("cls", None) @@ -1514,8 +1465,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescription] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1573,8 +1524,8 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.IotHubDescrip _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1661,8 +1612,8 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubDescriptionListResult] = kwargs.pop("cls", None) @@ -1761,8 +1712,8 @@ def get_stats(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.RegistryStatistics] = kwargs.pop("cls", None) @@ -1823,8 +1774,8 @@ def get_valid_skus( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubSkuDescriptionListResult] = kwargs.pop("cls", None) @@ -1924,8 +1875,8 @@ def list_event_hub_consumer_groups( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EventHubConsumerGroupsListResult] = kwargs.pop("cls", None) @@ -2033,8 +1984,8 @@ def get_event_hub_consumer_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2194,8 +2145,8 @@ def create_event_hub_consumer_group( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.EventHubConsumerGroupInfo] = kwargs.pop("cls", None) @@ -2203,7 +2154,7 @@ def create_event_hub_consumer_group( content_type = content_type or "application/json" _json = None _content = None - if isinstance(consumer_group_body, (IO, bytes)): + if isinstance(consumer_group_body, (IOBase, bytes)): _content = consumer_group_body else: _json = self._serialize.body(consumer_group_body, "EventHubConsumerGroupBodyDescription") @@ -2281,8 +2232,8 @@ def delete_event_hub_consumer_group( # pylint: disable=inconsistent-return-stat _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[None] = kwargs.pop("cls", None) @@ -2339,8 +2290,8 @@ def list_jobs(self, resource_group_name: str, resource_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.JobResponseListResult] = kwargs.pop("cls", None) @@ -2444,8 +2395,8 @@ def get_job(self, resource_group_name: str, resource_name: str, job_id: str, **k _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -2507,8 +2458,8 @@ def get_quota_metrics( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.IotHubQuotaMetricInfoListResult] = kwargs.pop("cls", None) @@ -2603,8 +2554,8 @@ def get_endpoint_health( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.EndpointHealthDataListResult] = kwargs.pop("cls", None) @@ -2748,8 +2699,8 @@ def check_name_availability( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.IotHubNameAvailabilityInfo] = kwargs.pop("cls", None) @@ -2757,7 +2708,7 @@ def check_name_availability( content_type = content_type or "application/json" _json = None _content = None - if isinstance(operation_inputs, (IO, bytes)): + if isinstance(operation_inputs, (IOBase, bytes)): _content = operation_inputs else: _json = self._serialize.body(operation_inputs, "OperationInputs") @@ -2890,8 +2841,8 @@ def test_all_routes( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestAllRoutesResult] = kwargs.pop("cls", None) @@ -2899,7 +2850,7 @@ def test_all_routes( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestAllRoutesInput") @@ -3034,8 +2985,8 @@ def test_route( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.TestRouteResult] = kwargs.pop("cls", None) @@ -3043,7 +2994,7 @@ def test_route( content_type = content_type or "application/json" _json = None _content = None - if isinstance(input, (IO, bytes)): + if isinstance(input, (IOBase, bytes)): _content = input else: _json = self._serialize.body(input, "TestRouteInput") @@ -3110,8 +3061,8 @@ def list_keys( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRuleListResult] = kwargs.pop("cls", None) @@ -3217,8 +3168,8 @@ def get_keys_for_key_name( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.SharedAccessSignatureAuthorizationRule] = kwargs.pop("cls", None) @@ -3370,8 +3321,8 @@ def export_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3379,7 +3330,7 @@ def export_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(export_devices_parameters, (IO, bytes)): + if isinstance(export_devices_parameters, (IOBase, bytes)): _content = export_devices_parameters else: _json = self._serialize.body(export_devices_parameters, "ExportDevicesRequest") @@ -3534,8 +3485,8 @@ def import_devices( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.JobResponse] = kwargs.pop("cls", None) @@ -3543,7 +3494,7 @@ def import_devices( content_type = content_type or "application/json" _json = None _content = None - if isinstance(import_devices_parameters, (IO, bytes)): + if isinstance(import_devices_parameters, (IOBase, bytes)): _content = import_devices_parameters else: _json = self._serialize.body(import_devices_parameters, "ImportDevicesRequest") diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_operations.py index e4d6427b261b..b5bd2bc80ad3 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/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 _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,9 +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: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -80,6 +73,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: @@ -93,8 +87,8 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_endpoint_connections_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_endpoint_connections_operations.py index a983c9dc1d69..3c3bce277fa4 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_endpoint_connections_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_endpoint_connections_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, List, Optional, TypeVar, Union, cast, overload from azure.core.exceptions import ( @@ -28,12 +28,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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]] @@ -47,9 +43,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -63,7 +57,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -84,9 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -103,7 +95,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,9 +116,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -144,7 +134,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -167,9 +157,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -186,7 +174,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -215,6 +203,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list( @@ -244,8 +233,8 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[List[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -314,8 +303,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -374,8 +363,8 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -383,7 +372,7 @@ def _update_initial( content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -564,8 +553,8 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) @@ -626,8 +615,8 @@ def _delete_initial( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[Optional[_models.PrivateEndpointConnection]] = kwargs.pop("cls", None) @@ -708,8 +697,8 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_link_resources_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_link_resources_operations.py index e42d4f2a3d8a..6b38e9ff0243 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_link_resources_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_private_link_resources_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +40,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -61,7 +54,7 @@ def build_list_request( "resourceName": _SERIALIZER.url("resource_name", resource_name, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -78,9 +71,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -95,7 +86,7 @@ def build_get_request( "groupId": _SERIALIZER.url("group_id", group_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -124,6 +115,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _models.PrivateLinkResources: @@ -151,8 +143,8 @@ def list(self, resource_group_name: str, resource_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.PrivateLinkResources] = kwargs.pop("cls", None) @@ -221,8 +213,8 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_resource_provider_common_operations.py b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_resource_provider_common_operations.py index 796b7b45ae0d..a9315139fd16 100644 --- a/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_resource_provider_common_operations.py +++ b/sdk/iothub/azure-mgmt-iothub/azure/mgmt/iothub/v2022_11_15_preview/operations/_resource_provider_common_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, Optional, TypeVar from azure.core.exceptions import ( @@ -26,12 +25,8 @@ from .. import models as _models from ..._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _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,9 +38,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2022-11-15-preview")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -54,7 +47,7 @@ def build_get_subscription_quota_request(subscription_id: str, **kwargs: Any) -> "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -83,6 +76,7 @@ def __init__(self, *args, **kwargs): self._config = input_args.pop(0) if input_args else kwargs.pop("config") self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") + self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version") @distributed_trace def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuotaListResult: @@ -106,8 +100,8 @@ def get_subscription_quota(self, **kwargs: Any) -> _models.UserSubscriptionQuota _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-11-15-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-11-15-preview") + api_version: str = kwargs.pop( + "api_version", _params.pop("api-version", self._api_version or "2022-11-15-preview") ) cls: ClsType[_models.UserSubscriptionQuotaListResult] = kwargs.pop("cls", None) diff --git a/sdk/iothub/azure-mgmt-iothub/generated_samples/iot_hub_manual_failover.py b/sdk/iothub/azure-mgmt-iothub/generated_samples/iot_hub_manual_failover.py index 071b2a1672d7..e565bd286620 100644 --- a/sdk/iothub/azure-mgmt-iothub/generated_samples/iot_hub_manual_failover.py +++ b/sdk/iothub/azure-mgmt-iothub/generated_samples/iot_hub_manual_failover.py @@ -29,12 +29,11 @@ def main(): subscription_id="91d12660-3dec-467a-be2a-213b5544ddc0", ) - response = client.iot_hub.begin_manual_failover( + client.iot_hub.begin_manual_failover( iot_hub_name="testHub", resource_group_name="myResourceGroup", failover_input={"failoverRegion": "testHub"}, ).result() - print(response) # x-ms-original-file: specification/iothub/resource-manager/Microsoft.Devices/stable/2021-07-02/examples/IotHub_ManualFailover.json diff --git a/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_certificatesdelete.py b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_certificatesdelete.py index c08c1cf420da..e46522dd52a1 100644 --- a/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_certificatesdelete.py +++ b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_certificatesdelete.py @@ -29,13 +29,12 @@ def main(): subscription_id="91d12660-3dec-467a-be2a-213b5544ddc0", ) - response = client.certificates.delete( + client.certificates.delete( resource_group_name="myResourceGroup", resource_name="myhub", certificate_name="cert", if_match="AAAAAAAADGk=", ) - print(response) # x-ms-original-file: specification/iothub/resource-manager/Microsoft.Devices/stable/2021-07-02/examples/iothub_certificatesdelete.json diff --git a/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_deleteconsumergroup.py b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_deleteconsumergroup.py index 031aa4c9f71f..50ea13768510 100644 --- a/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_deleteconsumergroup.py +++ b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_deleteconsumergroup.py @@ -29,13 +29,12 @@ def main(): subscription_id="91d12660-3dec-467a-be2a-213b5544ddc0", ) - response = client.iot_hub_resource.delete_event_hub_consumer_group( + client.iot_hub_resource.delete_event_hub_consumer_group( resource_group_name="myResourceGroup", resource_name="testHub", event_hub_endpoint_name="events", name="test", ) - print(response) # x-ms-original-file: specification/iothub/resource-manager/Microsoft.Devices/stable/2021-07-02/examples/iothub_deleteconsumergroup.json diff --git a/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_patch.py b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_patch.py new file mode 100644 index 000000000000..aa484be11804 --- /dev/null +++ b/sdk/iothub/azure-mgmt-iothub/generated_samples/iothub_patch.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.iothub import IotHubClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-iothub +# USAGE + python iothub_patch.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 = IotHubClient( + credential=DefaultAzureCredential(), + subscription_id="91d12660-3dec-467a-be2a-213b5544ddc0", + ) + + response = client.iot_hub_resource.begin_update( + resource_group_name="myResourceGroup", + resource_name="myHub", + iot_hub_tags={"tags": {"foo": "bar"}}, + ).result() + print(response) + + +# x-ms-original-file: specification/iothub/resource-manager/Microsoft.Devices/stable/2021-07-02/examples/iothub_patch.json +if __name__ == "__main__": + main()