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

Merge pull request #1806 from AlanCoding/660_extra_vars_nondict

Browse Source 
Raise error when runtime extra_vars are not dictionaries
This commit is contained in:
Alan Rominger
2016-05-05 08:14:45 -04:00
parent 102c6940cb 44d57bf4c3
commit 11796ade45
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/serializers.py
View File

@@ -2234,8 +2234,9 @@ class JobLaunchSerializer(BaseSerializer):
except (ValueError, TypeError): except (ValueError, TypeError):
try: try:
extra_vars = yaml.safe_load(extra_vars) extra_vars = yaml.safe_load(extra_vars)
except (yaml.YAMLError, TypeError, AttributeError): assert isinstance(extra_vars, dict)
errors['extra_vars'] = 'Must be valid JSON or YAML' except (yaml.YAMLError, TypeError, AttributeError, AssertionError):
errors['extra_vars'] = 'Must be a valid JSON or YAML dictionary'
if not isinstance(extra_vars, dict): if not isinstance(extra_vars, dict):
extra_vars = {} extra_vars = {}

2
awx/main/tests/functional/api/test_job_runtime_params.py
View File

@@ -159,7 +159,7 @@ def test_job_reject_invalid_prompted_extra_vars(runtime_data, job_template_promp
dict(extra_vars='{"unbalanced brackets":'), user('admin', True)) dict(extra_vars='{"unbalanced brackets":'), user('admin', True))
assert response.status_code == 400 assert response.status_code == 400
assert response.data['extra_vars'] == ['Must be valid JSON or YAML'] assert response.data['extra_vars'] == ['Must be a valid JSON or YAML dictionary']
@pytest.mark.django_db @pytest.mark.django_db
@pytest.mark.job_runtime_vars @pytest.mark.job_runtime_vars