fix extraction of variables

Signed-off-by: Nikita Vakula <[email protected]>

Author: krjakbrjak

template/variables.go

@@ -57,10 +57,9 @@ func recurseExtract(value interface{}, pattern *regexp.Regexp) map[string]Variab
 
 	case []interface{}:
 		for _, elem := range value {
-			if values, is := extractVariable(elem, pattern); is {
-				for _, v := range values {
-					m[v.Name] = v
-				}
+			submap := recurseExtract(elem, pattern)
+			for key, value := range submap {
+				m[key] = value
 			}
 		}
 	}

template/variables_test.go

@@ -191,6 +191,22 @@ func TestExtractVariables(t *testing.T) {
 				"SUBDOMAIN":  {Name: "SUBDOMAIN", DefaultValue: "$ROOTDOMAIN"},
 			},
 		},
+		{
+			name: "nested-array-of-maps",
+			dict: map[string]interface{}{
+				"volumes": []interface{}{
+					map[string]interface{}{
+						"source": "${SOURCE_LOCATION}",
+						"target": "/location",
+						"type":   "volume",
+						"volume": map[string]interface{}{},
+					},
+				},
+			},
+			expected: map[string]Variable{
+				"SOURCE_LOCATION": {Name: "SOURCE_LOCATION"},
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {