Skip to content

Commit 4e1bbca

Browse files
authored
[keyvault] fix include_pending param and 2016-10-01 compatibility (Azure#13161)
1 parent dfe38f5 commit 4e1bbca

35 files changed

+1339
-826
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 4.2.1 (Unreleased)
44
### Fixed
55
- Correct typing for paging methods
6+
- Fixed incompatibility issues with API version 2016-10-01
67

78

89
## 4.2.0 (2020-08-11)

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_client.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,11 @@ def list_deleted_certificates(self, **kwargs):
555555
"""
556556
max_page_size = kwargs.pop("max_page_size", None)
557557

558+
if self.api_version == "2016-10-01" and kwargs.get("include_pending"):
559+
raise NotImplementedError(
560+
"The 'include_pending' parameter to `list_deleted_certificates` "
561+
"is only available for API versions v7.0 and up"
562+
)
558563
return self._client.get_deleted_certificates(
559564
vault_base_url=self._vault_url,
560565
maxresults=max_page_size,
@@ -589,6 +594,12 @@ def list_properties_of_certificates(self, **kwargs):
589594
"""
590595
max_page_size = kwargs.pop("max_page_size", None)
591596

597+
if self.api_version == "2016-10-01" and kwargs.get("include_pending"):
598+
raise NotImplementedError(
599+
"The 'include_pending' parameter to `list_properties_of_certificates` "
600+
"is only available for API versions v7.0 and up"
601+
)
602+
592603
return self._client.get_certificates(
593604
vault_base_url=self._vault_url,
594605
maxresults=max_page_size,

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

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -37,65 +37,13 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
3737
missing in profile.
3838
:param profile: A profile definition, from KnownProfiles to dict.
3939
:type profile: azure.profiles.KnownProfiles
40-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
4140
"""
4241

43-
DEFAULT_API_VERSION = '7.1'
42+
DEFAULT_API_VERSION = '2016-10-01'
4443
_PROFILE_TAG = "azure.keyvault.KeyVaultClient"
4544
LATEST_PROFILE = ProfileDefinition({
4645
_PROFILE_TAG: {
4746
None: DEFAULT_API_VERSION,
48-
'backup_key': '7.0',
49-
'backup_secret': '7.0',
50-
'backup_storage_account': '7.0',
51-
'create_key': '7.0',
52-
'decrypt': '7.0',
53-
'delete_key': '7.0',
54-
'delete_sas_definition': '7.0',
55-
'delete_secret': '7.0',
56-
'delete_storage_account': '7.0',
57-
'encrypt': '7.0',
58-
'get_deleted_key': '7.0',
59-
'get_deleted_keys': '7.0',
60-
'get_deleted_sas_definition': '7.0',
61-
'get_deleted_sas_definitions': '7.0',
62-
'get_deleted_secret': '7.0',
63-
'get_deleted_secrets': '7.0',
64-
'get_deleted_storage_account': '7.0',
65-
'get_deleted_storage_accounts': '7.0',
66-
'get_key': '7.0',
67-
'get_key_versions': '7.0',
68-
'get_keys': '7.0',
69-
'get_sas_definition': '7.0',
70-
'get_sas_definitions': '7.0',
71-
'get_secret': '7.0',
72-
'get_secret_versions': '7.0',
73-
'get_secrets': '7.0',
74-
'get_storage_account': '7.0',
75-
'get_storage_accounts': '7.0',
76-
'import_key': '7.0',
77-
'purge_deleted_key': '7.0',
78-
'purge_deleted_secret': '7.0',
79-
'purge_deleted_storage_account': '7.0',
80-
'recover_deleted_key': '7.0',
81-
'recover_deleted_sas_definition': '7.0',
82-
'recover_deleted_secret': '7.0',
83-
'recover_deleted_storage_account': '7.0',
84-
'regenerate_storage_account_key': '7.0',
85-
'restore_key': '7.0',
86-
'restore_secret': '7.0',
87-
'restore_storage_account': '7.0',
88-
'set_sas_definition': '7.0',
89-
'set_secret': '7.0',
90-
'set_storage_account': '7.0',
91-
'sign': '7.0',
92-
'unwrap_key': '7.0',
93-
'update_key': '7.0',
94-
'update_sas_definition': '7.0',
95-
'update_secret': '7.0',
96-
'update_storage_account': '7.0',
97-
'verify': '7.0',
98-
'wrap_key': '7.0',
9947
}},
10048
_PROFILE_TAG + " latest"
10149
)

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

Lines changed: 98 additions & 109 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -37,65 +37,13 @@ class KeyVaultClient(KeyVaultClientOperationsMixin, MultiApiClientMixin, _SDKCli
3737
missing in profile.
3838
:param profile: A profile definition, from KnownProfiles to dict.
3939
:type profile: azure.profiles.KnownProfiles
40-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
4140
"""
4241

43-
DEFAULT_API_VERSION = '7.1'
42+
DEFAULT_API_VERSION = '2016-10-01'
4443
_PROFILE_TAG = "azure.keyvault.KeyVaultClient"
4544
LATEST_PROFILE = ProfileDefinition({
4645
_PROFILE_TAG: {
4746
None: DEFAULT_API_VERSION,
48-
'backup_key': '7.0',
49-
'backup_secret': '7.0',
50-
'backup_storage_account': '7.0',
51-
'create_key': '7.0',
52-
'decrypt': '7.0',
53-
'delete_key': '7.0',
54-
'delete_sas_definition': '7.0',
55-
'delete_secret': '7.0',
56-
'delete_storage_account': '7.0',
57-
'encrypt': '7.0',
58-
'get_deleted_key': '7.0',
59-
'get_deleted_keys': '7.0',
60-
'get_deleted_sas_definition': '7.0',
61-
'get_deleted_sas_definitions': '7.0',
62-
'get_deleted_secret': '7.0',
63-
'get_deleted_secrets': '7.0',
64-
'get_deleted_storage_account': '7.0',
65-
'get_deleted_storage_accounts': '7.0',
66-
'get_key': '7.0',
67-
'get_key_versions': '7.0',
68-
'get_keys': '7.0',
69-
'get_sas_definition': '7.0',
70-
'get_sas_definitions': '7.0',
71-
'get_secret': '7.0',
72-
'get_secret_versions': '7.0',
73-
'get_secrets': '7.0',
74-
'get_storage_account': '7.0',
75-
'get_storage_accounts': '7.0',
76-
'import_key': '7.0',
77-
'purge_deleted_key': '7.0',
78-
'purge_deleted_secret': '7.0',
79-
'purge_deleted_storage_account': '7.0',
80-
'recover_deleted_key': '7.0',
81-
'recover_deleted_sas_definition': '7.0',
82-
'recover_deleted_secret': '7.0',
83-
'recover_deleted_storage_account': '7.0',
84-
'regenerate_storage_account_key': '7.0',
85-
'restore_key': '7.0',
86-
'restore_secret': '7.0',
87-
'restore_storage_account': '7.0',
88-
'set_sas_definition': '7.0',
89-
'set_secret': '7.0',
90-
'set_storage_account': '7.0',
91-
'sign': '7.0',
92-
'unwrap_key': '7.0',
93-
'update_key': '7.0',
94-
'update_sas_definition': '7.0',
95-
'update_secret': '7.0',
96-
'update_storage_account': '7.0',
97-
'verify': '7.0',
98-
'wrap_key': '7.0',
9947
}},
10048
_PROFILE_TAG + " latest"
10149
)

0 commit comments

Comments
 (0)