shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #7236 from wenottingham/florence-and-the-machine-credentials

Browse Source 
Keep the 'machine' credential name for user/password & key credentials.
This commit is contained in:
Bill Nottingham 2017-07-21 12:02:54 -04:00 committed by GitHub
commit 67a7df0658
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0040_v320_add_credentialtype_model.py
View File

@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('modified', models.DateTimeField(default=None, editable=False)), ('modified', models.DateTimeField(default=None, editable=False)),
('description', models.TextField(default=b'', blank=True)), ('description', models.TextField(default=b'', blank=True)),
('name', models.CharField(max_length=512)), ('name', models.CharField(max_length=512)),
('kind', models.CharField(max_length=32, choices=[(b'ssh', 'SSH'), (b'vault', 'Vault'), (b'net', 'Network'), (b'scm', 'Source Control'), (b'cloud', 'Cloud'), (b'insights', 'Insights')])), ('kind', models.CharField(max_length=32, choices=[(b'ssh', 'Machine'), (b'vault', 'Vault'), (b'net', 'Network'), (b'scm', 'Source Control'), (b'cloud', 'Cloud'), (b'insights', 'Insights')])),
('managed_by_tower', models.BooleanField(default=False, editable=False)), ('managed_by_tower', models.BooleanField(default=False, editable=False)),
('inputs', awx.main.fields.CredentialTypeInputField(default={}, blank=True, help_text='Enter inputs using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.')), ('inputs', awx.main.fields.CredentialTypeInputField(default={}, blank=True, help_text='Enter inputs using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.')),
('injectors', awx.main.fields.CredentialTypeInjectorField(default={}, blank=True, help_text='Enter injectors using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.')), ('injectors', awx.main.fields.CredentialTypeInjectorField(default={}, blank=True, help_text='Enter injectors using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.')),

4
awx/main/models/credential.py
View File

@ -401,7 +401,7 @@ class CredentialType(CommonModelNameNotUnique):
unique_together = (('name', 'kind'),) unique_together = (('name', 'kind'),)
KIND_CHOICES = ( KIND_CHOICES = (
('ssh', _('SSH')), ('ssh', _('Machine')),
('vault', _('Vault')), ('vault', _('Vault')),
('net', _('Network')), ('net', _('Network')),
('scm', _('Source Control')), ('scm', _('Source Control')),
@ -588,7 +588,7 @@ class CredentialType(CommonModelNameNotUnique):
def ssh(cls): def ssh(cls):
return cls( return cls(
kind='ssh', kind='ssh',
name='SSH', name='Machine',
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{

6
awx/main/tests/functional/test_credential_migration.py
View File

@ -45,7 +45,7 @@ def test_ssh_migration():
'become_password': 'superpassword', 'become_password': 'superpassword',
}) })
assert cred.credential_type.name == 'SSH' assert cred.credential_type.name == 'Machine'
assert cred.inputs['username'] == 'bob' assert cred.inputs['username'] == 'bob'
assert cred.inputs['password'].startswith('$encrypted$') assert cred.inputs['password'].startswith('$encrypted$')
assert decrypt_field(cred, 'password') == 'secret' assert decrypt_field(cred, 'password') == 'secret'
@ -117,9 +117,9 @@ def test_vault_with_ssh_migration():
assert cred.inputs['vault_password'].startswith('$encrypted$') assert cred.inputs['vault_password'].startswith('$encrypted$')
assert decrypt_field(cred, 'vault_password') == 'vault' assert decrypt_field(cred, 'vault_password') == 'vault'
ssh_cred = Credential.objects.filter(credential_type__name='SSH').get() ssh_cred = Credential.objects.filter(credential_type__name='Machine').get()
assert sorted(ssh_cred.inputs.keys()) == sorted(CredentialType.from_v1_kind('ssh').defined_fields) assert sorted(ssh_cred.inputs.keys()) == sorted(CredentialType.from_v1_kind('ssh').defined_fields)
assert ssh_cred.credential_type.name == 'SSH' assert ssh_cred.credential_type.name == 'Machine'
assert ssh_cred.inputs['username'] == 'bob' assert ssh_cred.inputs['username'] == 'bob'
assert ssh_cred.inputs['password'].startswith('$encrypted$') assert ssh_cred.inputs['password'].startswith('$encrypted$')
assert decrypt_field(ssh_cred, 'password') == 'secret' assert decrypt_field(ssh_cred, 'password') == 'secret'