azure-mgmt-storage 21.1.0b1__py3-none-any.whl → 21.2.0__py3-none-any.whl

azure/mgmt/storage/{v2018_07_01 → v2018_03_01_preview}/operations/_management_policies_operations.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6,8 +6,9 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, Type, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -26,12 +27,12 @@ from azure.mgmt.core.exceptions import ARMErrorFormat
 
 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
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
 else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -49,9 +50,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-03-01-preview"] = kwargs.pop(
-        "api_version", _params.pop("api-version", "2018-03-01-preview")
-    )
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-03-01-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -68,7 +67,7 @@ def build_get_request(
         "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
     }
 
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
     _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -89,9 +88,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-03-01-preview"] = kwargs.pop(
-        "api_version", _params.pop("api-version", "2018-03-01-preview")
-    )
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-03-01-preview"))
     content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
@@ -109,7 +106,7 @@ def build_create_or_update_request(
         "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
     }
 
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
     _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -131,9 +128,7 @@ def build_delete_request(
 ) -> HttpRequest:
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-        "api_version", _params.pop("api-version", "2018-03-01-preview")
-    )
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-03-01-preview"))
     # Construct URL
     _url = kwargs.pop(
         "template_url",
@@ -148,7 +143,7 @@ def build_delete_request(
         "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
     }
 
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
     _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -162,7 +157,7 @@ class ManagementPoliciesOperations:
         **DO NOT** instantiate this class directly.
 
         Instead, you should access the following operations through
-        :class:`~azure.mgmt.storage.v2018_07_01.StorageManagementClient`'s
+        :class:`~azure.mgmt.storage.v2018_03_01_preview.StorageManagementClient`'s
         :attr:`management_policies` attribute.
     """
 
@@ -174,6 +169,7 @@ class ManagementPoliciesOperations:
         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(
@@ -195,13 +191,12 @@ class ManagementPoliciesOperations:
         :param management_policy_name: The name of the Storage Account Management Policy. It should
          always be 'default'. "default" Required.
         :type management_policy_name: str or
-         ~azure.mgmt.storage.v2018_07_01.models.ManagementPolicyName
-        :keyword callable cls: A custom type or function that will be passed the direct response
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPolicyName
         :return: StorageAccountManagementPolicies or the result of cls(response)
-        :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountManagementPolicies
+        :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -212,26 +207,26 @@ class ManagementPoliciesOperations:
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-            "api_version", _params.pop("api-version", "2018-03-01-preview")
+        api_version: str = kwargs.pop(
+            "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         cls: ClsType[_models.StorageAccountManagementPolicies] = kwargs.pop("cls", None)
 
-        request = build_get_request(
+        _request = build_get_request(
             resource_group_name=resource_group_name,
             account_name=account_name,
             management_policy_name=management_policy_name,
             subscription_id=self._config.subscription_id,
             api_version=api_version,
-            template_url=self.get.metadata["url"],
             headers=_headers,
             params=_params,
         )
-        request = _convert_request(request)
-        request.url = self._client.format_url(request.url)
+        _request = _convert_request(_request)
+        _request.url = self._client.format_url(_request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            _request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response
@@ -243,13 +238,9 @@ class ManagementPoliciesOperations:
         deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
 
         if cls:
-            return cls(pipeline_response, deserialized, {})
+            return cls(pipeline_response, deserialized, {})  # type: ignore
 
-        return deserialized
-
-    get.metadata = {
-        "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}"
-    }
+        return deserialized  # type: ignore
 
     @overload
     def create_or_update(
@@ -274,15 +265,15 @@ class ManagementPoliciesOperations:
         :param management_policy_name: The name of the Storage Account Management Policy. It should
          always be 'default'. "default" Required.
         :type management_policy_name: str or
-         ~azure.mgmt.storage.v2018_07_01.models.ManagementPolicyName
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPolicyName
         :param properties: The data policy rules to set to a storage account. Required.
-        :type properties: ~azure.mgmt.storage.v2018_07_01.models.ManagementPoliciesRulesSetParameter
+        :type properties:
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPoliciesRulesSetParameter
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
-        :keyword callable cls: A custom type or function that will be passed the direct response
         :return: StorageAccountManagementPolicies or the result of cls(response)
-        :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountManagementPolicies
+        :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -292,7 +283,7 @@ class ManagementPoliciesOperations:
         resource_group_name: str,
         account_name: str,
         management_policy_name: Union[str, _models.ManagementPolicyName],
-        properties: IO,
+        properties: IO[bytes],
         *,
         content_type: str = "application/json",
         **kwargs: Any
@@ -309,15 +300,14 @@ class ManagementPoliciesOperations:
         :param management_policy_name: The name of the Storage Account Management Policy. It should
          always be 'default'. "default" Required.
         :type management_policy_name: str or
-         ~azure.mgmt.storage.v2018_07_01.models.ManagementPolicyName
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPolicyName
         :param properties: The data policy rules to set to a storage account. Required.
-        :type properties: IO
+        :type properties: IO[bytes]
         :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
          Default value is "application/json".
         :paramtype content_type: str
-        :keyword callable cls: A custom type or function that will be passed the direct response
         :return: StorageAccountManagementPolicies or the result of cls(response)
-        :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountManagementPolicies
+        :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -327,7 +317,7 @@ class ManagementPoliciesOperations:
         resource_group_name: str,
         account_name: str,
         management_policy_name: Union[str, _models.ManagementPolicyName],
-        properties: Union[_models.ManagementPoliciesRulesSetParameter, IO],
+        properties: Union[_models.ManagementPoliciesRulesSetParameter, IO[bytes]],
         **kwargs: Any
     ) -> _models.StorageAccountManagementPolicies:
         """Sets the data policy rules associated with the specified storage account.
@@ -342,20 +332,16 @@ class ManagementPoliciesOperations:
         :param management_policy_name: The name of the Storage Account Management Policy. It should
          always be 'default'. "default" Required.
         :type management_policy_name: str or
-         ~azure.mgmt.storage.v2018_07_01.models.ManagementPolicyName
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPolicyName
         :param properties: The data policy rules to set to a storage account. Is either a
-         ManagementPoliciesRulesSetParameter type or a IO type. Required.
-        :type properties: ~azure.mgmt.storage.v2018_07_01.models.ManagementPoliciesRulesSetParameter or
-         IO
-        :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
-         Default value is None.
-        :paramtype content_type: str
-        :keyword callable cls: A custom type or function that will be passed the direct response
+         ManagementPoliciesRulesSetParameter type or a IO[bytes] type. Required.
+        :type properties:
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPoliciesRulesSetParameter or IO[bytes]
         :return: StorageAccountManagementPolicies or the result of cls(response)
-        :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountManagementPolicies
+        :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -366,8 +352,8 @@ class ManagementPoliciesOperations:
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-            "api_version", _params.pop("api-version", "2018-03-01-preview")
+        api_version: str = kwargs.pop(
+            "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.StorageAccountManagementPolicies] = kwargs.pop("cls", None)
@@ -375,12 +361,12 @@ class ManagementPoliciesOperations:
         content_type = content_type or "application/json"
         _json = None
         _content = None
-        if isinstance(properties, (IO, bytes)):
+        if isinstance(properties, (IOBase, bytes)):
             _content = properties
         else:
             _json = self._serialize.body(properties, "ManagementPoliciesRulesSetParameter")
 
-        request = build_create_or_update_request(
+        _request = build_create_or_update_request(
             resource_group_name=resource_group_name,
             account_name=account_name,
             management_policy_name=management_policy_name,
@@ -389,15 +375,15 @@ class ManagementPoliciesOperations:
             content_type=content_type,
             json=_json,
             content=_content,
-            template_url=self.create_or_update.metadata["url"],
             headers=_headers,
             params=_params,
         )
-        request = _convert_request(request)
-        request.url = self._client.format_url(request.url)
+        _request = _convert_request(_request)
+        _request.url = self._client.format_url(_request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            _request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response
@@ -409,13 +395,9 @@ class ManagementPoliciesOperations:
         deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
 
         if cls:
-            return cls(pipeline_response, deserialized, {})
+            return cls(pipeline_response, deserialized, {})  # type: ignore
 
-        return deserialized
-
-    create_or_update.metadata = {
-        "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}"
-    }
+        return deserialized  # type: ignore
 
     @distributed_trace
     def delete(  # pylint: disable=inconsistent-return-statements
@@ -437,13 +419,12 @@ class ManagementPoliciesOperations:
         :param management_policy_name: The name of the Storage Account Management Policy. It should
          always be 'default'. "default" Required.
         :type management_policy_name: str or
-         ~azure.mgmt.storage.v2018_07_01.models.ManagementPolicyName
-        :keyword callable cls: A custom type or function that will be passed the direct response
+         ~azure.mgmt.storage.v2018_03_01_preview.models.ManagementPolicyName
         :return: None or the result of cls(response)
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -454,26 +435,26 @@ class ManagementPoliciesOperations:
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-            "api_version", _params.pop("api-version", "2018-03-01-preview")
+        api_version: str = kwargs.pop(
+            "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         cls: ClsType[None] = kwargs.pop("cls", None)
 
-        request = build_delete_request(
+        _request = build_delete_request(
             resource_group_name=resource_group_name,
             account_name=account_name,
             management_policy_name=management_policy_name,
             subscription_id=self._config.subscription_id,
             api_version=api_version,
-            template_url=self.delete.metadata["url"],
             headers=_headers,
             params=_params,
         )
-        request = _convert_request(request)
-        request.url = self._client.format_url(request.url)
+        _request = _convert_request(_request)
+        _request.url = self._client.format_url(_request.url)
 
+        _stream = False
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-            request, stream=False, **kwargs
+            _request, stream=_stream, **kwargs
         )
 
         response = pipeline_response.http_response
@@ -483,8 +464,4 @@ class ManagementPoliciesOperations:
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
         if cls:
-            return cls(pipeline_response, None, {})
-
-    delete.metadata = {
-        "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}"
-    }
+            return cls(pipeline_response, None, {})  # type: ignore

azure/mgmt/storage/v2018_03_01_preview/operations/_operations.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +7,7 @@
 # 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
+from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -30,10 +30,10 @@ from .. import models as _models
 from ..._serialization import Serializer
 from .._vendor import _convert_request
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
 else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -45,9 +45,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-03-01-preview"] = kwargs.pop(
-        "api_version", _params.pop("api-version", "2018-03-01-preview")
-    )
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-03-01-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -80,12 +78,12 @@ class Operations:
         self._config = input_args.pop(0) if input_args else kwargs.pop("config")
         self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
 
     @distributed_trace
     def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         """Lists all of the available Storage Rest API operations.
 
-        :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either Operation or the result of cls(response)
         :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2018_03_01_preview.models.Operation]
         :raises ~azure.core.exceptions.HttpResponseError:
@@ -93,12 +91,12 @@ class Operations:
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-            "api_version", _params.pop("api-version", "2018-03-01-preview")
+        api_version: str = kwargs.pop(
+            "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,14 +107,13 @@ class Operations:
         def prepare_request(next_link=None):
             if not next_link:
 
-                request = build_list_request(
+                _request = build_list_request(
                     api_version=api_version,
-                    template_url=self.list.metadata["url"],
                     headers=_headers,
                     params=_params,
                 )
-                request = _convert_request(request)
-                request.url = self._client.format_url(request.url)
+                _request = _convert_request(_request)
+                _request.url = self._client.format_url(_request.url)
 
             else:
                 # make call to next link with the client's api-version
@@ -127,14 +124,14 @@ class Operations:
                         for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
                     }
                 )
-                _next_request_params["api-version"] = self._config.api_version
-                request = HttpRequest(
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                request = _convert_request(request)
-                request.url = self._client.format_url(request.url)
-                request.method = "GET"
-            return request
+                _request = _convert_request(_request)
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
 
         def extract_data(pipeline_response):
             deserialized = self._deserialize("OperationListResult", pipeline_response)
@@ -144,10 +141,11 @@ class Operations:
             return None, iter(list_of_elem)
 
         def get_next(next_link=None):
-            request = prepare_request(next_link)
+            _request = prepare_request(next_link)
 
+            _stream = False
             pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-                request, stream=False, **kwargs
+                _request, stream=_stream, **kwargs
             )
             response = pipeline_response.http_response
 
@@ -158,5 +156,3 @@ class Operations:
             return pipeline_response
 
         return ItemPaged(get_next, extract_data)
-
-    list.metadata = {"url": "/providers/Microsoft.Storage/operations"}

azure/mgmt/storage/v2018_03_01_preview/operations/_skus_operations.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines
+# pylint: disable=too-many-lines,too-many-statements
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7,7 +7,7 @@
 # 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
+from typing import Any, Callable, Dict, Iterable, Optional, Type, TypeVar
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -28,12 +28,12 @@ from azure.mgmt.core.exceptions import ARMErrorFormat
 
 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
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
 else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -45,9 +45,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest:
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-        "api_version", _params.pop("api-version", "2018-03-01-preview")
-    )
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2018-03-01-preview"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -56,7 +54,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest:
         "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
     }
 
-    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
     _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
@@ -85,12 +83,12 @@ class SkusOperations:
         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.Sku"]:
         """Lists the available SKUs supported by Microsoft.Storage for given subscription.
 
-        :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either Sku or the result of cls(response)
         :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2018_03_01_preview.models.Sku]
         :raises ~azure.core.exceptions.HttpResponseError:
@@ -98,12 +96,12 @@ class SkusOperations:
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2018-03-01-preview"] = kwargs.pop(
-            "api_version", _params.pop("api-version", "2018-03-01-preview")
+        api_version: str = kwargs.pop(
+            "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map = {
+        error_map: MutableMapping[int, Type[HttpResponseError]] = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -114,15 +112,14 @@ class SkusOperations:
         def prepare_request(next_link=None):
             if not next_link:
 
-                request = build_list_request(
+                _request = build_list_request(
                     subscription_id=self._config.subscription_id,
                     api_version=api_version,
-                    template_url=self.list.metadata["url"],
                     headers=_headers,
                     params=_params,
                 )
-                request = _convert_request(request)
-                request.url = self._client.format_url(request.url)
+                _request = _convert_request(_request)
+                _request.url = self._client.format_url(_request.url)
 
             else:
                 # make call to next link with the client's api-version
@@ -133,14 +130,14 @@ class SkusOperations:
                         for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
                     }
                 )
-                _next_request_params["api-version"] = self._config.api_version
-                request = HttpRequest(
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                request = _convert_request(request)
-                request.url = self._client.format_url(request.url)
-                request.method = "GET"
-            return request
+                _request = _convert_request(_request)
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
 
         def extract_data(pipeline_response):
             deserialized = self._deserialize("StorageSkuListResult", pipeline_response)
@@ -150,10 +147,11 @@ class SkusOperations:
             return None, iter(list_of_elem)
 
         def get_next(next_link=None):
-            request = prepare_request(next_link)
+            _request = prepare_request(next_link)
 
+            _stream = False
             pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
-                request, stream=False, **kwargs
+                _request, stream=_stream, **kwargs
             )
             response = pipeline_response.http_response
 
@@ -164,5 +162,3 @@ class SkusOperations:
             return pipeline_response
 
         return ItemPaged(get_next, extract_data)
-
-    list.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/skus"}