External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02: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
1 changed files with 2 additions and 4 deletions
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': { 'file': {
'type': 'object', 'type': 'object',
'patternProperties': { 'patternProperties': {
'^template(\.[a-zA-Z_]+)?$': {'type': 'string'}, '^template(\.[a-zA-Z_]+[a-zA-Z0-9_]*)?$': {'type': 'string'},
}, },
'additionalProperties': False, 'additionalProperties': False,
}, },
@@ -751,9 +751,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
valid_namespace['tower'] = TowerNamespace() valid_namespace['tower'] = TowerNamespace()
# ensure either single file or multi-file syntax is used (but not both) # ensure either single file or multi-file syntax is used (but not both)
template_names = set(key for type_, injector in value.items() template_names = [x for x in value.get('file', {}).keys() if x.startswith('template')]
for key, tmpl in injector.items()
if key.startswith('template'))
if 'template' in template_names and len(template_names) > 1: if 'template' in template_names and len(template_names) > 1:
raise django_exceptions.ValidationError( raise django_exceptions.ValidationError(
_('Must use multi-file syntax when injecting multiple files'), _('Must use multi-file syntax when injecting multiple files'),