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

improve private passphrase error when it's provided unnecessarily

see: https://github.com/ansible/ansible-tower/issues/7293
This commit is contained in:
Ryan Petrello 2017-07-26 15:01:31 -04:00
parent d62f7320e6
commit c71e8d38b7

View File

@ -542,8 +542,11 @@ class CredentialInputField(JSONSchemaField):
if model_instance.has_encrypted_ssh_key_data and not value.get('ssh_key_unlock'):
errors['ssh_key_unlock'] = [_('must be set when SSH key is encrypted.')]
if not model_instance.has_encrypted_ssh_key_data and value.get('ssh_key_unlock'):
errors['ssh_key_unlock'] = [_('should not be set when SSH key is not encrypted.')]
if value.get('ssh_key_unlock'):
if not model_instance.ssh_key_data:
errors['ssh_key_unlock'] = [_('should not be set when SSH key is empty.')]
elif not model_instance.has_encrypted_ssh_key_data:
errors['ssh_key_unlock'] = [_('should not be set when SSH key is not encrypted.')]
if errors:
raise serializers.ValidationError({