Merge pull request #2048 from FabianKramm/master

fix: fix xargs

Author: FabianKramm

e2e/tests/imports/imports.go

@@ -70,6 +70,7 @@ var _ = DevSpaceDescribe("imports", func() {
 		framework.ExpectLocalFileContentsWithoutSpaces("import4.txt", "import4")
 		framework.ExpectLocalFileContentsWithoutSpaces("import5.txt", "import5")
 		framework.ExpectLocalFileContentsWithoutSpaces("vars.txt", ns+"-"+ns+"-base-import1-import2-import3")
+		framework.ExpectLocalFileContentsWithoutSpaces("top.txt", "top")
 
 		// make sure temp folder is erased
 		_, err = os.Stat(strings.TrimSpace(string(out)))

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

@@ -10,6 +10,7 @@ imports:
 
 vars:
   BASE: base
+  TOP: top
 
 dependencies:
   import1:
@@ -21,6 +22,7 @@ pipelines:
     run: |-
       echo ${devspace.name} > name.txt
       echo ${DEVSPACE_TMPDIR} > temp.txt
+      echo ${TOP} > top.txt
       
       run_dependencies --all > dependency.txt
       

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

@@ -7,6 +7,7 @@ imports:
     enabled: $(is_equal ${BASE} "base")
 
 vars:
+  TOP: import1
   IMPORT1:
     value: import1
 

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

@@ -2,6 +2,7 @@ version: v2beta1
 name: import2
 
 vars:
+  TOP: import2
   IMPORT2: import2
 
 pipelines:

e2e/tests/imports/testdata/local/import3.yaml

@@ -2,6 +2,7 @@ version: v2beta1
 name: import3
 
 vars:
+  TOP: import3
   IMPORT3: import3
 
 pipelines:

e2e/tests/imports/testdata/local/import4.yaml

@@ -6,6 +6,7 @@ imports:
     enabled: $(is_equal ${IMPORT4} "import4")
 
 vars:
+  TOP: import4
   IMPORT4:
     command: echo import4
 

e2e/tests/imports/testdata/local/import5.yaml

@@ -2,6 +2,7 @@ version: v2beta1
 name: import5
 
 vars:
+  TOP: import5
   IMPORT5: $(echo import5)
 
 pipelines:

pkg/devspace/config/loader/imports.go

@@ -104,11 +104,9 @@ func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath st
 
 			for key, value := range sectionMap {
 				_, ok := mergedMap[section].(map[string]interface{})[key]
-				if ok {
-					return nil, fmt.Errorf("cannot import %s: section %s already has an item with key %s. Please make sure that imported %s keys do not collide across the current config and imported configs", configPath, section, key, section)
+				if !ok {
+					mergedMap[section].(map[string]interface{})[key] = value
 				}
-
-				mergedMap[section].(map[string]interface{})[key] = value
 			}
 		}
 

pkg/devspace/pipeline/engine/basichandler/commands/xargs.go

@@ -34,14 +34,17 @@ func XArgs(ctx context.Context, args []string, handler types.ExecHandler) error
 		return err
 	}
 
-	addArgs := strings.Split(string(out), options.Delimiter)
+	addArgs := strings.Split(string(out), "\n")
 	for _, addArg := range addArgs {
-		addArg = strings.TrimSpace(addArg)
-		if addArg == "" {
-			continue
-		}
+		splitted := strings.Split(addArg, options.Delimiter)
+		for _, a := range splitted {
+			a = strings.TrimSpace(a)
+			if a == "" {
+				continue
+			}
 
-		args = append(args, addArg)
+			args = append(args, a)
+		}
 	}
 	return handler.ExecHandler(ctx, args)
 }