Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
cb9ad8b
add track2 sdk for keyvault certificates and secrets
calvinhzy Apr 10, 2023
c968f73
tested `secret list/list-deleted/list-versions`, `secret set` is part…
calvinhzy Apr 13, 2023
286c218
`az keyvault secret set` done
calvinhzy Apr 14, 2023
267660f
`az keyvault secret set-attributes` done
calvinhzy Apr 17, 2023
bf8bd94
`az keyvault secret show` done, reformat _params.py
calvinhzy Apr 17, 2023
fc040cb
`az keyvault secret show-deleted` done
calvinhzy Apr 17, 2023
5e52dba
`az keyvault secret delete` done
calvinhzy Apr 17, 2023
f678b9f
`az keyvault secret purge` done
calvinhzy Apr 17, 2023
6ebdad9
`az keyvault secret purge` done
calvinhzy Apr 23, 2023
cb2023c
`az keyvault secret recover` done
calvinhzy Apr 24, 2023
afd3543
`az keyvault secret download` done
calvinhzy Apr 24, 2023
7f21ef7
`az keyvault secret backup` done
calvinhzy Apr 24, 2023
0018057
`az keyvault secret restore` done , `az keyvault secret` done, still …
calvinhzy Apr 24, 2023
2a8bdd0
`az keyvault secret` tests passed
calvinhzy Apr 24, 2023
eff8bd3
`az keyvault certificate create` done
calvinhzy Apr 26, 2023
2583be0
`az keyvault certificate list` done
calvinhzy May 4, 2023
0700050
`az keyvault certificate list-versions` done
calvinhzy May 5, 2023
0e9613a
`az keyvault certificate list-deleted` done
calvinhzy May 5, 2023
6c16206
`az keyvault certificate show` done
calvinhzy May 5, 2023
22d468c
`az keyvault certificate show` done
calvinhzy May 5, 2023
bf3fd21
`az keyvault certificate show-deleted` done
calvinhzy May 6, 2023
d8741bb
`az keyvault certificate delete` done
calvinhzy May 6, 2023
89ed49d
`az keyvault certificate purge` done
calvinhzy May 6, 2023
f3cd994
`az keyvault certificate recover` done
calvinhzy May 6, 2023
e7413be
`az keyvault certificate set-attributes` done
calvinhzy May 8, 2023
aabd2cb
`az keyvault certificate set-attributes` done
calvinhzy May 8, 2023
09c2627
`az keyvault certificate import` done, need to fix x509properties,bas…
calvinhzy May 9, 2023
d559038
`az keyvault certificate import` no need for custom func
calvinhzy May 9, 2023
3aea48f
`az keyvault certificate download` done
calvinhzy May 9, 2023
9b8fd36
remove basic_constraints as no longer return by track2 sdk
calvinhzy May 10, 2023
232013a
`az keyvault certificate get-default-policy` done
calvinhzy May 10, 2023
6f44ecc
`az keyvault certificate backup` done
calvinhzy May 10, 2023
46d46be
`az keyvault certificate restore` done
calvinhzy May 10, 2023
0783390
`az keyvault certificate pending merge` done, testing not finished be…
calvinhzy May 11, 2023
c299288
`az keyvault certificate pending show` done
calvinhzy May 11, 2023
0f52a61
`az keyvault certificate pending delete` done
calvinhzy May 11, 2023
fba44ae
`az keyvault certificate contact list` done
calvinhzy May 11, 2023
4cbd929
`az keyvault certificate contact add` done
calvinhzy May 11, 2023
50e421f
`az keyvault certificate contact delete` done, BREAKING CHANGE, if de…
calvinhzy May 11, 2023
f09c552
`az keyvault certificate issuer create` done, BREAKING CHANGE, "zip" …
calvinhzy May 12, 2023
e3bd699
`az keyvault certificate issuer update` done
calvinhzy May 12, 2023
5d7951a
`az keyvault certificate issuer list` done
calvinhzy May 12, 2023
dd7f387
`az keyvault certificate issuer show` done
calvinhzy May 14, 2023
8e568fd
`az keyvault certificate issuer delete` done
calvinhzy May 14, 2023
557ae1b
`az keyvault certificate issuer admin add` done, BREAKING CHANGE: ret…
calvinhzy May 14, 2023
72ee659
`az keyvault certificate issuer admin list` done
calvinhzy May 15, 2023
1db2a2d
`az keyvault certificate issuer admin delete` done, fix case when the…
calvinhzy May 15, 2023
71294dd
fix some tests, test_keyvault_certificate_issuers still not fully wor…
calvinhzy May 15, 2023
cd00297
lint
calvinhzy May 15, 2023
dbf9f65
Merge remote-tracking branch 'upstream/dev' into keyvault-migrate-track2
calvinhzy May 15, 2023
9d47183
use sdk functions directly to bypass error where cannot set str back …
calvinhzy May 15, 2023
9e06bb6
pylint fix
calvinhzy May 15, 2023
76245f1
Rerun tests from instance 7. See test_results_None_latest_7.parallel.…
azclibot May 15, 2023
69da25d
Rerun tests from instance 1. See test_results_None_latest_1.serial.xm…
azclibot May 15, 2023
4b05511
Rerun tests from instance 2. See test_results_None_latest_2.parallel.…
azclibot May 15, 2023
faafdec
Rerun tests from instance 3. See test_results_None_latest_3.parallel.…
azclibot May 15, 2023
9adccfc
pylint fix
calvinhzy May 16, 2023
27b2add
fix validator for cert policy
calvinhzy May 16, 2023
16f326b
fix recordings
calvinhzy May 16, 2023
9471e4b
fix recordings
calvinhzy May 16, 2023
8c64656
Rerun tests from instance 3. See test_results_None_latest_3.parallel.…
azclibot May 16, 2023
38cfc17
fix recordings
calvinhzy May 16, 2023
6f9a7a1
fix recordings
calvinhzy May 16, 2023
3745215
fix recordings
calvinhzy May 16, 2023
eca2e46
fix recordings
calvinhzy May 16, 2023
905e301
fix recordings
calvinhzy May 16, 2023
59534e1
old api version keyvault has no soft delete
calvinhzy May 17, 2023
3a95046
old api version keyvault mgmt plane has no soft delete
calvinhzy May 17, 2023
bf96673
Merge remote-tracking branch 'upstream/dev' into keyvault-migrate-track2
calvinhzy May 17, 2023
695fc73
try to fix recording again
calvinhzy May 17, 2023
af78552
BREAKING CHANGE: pending not return by SDK anymore as it is an additi…
calvinhzy May 17, 2023
66495b2
fix recording
calvinhzy May 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/azure-cli-core/azure/cli/core/profiles/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ class ResourceType(Enum): # pylint: disable=too-few-public-methods
MGMT_MONITOR = ('azure.mgmt.monitor', 'MonitorManagementClient')
MGMT_MSI = ('azure.mgmt.msi', 'ManagedServiceIdentityClient')
DATA_KEYVAULT = ('azure.keyvault', 'KeyVaultClient')
DATA_KEYVAULT_CERTIFICATES = ('azure.keyvault.certificates', 'CertificateClient')
DATA_KEYVAULT_KEYS = ('azure.keyvault.keys', 'KeyClient')
DATA_KEYVAULT_SECRETS = ('azure.keyvault.secrets', 'SecretClient')
DATA_PRIVATE_KEYVAULT = ('azure.cli.command_modules.keyvault.vendored_sdks.azure_keyvault_t1', 'KeyVaultClient')
DATA_KEYVAULT_ADMINISTRATION_BACKUP = ('azure.keyvault.administration', 'KeyVaultBackupClient')
DATA_KEYVAULT_ADMINISTRATION_ACCESS_CONTROL = ('azure.keyvault.administration', 'KeyVaultAccessControlClient')
Expand Down Expand Up @@ -199,7 +201,9 @@ def default_api_version(self):
}),
# The order does make things different.
# Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
ResourceType.DATA_KEYVAULT_KEYS: None,
ResourceType.DATA_KEYVAULT_SECRETS: None,
ResourceType.DATA_KEYVAULT_ADMINISTRATION_SETTING: None,
ResourceType.DATA_KEYVAULT: '7.0',
ResourceType.DATA_PRIVATE_KEYVAULT: '7.2',
Expand Down Expand Up @@ -293,7 +297,9 @@ def default_api_version(self):
}),
# The order does make things different.
# Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
ResourceType.DATA_KEYVAULT_KEYS: None,
ResourceType.DATA_KEYVAULT_SECRETS: None,
ResourceType.DATA_KEYVAULT: '2016-10-01',
ResourceType.DATA_STORAGE: '2018-11-09',
ResourceType.DATA_STORAGE_BLOB: '2019-07-07',
Expand Down Expand Up @@ -338,7 +344,9 @@ def default_api_version(self):
}),
# The order does make things different.
# Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
ResourceType.DATA_KEYVAULT_KEYS: None,
ResourceType.DATA_KEYVAULT_SECRETS: None,
ResourceType.DATA_KEYVAULT: '2016-10-01',
ResourceType.DATA_STORAGE: '2017-11-09',
ResourceType.DATA_STORAGE_BLOB: '2017-11-09',
Expand Down Expand Up @@ -375,7 +383,9 @@ def default_api_version(self):
}),
# The order does make things different.
# Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
ResourceType.DATA_KEYVAULT_KEYS: None,
ResourceType.DATA_KEYVAULT_SECRETS: None,
ResourceType.DATA_KEYVAULT: '2016-10-01',
ResourceType.DATA_STORAGE: '2017-04-17',
ResourceType.DATA_STORAGE_BLOB: '2017-04-17',
Expand Down Expand Up @@ -404,7 +414,9 @@ def default_api_version(self):
}),
# The order does make things different.
# Please keep ResourceType.DATA_KEYVAULT_KEYS before ResourceType.DATA_KEYVAULT
ResourceType.DATA_KEYVAULT_CERTIFICATES: None,
ResourceType.DATA_KEYVAULT_KEYS: None,
ResourceType.DATA_KEYVAULT_SECRETS: None,
ResourceType.DATA_KEYVAULT: '2016-10-01',
ResourceType.DATA_STORAGE: '2015-04-05',
ResourceType.DATA_STORAGE_BLOB: '2015-04-05',
Expand Down
4 changes: 4 additions & 0 deletions src/azure-cli-testsdk/azure/cli/testsdk/preparers.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,15 @@ def _get_resource_group(self, **kwargs):
class KeyVaultPreparer(NoTrafficRecordingPreparer, SingleValueReplacer):
def __init__(self, name_prefix='clitest', sku='standard', location='westus',
parameter_name='key_vault', resource_group_parameter_name='resource_group', skip_delete=False,
skip_purge=False,
dev_setting_name='AZURE_CLI_TEST_DEV_KEY_VAULT_NAME', key='kv', name_len=24, additional_params=None):
super(KeyVaultPreparer, self).__init__(name_prefix, name_len)
self.cli_ctx = get_dummy_cli()
self.location = location
self.sku = sku
self.resource_group_parameter_name = resource_group_parameter_name
self.skip_delete = skip_delete
self.skip_purge = skip_purge
self.parameter_name = parameter_name
self.key = key
self.additional_params = additional_params
Expand All @@ -208,6 +210,8 @@ def remove_resource(self, name, **kwargs):
group = self._get_resource_group(**kwargs)
self.live_only_execute(self.cli_ctx, 'az keyvault delete -n {} -g {}'.format(name, group))
from azure.core.exceptions import HttpResponseError
if self.skip_purge:
return
try:
self.live_only_execute(self.cli_ctx, 'az keyvault purge -n {} -l {}'.format(name, self.location))
except HttpResponseError:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interactions:
accept-language:
- en-US
method: GET
uri: https://cliimportkv73021.vault.azure.net/secrets/SPusername/?api-version=7.0
uri: https://cliimportkv73021.vault.azure.net/secrets/SPusername/?api-version=7.4
response:
body:
string: '{"error":{"code":"Unauthorized","message":"AKV10000: Request is missing
Expand Down Expand Up @@ -71,7 +71,7 @@ interactions:
accept-language:
- en-US
method: GET
uri: https://cliimportkv73021.vault.azure.net/secrets/SPusername/?api-version=7.0
uri: https://cliimportkv73021.vault.azure.net/secrets/SPusername/?api-version=7.4
response:
body:
string: '{"value":"48f3eac9-fc0f-4a89-8ceb-1bcf16318a46","id":"https://cliimportkv73021.vault.azure.net/secrets/SPusername/a10cceb994ca428d8e8489358473b82c","attributes":{"enabled":true,"created":1627689801,"updated":1627689801,"recoveryLevel":"Recoverable+Purgeable"}}'
Expand Down Expand Up @@ -118,7 +118,7 @@ interactions:
accept-language:
- en-US
method: GET
uri: https://cliimportkv73021.vault.azure.net/secrets/SPpassword/?api-version=7.0
uri: https://cliimportkv73021.vault.azure.net/secrets/SPpassword/?api-version=7.4
response:
body:
string: '{"value":"93qegDf7Q.OQ~-lttx6TQp7Xeb_7cD8fIP","id":"https://cliimportkv73021.vault.azure.net/secrets/SPpassword/a444beb8c32644b5a9a44448a192b12b","attributes":{"enabled":true,"created":1627689824,"updated":1627689824,"recoveryLevel":"Recoverable+Purgeable"}}'
Expand Down
Loading