diff --git a/awx_collection/plugins/modules/tower_credential.py b/awx_collection/plugins/modules/tower_credential.py index 3aa2343788..1cdc222de8 100644 --- a/awx_collection/plugins/modules/tower_credential.py +++ b/awx_collection/plugins/modules/tower_credential.py @@ -31,7 +31,7 @@ options: new_name: description: - Setting this option will change the existing name (looked up via the name field. - required: True + required: False type: str description: description: @@ -336,7 +336,7 @@ def main(): team_id = module.resolve_name_to_id('teams', team) if kind: - module.deprecate(msg='The kind parameter has been depricated, please use credential_type instead', version="3.6") + module.deprecate(msg='The kind parameter has been deprecated, please use credential_type instead', version="3.6") cred_type_id = module.resolve_name_to_id('credential_types', credential_type if credential_type else KIND_CHOICES[kind]) @@ -353,7 +353,7 @@ def main(): credential_inputs = {} for legacy_input in OLD_INPUT_NAMES: if module.params.get(legacy_input) is not None: - module.deprecate(msg='{0} parameter has been depricated, please use inputs instead'.format(legacy_input), version="3.6") + module.deprecate(msg='{0} parameter has been deprecated, please use inputs instead'.format(legacy_input), version="3.6") credential_inputs[legacy_input] = module.params.get(legacy_input) if inputs: credential_inputs.update(inputs) diff --git a/awx_collection/test/awx/test_credential.py b/awx_collection/test/awx/test_credential.py index c0bcaee755..3707426755 100644 --- a/awx_collection/test/awx/test_credential.py +++ b/awx_collection/test/awx/test_credential.py @@ -118,24 +118,27 @@ def test_ct_precedence_over_kind(run_module, admin_user, organization, cred_type cred = Credential.objects.get(name='A credential') - assert cred.credential_type == cred_type.name + assert cred.credential_type == cred_type @pytest.mark.django_db def test_input_overrides_old_fields(run_module, admin_user, organization): + # create the vault credential type + ct = CredentialType.defaults['vault']() + ct.save() result = run_module('tower_credential', dict( name='A Vault credential', organization=organization.name, - kind='Vault', - inputs={'vault_id': 'asdf'}, + kind='vault', vault_id='1234', - state='present' + inputs={'vault_id': 'asdf'}, + state='present', ), admin_user) - assert not result.get('failed', False), result + assert not result.get('failed', False), result.get('msg', result) cred = Credential.objects.get(name='A Vault credential') - assert cred.inputs.vault_id == 'asdf' + assert cred.inputs['vault_id'] == 'asdf' @pytest.mark.django_db diff --git a/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml b/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml index aef37c3ff1..b7e7172eba 100644 --- a/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml +++ b/awx_collection/tests/integration/targets/tower_credential/tasks/main.yml @@ -36,7 +36,7 @@ set_fact: ssh_key_data: "{{ lookup('file', tempdir.stdout + '/id_rsa') }}" -- name: Test deprication warnings +- name: Test deprecation warnings tower_credential: name: "{{ ssh_cred_name1 }}" organization: Default