Merge pull request #2249 from FabianKramm/main

fix: allow env as vars

Author: FabianKramm

e2e/tests/config/config.go

@@ -1794,6 +1794,8 @@ var _ = DevSpaceDescribe("config", func() {
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
 
+		_ = os.Setenv("FROM_ENV", "FROM_ENV")
+
 		// set the question answer func here
 		f.SetAnswerFunc(func(params *survey.QuestionOptions) (string, error) {
 			return "test", nil
@@ -1804,7 +1806,8 @@ var _ = DevSpaceDescribe("config", func() {
 		framework.ExpectNoError(err)
 
 		// check if variables were loaded correctly
-		framework.ExpectEqual(len(config.Variables()), 3+len(variable.AlwaysResolvePredefinedVars))
+		framework.ExpectEqual(len(config.Variables()), 4+len(variable.AlwaysResolvePredefinedVars))
+		framework.ExpectEqual(config.Variables()["FROM_ENV"], "FROM_ENV")
 		framework.ExpectEqual(len(config.LocalCache().ListVars()), 1)
 		test1, _ := config.LocalCache().GetVar("TEST_1")
 		framework.ExpectEqual(test1, "test")

e2e/tests/config/testdata/vars/devspace.yaml

@@ -18,4 +18,5 @@ deployments:
         - ${TEST_1}
         - ${TEST_2}
         - ${TEST_OVERRIDE}
+        - ${FROM_ENV}
 

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

@@ -3,6 +3,7 @@ package variable
 import (
 	"context"
 	"fmt"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -152,7 +153,7 @@ func (r *resolver) findVariablesInclude(haystack interface{}, include []*regexp.
 
 	// filter out runtime environment variables
 	for k := range varsUsed {
-		if !strings.HasPrefix(k, "runtime.") && !IsPredefinedVariable(k) && r.vars[k] == nil {
+		if !strings.HasPrefix(k, "runtime.") && !IsPredefinedVariable(k) && r.getVariableDefinition(k) == nil {
 			delete(varsUsed, k)
 		}
 	}
@@ -164,6 +165,23 @@ func (r *resolver) FindVariables(haystack interface{}) ([]*latest.Variable, erro
 	return r.findVariablesInclude(haystack, nil)
 }
 
+func (r *resolver) getVariableDefinition(name string) *latest.Variable {
+	definition, ok := r.vars[name]
+	if !ok {
+		value := os.Getenv(name)
+		if value != "" {
+			return &latest.Variable{
+				Name:  name,
+				Value: value,
+			}
+		}
+
+		return nil
+	}
+
+	return definition
+}
+
 func (r *resolver) orderVariables(vars map[string]bool) ([]*latest.Variable, error) {
 	root := graph.NewNode("root", nil)
 	g := graph.NewGraphOf(root, "variable")
@@ -174,9 +192,8 @@ func (r *resolver) orderVariables(vars map[string]bool) ([]*latest.Variable, err
 			definition = &latest.Variable{Name: name}
 		} else {
 			// check if has definition
-			var ok bool
-			definition, ok = r.vars[name]
-			if !ok {
+			definition = r.getVariableDefinition(name)
+			if definition == nil {
 				continue
 			}
 		}
@@ -219,8 +236,8 @@ func (r *resolver) insertVariableGraph(g *graph.Graph, node *latest.Variable) er
 
 	parents := r.findVariablesInDefinition(node)
 	for parent := range parents {
-		parentDefinition, ok := r.vars[parent]
-		if !ok {
+		parentDefinition := r.getVariableDefinition(parent)
+		if parentDefinition == nil {
 			continue
 		}
 
@@ -428,7 +445,7 @@ func (r *resolver) findVariablesInDefinition(definition *latest.Variable) map[st
 
 	// filter out runtime environment variables and non existing ones
 	for k := range varsUsed {
-		if !strings.HasPrefix(k, "runtime.") && !IsPredefinedVariable(k) && r.vars[k] == nil {
+		if !strings.HasPrefix(k, "runtime.") && !IsPredefinedVariable(k) && r.getVariableDefinition(k) == nil {
 			delete(varsUsed, k)
 		}
 	}
@@ -510,7 +527,7 @@ func (r *resolver) resolveDefinitionString(ctx context.Context, str string, defi
 			// check if its a predefined variable
 			variable, err := NewPredefinedVariable(varName, r.options, r.log)
 			if err != nil {
-				if r.vars[varName] == nil {
+				if r.getVariableDefinition(varName) == nil {
 					return "${" + varName + "}", nil
 				}