chore(import): support Deep Merge Strategy

Signed-off-by: JordanGoasdoue <jordan.goasdoue@dailymotion.com>

Author: JordanGoasdoue

devspace-schema.json

@@ -2021,6 +2021,14 @@
           ],
           "description": "Enabled specifies if the given import should be enabled"
         },
+        "mergeStrategy": {
+          "type": "string",
+          "enum": [
+            "shallowMerge",
+            "deepMerge"
+          ],
+          "description": "MergeStrategy specifies how the imported config should be merged (e.g. shallowMerge or deepMerge)"
+        },
         "path": {
           "type": "string",
           "description": "Path is the local path where DevSpace can find the artifact.\nThis option is mutually exclusive with the git option.",

docs/schemas/config-openapi.json

@@ -1045,6 +1045,14 @@
                 "type": "boolean",
                 "description": "Enabled specifies if the given import should be enabled"
               },
+              "mergeStrategy": {
+                "type": "string",
+                "enum": [
+                  "shallowMerge",
+                  "deepMerge"
+                ],
+                "description": "MergeStrategy specifies how the imported config should be merged (e.g. shallowMerge or deepMerge)"
+              },
               "path": {
                 "type": "string",
                 "description": "Path is the local path where DevSpace can find the artifact.\nThis option is mutually exclusive with the git option.",

pkg/devspace/config/loader/imports.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/util"
 	dependencyutil "github.com/loft-sh/devspace/pkg/devspace/dependency/util"
 	"github.com/loft-sh/devspace/pkg/util/log"
@@ -118,7 +119,15 @@ func ResolveImports(ctx context.Context, resolver variable.Resolver, basePath st
 			if mergedMap[section] == nil {
 				mergedMap[section] = map[string]interface{}{}
 			}
-			deepMerge(mergedMap[section].(map[string]interface{}), sectionMap)
+
+			switch i.MergeStrategy {
+			case latest.MergeStrategyDeep:
+				deepMerge(mergedMap[section].(map[string]interface{}), sectionMap)
+			case "", latest.MergeStrategyShallow:
+				shallowMerge(mergedMap[section].(map[string]interface{}), sectionMap)
+			default:
+				return nil, fmt.Errorf("invalid mergeStrategy %q in import %s", i.MergeStrategy, configPath)
+			}
 		}
 
 		// resolve the import imports
@@ -173,3 +182,13 @@ func deepMerge(dst, src map[string]interface{}) {
 		// For other types (arrays, scalars), dst takes precedence (no action needed)
 	}
 }
+
+// shallowMerge merges src into dst only at the top level.
+// Existing keys in dst take precedence.
+func shallowMerge(dst, src map[string]interface{}) {
+	for key, value := range src {
+		if _, ok := dst[key]; !ok {
+			dst[key] = value
+		}
+	}
+}