External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 03:40:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Respond to PR feedback

Browse Source
This commit is contained in:
Jim Ladd 2018-01-31 11:22:01 -05:00
parent 4b13bcdce2
commit 4c1dddcaf9
No known key found for this signature in database
GPG Key ID: 07CD131B8ACCA940
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/fields.py
View File

@ -696,7 +696,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
'file': {
'type': 'object',
'patternProperties': {
'^template(\.[a-zA-Z_]+)?$': {'type': 'string'},
'^template(\.[a-zA-Z_]+[a-zA-Z0-9_]*)?$': {'type': 'string'},
},
'additionalProperties': False,
},
@ -751,9 +751,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
valid_namespace['tower'] = TowerNamespace()
# ensure either single file or multi-file syntax is used (but not both)
template_names = set(key for type_, injector in value.items()
for key, tmpl in injector.items()
if key.startswith('template'))
template_names = [x for x in value.get('file', {}).keys() if x.startswith('template')]
if 'template' in template_names and len(template_names) > 1:
raise django_exceptions.ValidationError(
_('Must use multi-file syntax when injecting multiple files'),