Skip to content

Commit 817c91e

Browse files
authored
[Key Vault] Add API version 7.2 for certificates (Azure#18722)
1 parent ff43bf1 commit 817c91e

File tree

105 files changed

+47837
-4263
lines changed

Some content is hidden

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

105 files changed

+47837
-4263
lines changed

sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md

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

33
## 4.3.0b1 (Unreleased)
4+
### Changed
5+
- Key Vault API version 7.2 is now the default
6+
- Updated msrest requirement to >=0.6.21
7+
48
### Added
59
- Added method `parse_key_vault_certificate_id` that parses out a full ID returned by Key Vault, so users can easily
610
access the certificate's `name`, `vault_url`, and `version`.

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_configuration.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
# Changes may cause incorrect behavior and will be lost if the code is
99
# regenerated.
1010
# --------------------------------------------------------------------------
11-
from typing import Any
11+
from typing import TYPE_CHECKING
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
1515

1616
from ._version import VERSION
1717

18+
if TYPE_CHECKING:
19+
# pylint: disable=unused-import,ungrouped-imports
20+
from typing import Any
1821

1922
class KeyVaultClientConfiguration(Configuration):
2023
"""Configuration for KeyVaultClient.

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_key_vault_client.py

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,22 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from azure.core import PipelineClient
13-
from msrest import Serializer, Deserializer
12+
from typing import TYPE_CHECKING
1413

14+
from azure.core import PipelineClient
1515
from azure.profiles import KnownProfiles, ProfileDefinition
1616
from azure.profiles.multiapiclient import MultiApiClientMixin
17+
from msrest import Deserializer, Serializer
18+
1719
from ._configuration import KeyVaultClientConfiguration
1820
from ._operations_mixin import KeyVaultClientOperationsMixin
21+
22+
if TYPE_CHECKING:
23+
# pylint: disable=unused-import,ungrouped-imports
24+
from typing import Any, Optional
25+
26+
from azure.core.pipeline.transport import HttpRequest, HttpResponse
27+
1928
class _SDKClient(object):
2029
def __init__(self, *args, **kwargs):
2130
"""This is a fake class to support current implemetation of MultiApiClientMixin."
@@ -33,8 +42,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
3342
The profile sets a mapping between an operation group and its API version.
3443
The api-version parameter sets the default API version if the operation
3544
group is not described in the profile.
36-
:param str api_version: API version to use if no profile is provided, or if
37-
missing in profile.
45+
:param api_version: API version to use if no profile is provided, or if missing in profile.
46+
:type api_version: str
3847
:param profile: A profile definition, from KnownProfiles to dict.
3948
:type profile: azure.profiles.KnownProfiles
4049
"""
@@ -50,14 +59,14 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
5059

5160
def __init__(
5261
self,
53-
api_version=None,
54-
profile=KnownProfiles.default,
62+
api_version=None, # type: Optional[str]
63+
profile=KnownProfiles.default, # type: KnownProfiles
5564
**kwargs # type: Any
5665
):
57-
if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1':
66+
if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1' or api_version == '7.2':
5867
base_url = '{vaultBaseUrl}'
5968
else:
60-
raise NotImplementedError("APIVersion {} is not available".format(api_version))
69+
raise ValueError("API version {} is not available".format(api_version))
6170
self._config = KeyVaultClientConfiguration(**kwargs)
6271
self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)
6372
super(KeyVaultClient, self).__init__(
@@ -76,6 +85,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
7685
* 2016-10-01: :mod:`v2016_10_01.models<azure.keyvault.v2016_10_01.models>`
7786
* 7.0: :mod:`v7_0.models<azure.keyvault.v7_0.models>`
7887
* 7.1: :mod:`v7_1.models<azure.keyvault.v7_1.models>`
88+
* 7.2: :mod:`v7_2.models<azure.keyvault.v7_2.models>`
7989
"""
8090
if api_version == '2016-10-01':
8191
from .v2016_10_01 import models
@@ -86,7 +96,10 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8696
elif api_version == '7.1':
8797
from .v7_1 import models
8898
return models
89-
raise NotImplementedError("APIVersion {} is not available".format(api_version))
99+
elif api_version == '7.2':
100+
from .v7_2 import models
101+
return models
102+
raise ValueError("API version {} is not available".format(api_version))
90103

91104
def close(self):
92105
self._client.close()

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_operations_mixin.py

Lines changed: 245 additions & 113 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/__init__.py

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

9-
from ._key_vault_client_async import KeyVaultClient
9+
from ._key_vault_client import KeyVaultClient
1010
__all__ = ['KeyVaultClient']

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration_async.py renamed to sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_configuration.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
from .._version import VERSION
1717

18-
1918
class KeyVaultClientConfiguration(Configuration):
2019
"""Configuration for KeyVaultClient.
2120

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_key_vault_client_async.py renamed to sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/aio/_key_vault_client.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from azure.core import AsyncPipelineClient
13-
from msrest import Serializer, Deserializer
12+
from typing import Any, Optional
1413

14+
from azure.core import AsyncPipelineClient
15+
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
1516
from azure.profiles import KnownProfiles, ProfileDefinition
1617
from azure.profiles.multiapiclient import MultiApiClientMixin
17-
from ._configuration_async import KeyVaultClientConfiguration
18-
from ._operations_mixin_async import KeyVaultClientOperationsMixin
18+
from msrest import Deserializer, Serializer
19+
20+
from ._configuration import KeyVaultClientConfiguration
21+
from ._operations_mixin import KeyVaultClientOperationsMixin
22+
1923
class _SDKClient(object):
2024
def __init__(self, *args, **kwargs):
2125
"""This is a fake class to support current implemetation of MultiApiClientMixin."
@@ -33,8 +37,8 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
3337
The profile sets a mapping between an operation group and its API version.
3438
The api-version parameter sets the default API version if the operation
3539
group is not described in the profile.
36-
:param str api_version: API version to use if no profile is provided, or if
37-
missing in profile.
40+
:param api_version: API version to use if no profile is provided, or if missing in profile.
41+
:type api_version: str
3842
:param profile: A profile definition, from KnownProfiles to dict.
3943
:type profile: azure.profiles.KnownProfiles
4044
"""
@@ -50,14 +54,14 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
5054

5155
def __init__(
5256
self,
53-
api_version=None,
54-
profile=KnownProfiles.default,
57+
api_version: Optional[str] = None,
58+
profile: KnownProfiles = KnownProfiles.default,
5559
**kwargs # type: Any
5660
) -> None:
57-
if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1':
61+
if api_version == '2016-10-01' or api_version == '7.0' or api_version == '7.1' or api_version == '7.2':
5862
base_url = '{vaultBaseUrl}'
5963
else:
60-
raise NotImplementedError("APIVersion {} is not available".format(api_version))
64+
raise ValueError("API version {} is not available".format(api_version))
6165
self._config = KeyVaultClientConfiguration(**kwargs)
6266
self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs)
6367
super(KeyVaultClient, self).__init__(
@@ -76,6 +80,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
7680
* 2016-10-01: :mod:`v2016_10_01.models<azure.keyvault.v2016_10_01.models>`
7781
* 7.0: :mod:`v7_0.models<azure.keyvault.v7_0.models>`
7882
* 7.1: :mod:`v7_1.models<azure.keyvault.v7_1.models>`
83+
* 7.2: :mod:`v7_2.models<azure.keyvault.v7_2.models>`
7984
"""
8085
if api_version == '2016-10-01':
8186
from ..v2016_10_01 import models
@@ -86,7 +91,10 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8691
elif api_version == '7.1':
8792
from ..v7_1 import models
8893
return models
89-
raise NotImplementedError("APIVersion {} is not available".format(api_version))
94+
elif api_version == '7.2':
95+
from ..v7_2 import models
96+
return models
97+
raise ValueError("API version {} is not available".format(api_version))
9098

9199
async def close(self):
92100
await self._client.close()

0 commit comments

Comments
 (0)