refactor: improve variable parsing

Author: FabianKramm

pkg/devspace/config/loader/variable/expression/expression.go

@@ -42,17 +42,17 @@ func ExcludedPath(path string, excluded, included []*regexp.Regexp) bool {
 	return false
 }
 
-func ResolveAllExpressions(ctx context.Context, preparedConfig interface{}, dir string, exclude, include []*regexp.Regexp) (interface{}, error) {
+func ResolveAllExpressions(ctx context.Context, preparedConfig interface{}, dir string, exclude, include []*regexp.Regexp, variables map[string]interface{}) (interface{}, error) {
 	switch t := preparedConfig.(type) {
 	case string:
-		return ResolveExpressions(ctx, t, dir)
+		return ResolveExpressions(ctx, t, dir, variables)
 	case map[string]interface{}:
 		err := walk.Walk(t, expressionMatchFn, func(path, value string) (interface{}, error) {
 			if ExcludedPath(path, exclude, include) {
 				return value, nil
 			}
 
-			return ResolveExpressions(ctx, value, dir)
+			return ResolveExpressions(ctx, value, dir, variables)
 		})
 		if err != nil {
 			return nil, err
@@ -62,7 +62,7 @@ func ResolveAllExpressions(ctx context.Context, preparedConfig interface{}, dir
 	case []interface{}:
 		for i := range t {
 			var err error
-			t[i], err = ResolveAllExpressions(ctx, t[i], dir, exclude, include)
+			t[i], err = ResolveAllExpressions(ctx, t[i], dir, exclude, include, variables)
 			if err != nil {
 				return nil, err
 			}
@@ -74,12 +74,17 @@ func ResolveAllExpressions(ctx context.Context, preparedConfig interface{}, dir
 	return preparedConfig, nil
 }
 
-func ResolveExpressions(ctx context.Context, value, dir string) (interface{}, error) {
+func ResolveExpressions(ctx context.Context, value, dir string, variables map[string]interface{}) (interface{}, error) {
 	matches := ExpressionMatchRegex.FindAllStringSubmatch(value, -1)
 	if len(matches) == 0 {
 		return value, nil
 	}
 
+	vars := map[string]string{}
+	for k, v := range variables {
+		vars[k] = fmt.Sprintf("%v", v)
+	}
+
 	out := value
 	for _, match := range matches {
 		if len(match) != 2 {
@@ -88,7 +93,7 @@ func ResolveExpressions(ctx context.Context, value, dir string) (interface{}, er
 
 		stdout := &bytes.Buffer{}
 		stderr := &bytes.Buffer{}
-		err := engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, nil, nil, match[1], os.Args[1:]...)
+		err := engine.ExecuteSimpleShellCommand(ctx, dir, stdout, stderr, nil, vars, match[1], os.Args[1:]...)
 		if err != nil {
 			if len(strings.TrimSpace(stdout.String())) == 0 && len(strings.TrimSpace(stderr.String())) == 0 {
 				if exitError, ok := err.(*exec.ExitError); ok && exitError.ExitCode() == 1 {

pkg/devspace/config/loader/variable/resolver.go

@@ -130,7 +130,7 @@ func (r *resolver) FindVariables(haystack interface{}) ([]*latest.Variable, erro
 
 	// add always resolve variables
 	for _, v := range r.vars {
-		if v.AlwaysResolve {
+		if v.AlwaysResolve || v.Value != nil {
 			varsUsed[v.Name] = true
 		}
 	}
@@ -242,7 +242,7 @@ func (r *resolver) FillVariablesInclude(ctx context.Context, haystack interface{
 	}
 
 	// resolve expressions
-	preparedConfigInterface, err = expression.ResolveAllExpressions(ctx, preparedConfigInterface, filepath.Dir(r.options.ConfigPath), nil, paths)
+	preparedConfigInterface, err = expression.ResolveAllExpressions(ctx, preparedConfigInterface, filepath.Dir(r.options.ConfigPath), nil, paths, r.memoryCache)
 	if err != nil {
 		return nil, err
 	}
@@ -272,7 +272,7 @@ func (r *resolver) FillVariablesExclude(ctx context.Context, haystack interface{
 	}
 
 	// resolve expressions
-	preparedConfigInterface, err = expression.ResolveAllExpressions(ctx, preparedConfigInterface, filepath.Dir(r.options.ConfigPath), paths, nil)
+	preparedConfigInterface, err = expression.ResolveAllExpressions(ctx, preparedConfigInterface, filepath.Dir(r.options.ConfigPath), paths, nil, r.memoryCache)
 	if err != nil {
 		return nil, err
 	}

pkg/devspace/config/loader/variable/runtime/runtime_resolver.go

@@ -57,7 +57,7 @@ func (r *runtimeResolver) FillRuntimeVariablesWithRebuild(ctx context.Context, h
 	}
 
 	// resolve expressions
-	haystack, err = expression.ResolveAllExpressions(ctx, haystack, r.workingDirectory, nil, nil)
+	haystack, err = expression.ResolveAllExpressions(ctx, haystack, r.workingDirectory, nil, nil, config.Variables())
 	if err != nil {
 		return false, nil, err
 	}