Skip to content

{KeyVault} Modify random vault name prefix #12076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bim-msft merged 7 commits into from
Feb 7, 2020
Merged

{KeyVault} Modify random vault name prefix #12076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcf21c3
Modify random vault name prefix
bim-msft Feb 6, 2020
ab7e659
Fix typo
bim-msft Feb 6, 2020
1ad42f5
Fix typo
bim-msft Feb 6, 2020
6aeeb61
Refined
bim-msft Feb 6, 2020
ae729e2
Reduce the prefix length and rerun all tests
bim-msft Feb 6, 2020
5f45ab4
Recover test_keyvault_certificate_get_default_policy.yaml
bim-msft Feb 7, 2020
9177490
Remove resource group preparer
bim-msft Feb 7, 2020
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
160 changes: 80 additions & 80 deletions .../command_modules/keyvault/tests/latest/recordings/test_keyvault_certificate_contacts.yaml
View file
Open in desktop

Large diffs are not rendered by default.

464 changes: 177 additions & 287 deletions .../cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_certificate_crud.yaml
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions .../command_modules/keyvault/tests/latest/recordings/test_keyvault_certificate_download.yaml
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 0 additions & 59 deletions ...odules/keyvault/tests/latest/recordings/test_keyvault_certificate_get_default_policy.yaml
View file
Open in desktop

This file was deleted.

92 changes: 46 additions & 46 deletions ...li/command_modules/keyvault/tests/latest/recordings/test_keyvault_certificate_import.yaml
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 133 additions & 133 deletions ...i/command_modules/keyvault/tests/latest/recordings/test_keyvault_certificate_issuers.yaml
View file
Open in desktop

Large diffs are not rendered by default.

294 changes: 147 additions & 147 deletions ...ure-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_key.yaml
View file
Open in desktop

Large diffs are not rendered by default.

544 changes: 272 additions & 272 deletions ...zure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_key_download.yaml
View file
Open in desktop

Large diffs are not rendered by default.

302 changes: 152 additions & 150 deletions ...re-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_mgmt.yaml
View file
Open in desktop

Large diffs are not rendered by default.

429 changes: 205 additions & 224 deletions ...zure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_network_rule.yaml
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 88 additions & 88 deletions ...i/command_modules/keyvault/tests/latest/recordings/test_keyvault_pending_certificate.yaml
View file
Open in desktop

Large diffs are not rendered by default.

413 changes: 205 additions & 208 deletions ...-cli/azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_secret.yaml
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 73 additions & 77 deletions ...li/command_modules/keyvault/tests/latest/recordings/test_keyvault_secret_soft_delete.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,008 changes: 593 additions & 415 deletions .../azure/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_softdelete.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2,147 changes: 0 additions & 2,147 deletions ...e/cli/command_modules/keyvault/tests/latest/recordings/test_keyvault_storage_account.yaml
View file
Open in desktop

This file was deleted.

60 changes: 22 additions & 38 deletions src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ def test_parse_asn1_date(self):
class KeyVaultMgmtScenarioTest(ScenarioTest):
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_mgmt')
def test_keyvault_mgmt(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-keyvault-', 24),
'kv2': self.create_random_name('cli-keyvault-', 24),
'kv3': self.create_random_name('cli-keyvault-', 24),
'kv4': self.create_random_name('cli-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-mgmt-', 24),
'kv2': self.create_random_name('cli-test-kv-mgmt-', 24),
'kv3': self.create_random_name('cli-test-kv-mgmt-', 24),
'kv4': self.create_random_name('cli-test-kv-mgmt-', 24),
'loc': 'westus'
})

Expand Down Expand Up @@ -137,7 +136,7 @@ class KeyVaultKeyScenarioTest(ScenarioTest):
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_key')
def test_keyvault_key(self, resource_group):
self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-key-', 24),
'loc': 'westus',
'key': 'key1'
})
Expand Down Expand Up @@ -237,7 +236,7 @@ def test_keyvault_key(self, resource_group):
checks=[self.check('key.kty', 'EC'), self.check('key.crv', 'P-521')])

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-key-', 24),
'loc': 'eastus2euap'
})
_create_keyvault(self, self.kwargs)
Expand All @@ -257,7 +256,7 @@ def test_keyvault_key_download(self, resource_group):
import OpenSSL.crypto

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-key-d-', 24),
'loc': 'eastus2'
})
_create_keyvault(self, self.kwargs)
Expand Down Expand Up @@ -348,10 +347,10 @@ def verify(path, file_type):


class KeyVaultSecretSoftDeleteScenarioTest(ScenarioTest):
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_secret')
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_secret_soft_delete')
def test_keyvault_secret_soft_delete(self, resource_group):
self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-se-sd-', 24),
'loc': 'westus',
'sec': 'secret1'
})
Expand Down Expand Up @@ -399,7 +398,7 @@ def _test_set_and_download(encoding):
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_secret')
def test_keyvault_secret(self, resource_group):
self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-se-', 24),
'loc': 'westus',
'sec': 'secret1'
})
Expand Down Expand Up @@ -474,12 +473,10 @@ def test_keyvault_secret(self, resource_group):


class KeyVaultCertificateContactsScenarioTest(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_kv_cert_contacts')
def test_keyvault_certificate_contacts(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-ct-co-', 24),
'loc': 'westus'
})

Expand All @@ -497,12 +494,10 @@ def test_keyvault_certificate_contacts(self, resource_group):


class KeyVaultCertificateIssuerScenarioTest(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_kv_cert_issuer')
def test_keyvault_certificate_issuers(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-ct-is-', 24),
'loc': 'westus'
})

Expand Down Expand Up @@ -562,7 +557,7 @@ class KeyVaultPendingCertificateScenarioTest(ScenarioTest):
def test_keyvault_pending_certificate(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-cr-pe-', 24),
'loc': 'westus',
'policy_path': os.path.join(TEST_DIR, 'policy_pending.json')
})
Expand Down Expand Up @@ -603,7 +598,7 @@ def test_keyvault_certificate_download(self, resource_group):
import OpenSSL.crypto

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-ct-dl-', 24),
'loc': 'eastus2'
})

Expand Down Expand Up @@ -653,9 +648,7 @@ def verify(path, file_type):


class KeyVaultCertificateDefaultPolicyScenarioTest(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_kv_cert_default_policy')
def test_keyvault_certificate_get_default_policy(self, resource_group):
def test_keyvault_certificate_get_default_policy(self):
result = self.cmd('keyvault certificate get-default-policy').get_output_in_json()
self.assertEqual(result['keyProperties']['keyType'], 'RSA')
self.assertEqual(result['issuerParameters']['name'], 'Self')
Expand All @@ -671,12 +664,10 @@ def test_keyvault_certificate_get_default_policy(self, resource_group):


class KeyVaultCertificateScenarioTest(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_keyvault_cert')
def test_keyvault_certificate_crud(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-ct-', 24),
'loc': 'westus'
})

Expand Down Expand Up @@ -794,12 +785,10 @@ def _generate_certificate(path, keyfile=None, password=None):

# TODO: Convert to ScenarioTest and re-record when issue #5146 is fixed.
class KeyVaultCertificateImportScenario(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_keyvault_sd')
@ResourceGroupPreparer(name_prefix='cli_test_keyvault_cert_import')
def test_keyvault_certificate_import(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-ct-im-', 24),
'loc': 'eastus2'
})

Expand Down Expand Up @@ -840,12 +829,10 @@ def test_keyvault_certificate_import(self, resource_group):

# TODO: Convert to ScenarioTest and re-record when issue #5146 is fixed.
class KeyVaultSoftDeleteScenarioTest(ScenarioTest):

@ResourceGroupPreparer(name_prefix='cli_test_keyvault_sd')
def test_keyvault_softdelete(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-sd-', 24),
'loc': 'eastus2'
})

Expand Down Expand Up @@ -924,7 +911,6 @@ def test_keyvault_softdelete(self, resource_group):


class KeyVaultStorageAccountScenarioTest(ScenarioTest):

def _create_managable_storage_account(self):
storageacct = self.cmd('az storage account create -g {rg} -n {sa}').get_output_in_json()
self.kwargs.update({
Expand All @@ -937,10 +923,10 @@ def _create_managable_storage_account(self):
return storageacct

@ResourceGroupPreparer(name_prefix='cli_test_keyvault_sa')
@unittest.skip('We have to skip this as the service/SDK is buggy.')
def test_keyvault_storage_account(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-sa-', 24),
'sa': 'clitestkvsa0000002',
'loc': 'westus'
})
Expand Down Expand Up @@ -1067,7 +1053,6 @@ def test_keyvault_storage_account(self, resource_group):


class KeyVaultNetworkRuleScenarioTest(ScenarioTest):

def _create_subnet(test, kwargs, additional_args=None):
test.cmd('network vnet create -g {rg} -n {vnet} -l {loc} ')
test.cmd('network vnet subnet create -g {rg} --vnet-name {vnet} --name {subnet} '
Expand All @@ -1076,9 +1061,8 @@ def _create_subnet(test, kwargs, additional_args=None):

@ResourceGroupPreparer(name_prefix='cli_test_keyvault_network_rule')
def test_keyvault_network_rule(self, resource_group):

self.kwargs.update({
'kv': self.create_random_name('cli-test-keyvault-', 24),
'kv': self.create_random_name('cli-test-kv-nr-', 24),
'vnet': self.create_random_name('cli-test-vnet-', 24),
'loc': 'eastus2',
'subnet': self.create_random_name('cli-test-subnet-', 24),
Expand Down