cli/compose/template: rename vars that shadowed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
56c2fa6c0e
commit
0b0fc106dc
@ -108,23 +108,23 @@ func ExtractVariables(configDict map[string]any, pattern *regexp.Regexp) map[str
|
|||||||
func recurseExtract(value any, pattern *regexp.Regexp) map[string]string {
|
func recurseExtract(value any, pattern *regexp.Regexp) map[string]string {
|
||||||
m := map[string]string{}
|
m := map[string]string{}
|
||||||
|
|
||||||
switch value := value.(type) {
|
switch val := value.(type) {
|
||||||
case string:
|
case string:
|
||||||
if values, is := extractVariable(value, pattern); is {
|
if values, is := extractVariable(val, pattern); is {
|
||||||
for _, v := range values {
|
for _, v := range values {
|
||||||
m[v.name] = v.value
|
m[v.name] = v.value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case map[string]any:
|
case map[string]any:
|
||||||
for _, elem := range value {
|
for _, elem := range val {
|
||||||
submap := recurseExtract(elem, pattern)
|
submap := recurseExtract(elem, pattern)
|
||||||
for key, value := range submap {
|
for k, v := range submap {
|
||||||
m[key] = value
|
m[k] = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
case []any:
|
case []any:
|
||||||
for _, elem := range value {
|
for _, elem := range val {
|
||||||
if values, is := extractVariable(elem, pattern); is {
|
if values, is := extractVariable(elem, pattern); is {
|
||||||
for _, v := range values {
|
for _, v := range values {
|
||||||
m[v.name] = v.value
|
m[v.name] = v.value
|
||||||
|
Loading…
x
Reference in New Issue
Block a user