[AutoPR track2_azure-mgmt-keyvault] seal single value enum

sdk/keyvault/azure-mgmt-keyvault/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "ee96574a6d4ed37a06883b8e3f8fd3adf4803b83",
+  "commit": "c5349fc3f7cfdc0307c714113d8e29230a547cad",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.9.2",
   "use": [
-    "@autorest/python@6.4.3",
+    "@autorest/python@6.4.7",
     "@autorest/modelerfour@4.24.3"
   ],
-  "autorest_command": "autorest specification/keyvault/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",
+  "autorest_command": "autorest specification/keyvault/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.4.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
   "readme": "specification/keyvault/resource-manager/readme.md"
 }

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/_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):
@@ -1273,7 +1273,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 +1297,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):

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/_version.py

@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0"
+VERSION = "0.1.0"

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_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
@@ -43,7 +37,7 @@ class KeyVaultManagementClientConfiguration(Configuration):  # pylint: disable=t
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(KeyVaultManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", "2016-10-01")
+        api_version: str = kwargs.pop("api_version", "2016-10-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0"
+VERSION = "1.0.0b1"

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_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
@@ -43,7 +37,7 @@ class KeyVaultManagementClientConfiguration(Configuration):  # pylint: disable=t
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(KeyVaultManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", "2016-10-01")
+        api_version: str = kwargs.pop("api_version", "2016-10-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_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]]
 
@@ -70,7 +65,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["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
         error_map = {

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/aio/operations/_vaults_operations.py

@@ -166,7 +166,7 @@ async def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
 
@@ -312,7 +312,7 @@ async def update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
 
@@ -392,7 +392,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["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[None] = kwargs.pop("cls", None)
 
         request = build_delete_request(
@@ -450,7 +450,7 @@ async def get(self, resource_group_name: str, vault_name: str, **kwargs: Any) ->
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
 
         request = build_get_request(
@@ -592,7 +592,7 @@ async def update_access_policy(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.VaultAccessPolicyParameters] = kwargs.pop("cls", None)
 
@@ -666,7 +666,7 @@ def list_by_resource_group(
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.VaultListResult] = kwargs.pop("cls", None)
 
         error_map = {
@@ -752,7 +752,7 @@ def list_by_subscription(self, top: Optional[int] = None, **kwargs: Any) -> Asyn
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.VaultListResult] = kwargs.pop("cls", None)
 
         error_map = {
@@ -834,7 +834,7 @@ def list_deleted(self, **kwargs: Any) -> AsyncIterable["_models.DeletedVault"]:
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.DeletedVaultListResult] = kwargs.pop("cls", None)
 
         error_map = {
@@ -926,7 +926,7 @@ async def get_deleted(self, vault_name: str, location: str, **kwargs: Any) -> _m
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.DeletedVault] = kwargs.pop("cls", None)
 
         request = build_get_deleted_request(
@@ -977,7 +977,7 @@ async def _purge_deleted_initial(  # pylint: disable=inconsistent-return-stateme
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[None] = kwargs.pop("cls", None)
 
         request = build_purge_deleted_request(
@@ -1033,7 +1033,7 @@ async def begin_purge_deleted(self, vault_name: str, location: str, **kwargs: An
         _headers = kwargs.pop("headers", {}) or {}
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[None] = kwargs.pop("cls", None)
         polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
@@ -1074,31 +1074,31 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
     }
 
     @distributed_trace
-    def list(
-        self,
-        filter: Union[str, _models.Enum5],
-        api_version: Union[str, _models.Enum6],
-        top: Optional[int] = None,
-        **kwargs: Any
-    ) -> AsyncIterable["_models.Resource"]:
+    def list(self, top: Optional[int] = None, **kwargs: Any) -> AsyncIterable["_models.Resource"]:
         """The List operation gets information about the vaults associated with the subscription.
 
-        :param filter: The filter to apply on the operation. "resourceType eq
-         'Microsoft.KeyVault/vaults'" Required.
-        :type filter: str or ~azure.mgmt.keyvault.v2016_10_01.models.Enum5
-        :param api_version: Azure Resource Manager Api Version. "2015-11-01" Required.
-        :type api_version: str or ~azure.mgmt.keyvault.v2016_10_01.models.Enum6
         :param top: Maximum number of results to return. Default value is None.
         :type top: int
+        :keyword filter: The filter to apply on the operation. Default value is "resourceType eq
+         'Microsoft.KeyVault/vaults'". Note that overriding this default value may result in unsupported
+         behavior.
+        :paramtype filter: str
+        :keyword api_version: Azure Resource Manager Api Version. Default value is "2015-11-01". Note
+         that overriding this default value may result in unsupported behavior.
+        :paramtype api_version: str
         :keyword callable cls: A custom type or function that will be passed the direct response
         :return: An iterator like instance of either Resource or the result of cls(response)
         :rtype:
          ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.keyvault.v2016_10_01.models.Resource]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         _headers = kwargs.pop("headers", {}) or {}
-        _params = kwargs.pop("params", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
+        filter: Literal["resourceType eq 'Microsoft.KeyVault/vaults'"] = kwargs.pop(
+            "filter", _params.pop("$filter", "resourceType eq 'Microsoft.KeyVault/vaults'")
+        )
+        api_version: Literal["2015-11-01"] = kwargs.pop("api_version", _params.pop("api-version", "2015-11-01"))
         cls: ClsType[_models.ResourceListResult] = kwargs.pop("cls", None)
 
         error_map = {
@@ -1114,9 +1114,9 @@ def prepare_request(next_link=None):
 
                 request = build_list_request(
                     subscription_id=self._config.subscription_id,
+                    top=top,
                     filter=filter,
                     api_version=api_version,
-                    top=top,
                     template_url=self.list.metadata["url"],
                     headers=_headers,
                     params=_params,
@@ -1235,7 +1235,7 @@ 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-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None)
 

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/__init__.py

@@ -33,8 +33,6 @@
 from ._key_vault_management_client_enums import AccessPolicyUpdateKind
 from ._key_vault_management_client_enums import CertificatePermissions
 from ._key_vault_management_client_enums import CreateMode
-from ._key_vault_management_client_enums import Enum5
-from ._key_vault_management_client_enums import Enum6
 from ._key_vault_management_client_enums import KeyPermissions
 from ._key_vault_management_client_enums import Reason
 from ._key_vault_management_client_enums import SecretPermissions
@@ -72,8 +70,6 @@
     "AccessPolicyUpdateKind",
     "CertificatePermissions",
     "CreateMode",
-    "Enum5",
-    "Enum6",
     "KeyPermissions",
     "Reason",
     "SecretPermissions",

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/_key_vault_management_client_enums.py

@@ -35,6 +35,7 @@ class CertificatePermissions(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     MANAGEISSUERS = "manageissuers"
     RECOVER = "recover"
     PURGE = "purge"
+    IMPORT_ENUM = "import"
 
 
 class CreateMode(str, Enum, metaclass=CaseInsensitiveEnumMeta):
@@ -44,18 +45,6 @@ class CreateMode(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     DEFAULT = "default"
 
 
-class Enum5(str, Enum, metaclass=CaseInsensitiveEnumMeta):
-    """Enum5."""
-
-    RESOURCE_TYPE_EQ_MICROSOFT_KEY_VAULT_VAULTS_ = "resourceType eq 'Microsoft.KeyVault/vaults'"
-
-
-class Enum6(str, Enum, metaclass=CaseInsensitiveEnumMeta):
-    """Enum6."""
-
-    TWO_THOUSAND_FIFTEEN11_01 = "2015-11-01"
-
-
 class KeyPermissions(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """KeyPermissions."""
 
@@ -75,6 +64,7 @@ class KeyPermissions(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RESTORE = "restore"
     RECOVER = "recover"
     PURGE = "purge"
+    IMPORT_ENUM = "import"
 
 
 class Reason(str, Enum, metaclass=CaseInsensitiveEnumMeta):

sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_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["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -91,7 +86,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["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
         error_map = {