Skip to content

Commit

Permalink
{KeyVault} Modify random vault name prefix (#12076)
Browse files Browse the repository at this point in the history
* Modify random vault name prefix

* Fix typo

* Fix typo

* Refined

* Reduce the prefix length and rerun all tests

* Recover test_keyvault_certificate_get_default_policy.yaml

* Remove resource group preparer
  • Loading branch information
bim-msft authored Feb 7, 2020
1 parent c0e345c commit 601dfc0
Show file tree
Hide file tree
Showing 16 changed files with 2,257 additions and 4,435 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

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

0 comments on commit 601dfc0

Please sign in to comment.