From fcf56950b391d413b8436550b8183bf9f4e193de Mon Sep 17 00:00:00 2001 From: Philip Douglass Date: Wed, 14 Dec 2022 16:28:50 -0500 Subject: [PATCH] Add recursive properties to injectors jsonschema for extra_vars --- awx/main/fields.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index 3372627f91..d319b40b1f 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -790,13 +790,11 @@ class CredentialTypeInjectorField(JSONSchemaField): 'extra_vars': { 'type': 'object', 'patternProperties': { - # http://docs.ansible.com/ansible/playbooks_variables.html#what-makes-a-valid-variable-name - '^[a-zA-Z_]+[a-zA-Z0-9_]*$': {'type': 'string'}, + r'^(?:(?:{{[^{}]*?}})|(?:[a-zA-Z_]+[a-zA-Z0-9_]*)+)+$': {"anyOf": [{'type': 'string'}, {'$ref': '#/properties/extra_vars'}]} }, 'additionalProperties': False, }, }, - 'additionalProperties': False, } def validate_env_var_allowed(self, env_var):