From c332005e4edadd6271418f8eef8cb519ae48bd06 Mon Sep 17 00:00:00 2001 From: Tom Lanyon Date: Fri, 11 Oct 2019 15:40:10 +1100 Subject: [PATCH] Fix early exit in utils.ExpandVariables ExpandVariables was returning early, upon first variable expansion, instead of expanding all available variables. Also removed unnecessary strings.Contains check as strings.ReplaceAll performs a similar check internally before operating. --- utils/utils.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index 940450a..ae83ccd 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -246,13 +246,9 @@ func ExpandVariables(vars map[string]string, str string) string { for k, v := range vars { // tries to replace both ${var} and $var forms for _, rep := range []string{fmt.Sprintf("$%s", k), fmt.Sprintf("${%s}", k)} { - if strings.Contains(str, rep) { - return strings.Replace(str, rep, v, -1) - } + str = strings.ReplaceAll(str, rep, v) } } - - // if no variables are expanded return the original string return str }