From d08e704ab0ff7340b91b7ef769a746e741162bfd Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 10 Sep 2020 16:03:57 -0700 Subject: [PATCH] Make changes to refactored code --- pkg/skaffold/util/env_template.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/skaffold/util/env_template.go b/pkg/skaffold/util/env_template.go index 7573cde21c5..90580421723 100644 --- a/pkg/skaffold/util/env_template.go +++ b/pkg/skaffold/util/env_template.go @@ -67,10 +67,16 @@ func ExecuteEnvTemplate(envTemplate *template.Template, customMap map[string]str } // EvaluateEnvTemplateMap parses and executes all map values as templates based on OS environment variables -func EvaluateEnvTemplateMap(args map[string]*string) (map[string]*string, error) { +// An additional envMap can optionally be specified. +// If multiple additional envMaps are specified, all but the first one will be ignored +func EvaluateEnvTemplateMap(args map[string]*string, envMap ...map[string]string) (map[string]*string, error) { if args == nil { return nil, nil } + var env map[string]string + if len(envMap) > 0 { + env = envMap[0] + } evaluated := map[string]*string{} for k, v := range args { @@ -79,7 +85,7 @@ func EvaluateEnvTemplateMap(args map[string]*string) (map[string]*string, error) continue } - value, err := ExpandEnvTemplate(*v, nil) + value, err := util.ExpandEnvTemplate(*v, env) if err != nil { return nil, fmt.Errorf("unable to get value for key %q: %w", k, err) }