Skip to content

Commit 4f495d9

Browse files
azure-sdkmsyyc
azure-sdk
and
msyyc
authored
[AutoRelease] t2-keyvault-2023-04-03-11697(can only be merged by SDK owner) (Azure#29713)
* code and test * changelog --------- Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>
1 parent 87ed2b7 commit 4f495d9

File tree

173 files changed

+1304
-2683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1304
-2683
lines changed

‎sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History
22

3+
## 10.2.1 (2023-04-03)
4+
5+
### Bugs Fixed
6+
7+
- Seal enum which has single value as constant by default to avoid breaking change
8+
39
## 10.2.0 (2023-03-13)
410

511
### Features Added

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "ee96574a6d4ed37a06883b8e3f8fd3adf4803b83",
2+
"commit": "945ea7b3682db6a45471cf22f77d548c54417d34",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.2",
55
"use": [
6-
"@autorest/python@6.4.3",
6+
"@autorest/python@6.4.7",
77
"@autorest/modelerfour@4.24.3"
88
],
9-
"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",
9+
"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.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
1010
"readme": "specification/keyvault/resource-manager/readme.md"
1111
}

‎sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/_serialization.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
631631
if xml_desc.get("attr", False):
632632
if xml_ns:
633633
ET.register_namespace(xml_prefix, xml_ns)
634-
xml_name = "{}{}".format(xml_ns, xml_name)
634+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
635635
serialized.set(xml_name, new_attr) # type: ignore
636636
continue
637637
if xml_desc.get("text", False):
@@ -1273,7 +1273,7 @@ def _extract_name_from_internal_type(internal_type):
12731273
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
12741274
xml_ns = internal_type_xml_map.get("ns", None)
12751275
if xml_ns:
1276-
xml_name = "{}{}".format(xml_ns, xml_name)
1276+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12771277
return xml_name
12781278

12791279

@@ -1297,7 +1297,7 @@ def xml_key_extractor(attr, attr_desc, data):
12971297
# Integrate namespace if necessary
12981298
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
12991299
if xml_ns:
1300-
xml_name = "{}{}".format(xml_ns, xml_name)
1300+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
13011301

13021302
# If it's an attribute, that's simple
13031303
if xml_desc.get("attr", False):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# license information.
66
# --------------------------------------------------------------------------
77

8-
VERSION = "10.2.0"
8+
VERSION = "10.2.1"

‎sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/_configuration.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from ._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials import TokenCredential
@@ -43,7 +37,7 @@ class KeyVaultManagementClientConfiguration(Configuration): # pylint: disable=t
4337

4438
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
4539
super(KeyVaultManagementClientConfiguration, self).__init__(**kwargs)
46-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", "2016-10-01")
40+
api_version: str = kwargs.pop("api_version", "2016-10-01")
4741

4842
if credential is None:
4943
raise ValueError("Parameter 'credential' must not be None.")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "10.2.0"
9+
VERSION = "10.2.1"

‎sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/aio/_configuration.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from .._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials_async import AsyncTokenCredential
@@ -43,7 +37,7 @@ class KeyVaultManagementClientConfiguration(Configuration): # pylint: disable=t
4337

4438
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
4539
super(KeyVaultManagementClientConfiguration, self).__init__(**kwargs)
46-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", "2016-10-01")
40+
api_version: str = kwargs.pop("api_version", "2016-10-01")
4741

4842
if credential is None:
4943
raise ValueError("Parameter 'credential' must not be None.")

‎sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/aio/operations/_operations.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Code generated by Microsoft (R) AutoRest Code Generator.
77
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
88
# --------------------------------------------------------------------------
9-
import sys
109
from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
1110
import urllib.parse
1211

@@ -30,10 +29,6 @@
3029
from ..._vendor import _convert_request
3130
from ...operations._operations import build_list_request
3231

33-
if sys.version_info >= (3, 8):
34-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
35-
else:
36-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
3732
T = TypeVar("T")
3833
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
3934

@@ -70,7 +65,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
7065
_headers = kwargs.pop("headers", {}) or {}
7166
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
7267

73-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
68+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
7469
cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
7570

7671
error_map = {

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async def create_or_update(
166166
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
167167
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
168168

169-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
169+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
170170
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
171171
cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
172172

@@ -312,7 +312,7 @@ async def update(
312312
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
313313
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
314314

315-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
315+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
316316
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
317317
cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
318318

@@ -392,7 +392,7 @@ async def delete( # pylint: disable=inconsistent-return-statements
392392
_headers = kwargs.pop("headers", {}) or {}
393393
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
394394

395-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
395+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
396396
cls: ClsType[None] = kwargs.pop("cls", None)
397397

398398
request = build_delete_request(
@@ -450,7 +450,7 @@ async def get(self, resource_group_name: str, vault_name: str, **kwargs: Any) ->
450450
_headers = kwargs.pop("headers", {}) or {}
451451
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
452452

453-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
453+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
454454
cls: ClsType[_models.Vault] = kwargs.pop("cls", None)
455455

456456
request = build_get_request(
@@ -592,7 +592,7 @@ async def update_access_policy(
592592
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
593593
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
594594

595-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
595+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
596596
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
597597
cls: ClsType[_models.VaultAccessPolicyParameters] = kwargs.pop("cls", None)
598598

@@ -666,7 +666,7 @@ def list_by_resource_group(
666666
_headers = kwargs.pop("headers", {}) or {}
667667
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
668668

669-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
669+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
670670
cls: ClsType[_models.VaultListResult] = kwargs.pop("cls", None)
671671

672672
error_map = {
@@ -752,7 +752,7 @@ def list_by_subscription(self, top: Optional[int] = None, **kwargs: Any) -> Asyn
752752
_headers = kwargs.pop("headers", {}) or {}
753753
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
754754

755-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
755+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
756756
cls: ClsType[_models.VaultListResult] = kwargs.pop("cls", None)
757757

758758
error_map = {
@@ -834,7 +834,7 @@ def list_deleted(self, **kwargs: Any) -> AsyncIterable["_models.DeletedVault"]:
834834
_headers = kwargs.pop("headers", {}) or {}
835835
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
836836

837-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
837+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
838838
cls: ClsType[_models.DeletedVaultListResult] = kwargs.pop("cls", None)
839839

840840
error_map = {
@@ -926,7 +926,7 @@ async def get_deleted(self, vault_name: str, location: str, **kwargs: Any) -> _m
926926
_headers = kwargs.pop("headers", {}) or {}
927927
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
928928

929-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
929+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
930930
cls: ClsType[_models.DeletedVault] = kwargs.pop("cls", None)
931931

932932
request = build_get_deleted_request(
@@ -977,7 +977,7 @@ async def _purge_deleted_initial( # pylint: disable=inconsistent-return-stateme
977977
_headers = kwargs.pop("headers", {}) or {}
978978
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
979979

980-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
980+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
981981
cls: ClsType[None] = kwargs.pop("cls", None)
982982

983983
request = build_purge_deleted_request(
@@ -1033,7 +1033,7 @@ async def begin_purge_deleted(self, vault_name: str, location: str, **kwargs: An
10331033
_headers = kwargs.pop("headers", {}) or {}
10341034
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
10351035

1036-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
1036+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
10371037
cls: ClsType[None] = kwargs.pop("cls", None)
10381038
polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
10391039
lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
@@ -1074,31 +1074,31 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
10741074
}
10751075

10761076
@distributed_trace
1077-
def list(
1078-
self,
1079-
filter: Union[str, _models.Enum5],
1080-
api_version: Union[str, _models.Enum6],
1081-
top: Optional[int] = None,
1082-
**kwargs: Any
1083-
) -> AsyncIterable["_models.Resource"]:
1077+
def list(self, top: Optional[int] = None, **kwargs: Any) -> AsyncIterable["_models.Resource"]:
10841078
"""The List operation gets information about the vaults associated with the subscription.
10851079
1086-
:param filter: The filter to apply on the operation. "resourceType eq
1087-
'Microsoft.KeyVault/vaults'" Required.
1088-
:type filter: str or ~azure.mgmt.keyvault.v2016_10_01.models.Enum5
1089-
:param api_version: Azure Resource Manager Api Version. "2015-11-01" Required.
1090-
:type api_version: str or ~azure.mgmt.keyvault.v2016_10_01.models.Enum6
10911080
:param top: Maximum number of results to return. Default value is None.
10921081
:type top: int
1082+
:keyword filter: The filter to apply on the operation. Default value is "resourceType eq
1083+
'Microsoft.KeyVault/vaults'". Note that overriding this default value may result in unsupported
1084+
behavior.
1085+
:paramtype filter: str
1086+
:keyword api_version: Azure Resource Manager Api Version. Default value is "2015-11-01". Note
1087+
that overriding this default value may result in unsupported behavior.
1088+
:paramtype api_version: str
10931089
:keyword callable cls: A custom type or function that will be passed the direct response
10941090
:return: An iterator like instance of either Resource or the result of cls(response)
10951091
:rtype:
10961092
~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.keyvault.v2016_10_01.models.Resource]
10971093
:raises ~azure.core.exceptions.HttpResponseError:
10981094
"""
10991095
_headers = kwargs.pop("headers", {}) or {}
1100-
_params = kwargs.pop("params", {}) or {}
1096+
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
11011097

1098+
filter: Literal["resourceType eq 'Microsoft.KeyVault/vaults'"] = kwargs.pop(
1099+
"filter", _params.pop("$filter", "resourceType eq 'Microsoft.KeyVault/vaults'")
1100+
)
1101+
api_version: Literal["2015-11-01"] = kwargs.pop("api_version", _params.pop("api-version", "2015-11-01"))
11021102
cls: ClsType[_models.ResourceListResult] = kwargs.pop("cls", None)
11031103

11041104
error_map = {
@@ -1114,9 +1114,9 @@ def prepare_request(next_link=None):
11141114

11151115
request = build_list_request(
11161116
subscription_id=self._config.subscription_id,
1117+
top=top,
11171118
filter=filter,
11181119
api_version=api_version,
1119-
top=top,
11201120
template_url=self.list.metadata["url"],
11211121
headers=_headers,
11221122
params=_params,
@@ -1235,7 +1235,7 @@ async def check_name_availability(
12351235
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
12361236
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
12371237

1238-
api_version: Literal["2016-10-01"] = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
1238+
api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2016-10-01"))
12391239
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
12401240
cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None)
12411241

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
from ._key_vault_management_client_enums import AccessPolicyUpdateKind
3434
from ._key_vault_management_client_enums import CertificatePermissions
3535
from ._key_vault_management_client_enums import CreateMode
36-
from ._key_vault_management_client_enums import Enum5
37-
from ._key_vault_management_client_enums import Enum6
3836
from ._key_vault_management_client_enums import KeyPermissions
3937
from ._key_vault_management_client_enums import Reason
4038
from ._key_vault_management_client_enums import SecretPermissions
@@ -72,8 +70,6 @@
7270
"AccessPolicyUpdateKind",
7371
"CertificatePermissions",
7472
"CreateMode",
75-
"Enum5",
76-
"Enum6",
7773
"KeyPermissions",
7874
"Reason",
7975
"SecretPermissions",

0 commit comments

Comments
 (0)