feat: allow variables in complete imports section

Author: FabianKramm

e2e/tests/imports/imports.go

@@ -31,6 +31,60 @@ var _ = DevSpaceDescribe("imports", func() {
 		framework.ExpectNoError(err)
 	})
 
+	ginkgo.It("should import correctly with variables", func() {
+		tempDir, err := framework.CopyToTempDir("tests/imports/testdata/conditional")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("imports")
+		framework.ExpectNoError(err)
+		defer func() {
+			err := kubeClient.DeleteNamespace(ns)
+			framework.ExpectNoError(err)
+		}()
+
+		// create a new dev command
+		deployCmd := &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+				Profiles:  []string{},
+			},
+			Pipeline: "deploy",
+		}
+
+		// run the command
+		err = deployCmd.RunDefault(f)
+		framework.ExpectNoError(err)
+
+		// read temp folder
+		framework.ExpectLocalFileContentsWithoutSpaces("import1.txt", "import1")
+
+		// change path
+		err = os.Setenv("IMPORT1_PATH", "import2.yaml")
+		framework.ExpectNoError(err)
+		defer func() {
+			_ = os.Unsetenv("IMPORT1_PATH")
+		}()
+
+		// create a new dev command
+		deployCmd = &cmd.RunPipelineCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+				Profiles:  []string{},
+			},
+			Pipeline: "deploy",
+		}
+
+		// run the command
+		err = deployCmd.RunDefault(f)
+		framework.ExpectNoError(err)
+
+		// read temp folder
+		framework.ExpectLocalFileContentsWithoutSpaces("import1.txt", "import2")
+	})
+
 	ginkgo.It("should import correctly", func() {
 		tempDir, err := framework.CopyToTempDir("tests/imports/testdata/local")
 		framework.ExpectNoError(err)

e2e/tests/imports/testdata/conditional/devspace.yaml

@@ -0,0 +1,15 @@
+version: v2beta1
+name: base
+
+imports:
+  - path: ./${IMPORT1_PATH}
+
+vars:
+  IMPORT1_PATH:
+    source: env
+    default: import1.yaml
+
+pipelines:
+  deploy:
+    run: |-
+      echo ${IMPORT1} > import1.txt

e2e/tests/imports/testdata/conditional/import1.yaml

@@ -0,0 +1,5 @@
+version: v2beta1
+name: import1
+
+vars:
+  IMPORT1: import1

e2e/tests/imports/testdata/conditional/import2.yaml

@@ -0,0 +1,5 @@
+version: v2beta1
+name: import1
+
+vars:
+  IMPORT1: import2

pkg/devspace/config/loader/imports.go

@@ -46,7 +46,7 @@ func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath st
 		return nil, errors.Errorf("Version is missing in devspace.yaml")
 	}
 
-	rawImportsInterface, err := resolver.FillVariablesInclude(ctx, rawImports, []string{"/imports/*/enabled"})
+	rawImportsInterface, err := resolver.FillVariablesInclude(ctx, rawImports, []string{"/imports/**"})
 	if err != nil {
 		return nil, err
 	}

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

@@ -260,8 +260,8 @@ func (r *resolver) insertVariableGraph(g *graph.Graph, node *latest.Variable) er
 func (r *resolver) FillVariablesInclude(ctx context.Context, haystack interface{}, includedPaths []string) (interface{}, error) {
 	paths := []*regexp.Regexp{}
 	for _, path := range includedPaths {
-		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = strings.ReplaceAll(path, "**", ".+")
+		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = "^" + path + "$"
 		expr, err := regexp.Compile(path)
 		if err != nil {
@@ -290,8 +290,8 @@ func (r *resolver) FillVariablesInclude(ctx context.Context, haystack interface{
 func (r *resolver) FillVariablesExclude(ctx context.Context, haystack interface{}, excludedPaths []string) (interface{}, error) {
 	paths := []*regexp.Regexp{}
 	for _, path := range excludedPaths {
-		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = strings.ReplaceAll(path, "**", ".+")
+		path = strings.ReplaceAll(path, "*", "[^/]+")
 		path = "^" + path + "$"
 		expr, err := regexp.Compile(path)
 		if err != nil {