External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 19:20:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

support vault IDs that include dot characters

Browse Source 
see: https://github.com/ansible/awx/issues/4009
This commit is contained in:
Ryan Petrello
2019-06-06 12:42:31 -04:00
parent 176f8632e5
commit 329b40fd69
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/unit/test_tasks.py
View File

@@ -872,7 +872,7 @@ class TestJobCredentials(TestJobExecution):
def test_multi_vault_password(self, private_data_dir, job):
task = tasks.RunJob()
vault = CredentialType.defaults['vault']()
for i, label in enumerate(['dev', 'prod']):
for i, label in enumerate(['dev', 'prod', 'dotted.name']):
credential = Credential(
pk=i,
credential_type=vault,
@@ -892,10 +892,12 @@ class TestJobCredentials(TestJobExecution):
)
assert vault_passwords['Vault password \(prod\):\\s*?$'] == 'pass@prod' # noqa
assert vault_passwords['Vault password \(dev\):\\s*?$'] == 'pass@dev' # noqa
assert vault_passwords['Vault password \(dotted.name\):\\s*?$'] == 'pass@dotted.name' # noqa
assert vault_passwords['Vault password:\\s*?$'] == '' # noqa
assert '--ask-vault-pass' not in ' '.join(args)
assert '--vault-id dev@prompt' in ' '.join(args)
assert '--vault-id prod@prompt' in ' '.join(args)
assert '--vault-id dotted.name@prompt' in ' '.join(args)
def test_multi_vault_id_conflict(self, job):
task = tasks.RunJob()