From 7f6f57bfeed44e09f9354fe27cedee48c6d6aa45 Mon Sep 17 00:00:00 2001
From: Philip Douglass <philip@philipdouglass.com>
Date: Mon, 9 Jan 2023 14:58:20 -0500
Subject: [PATCH] Maintain nested context for validation error messages

---
 awx/main/fields.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/awx/main/fields.py b/awx/main/fields.py
index 77cebb0203..85fd560c10 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -790,7 +790,9 @@ class CredentialTypeInjectorField(JSONSchemaField):
                 'extra_vars': {
                     'type': 'object',
                     'patternProperties': {
-                        r'^(?:(?:{(?:{|%)[^{}]*?(?:%|})})|(?:[a-zA-Z_]+[a-zA-Z0-9_]*)+)+$': {"anyOf": [{'type': 'string'}, {'$ref': '#/properties/extra_vars'}]}
+                        r'^(?:(?:{(?:{|%)[^{}]*?(?:%|})})|(?:[a-zA-Z_]+[a-zA-Z0-9_]*)+)+$': {
+                            "anyOf": [{'type': 'string'}, {'type': 'array'}, {'$ref': '#/properties/extra_vars'}]
+                        }
                     },
                     'additionalProperties': False,
                 },
@@ -876,9 +878,9 @@ class CredentialTypeInjectorField(JSONSchemaField):
 
         def validate_extra_vars(key, node):
             if isinstance(node, dict):
-                return {validate_extra_vars(key, k): validate_extra_vars(k, v) for k, v in node.items()}
+                return {validate_extra_vars(key, k): validate_extra_vars("{key}.{k}".format(key=key, k=k), v) for k, v in node.items()}
             elif isinstance(node, list):
-                return [validate_extra_vars(key, x) for x in node]
+                return [validate_extra_vars("{key}[{i}]".format(key=key, i=i), x) for i, x in enumerate(node)]
             else:
                 validate_template_string("extra_vars", key, node)