enforce unicity as this is checked by validation

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

loader/loader.go

@@ -326,6 +326,14 @@ func loadYamlModel(ctx context.Context, config types.ConfigDetails, opts *Option
 			}
 
 			dict, err = override.Merge(dict, cfg)
+			if err != nil {
+				return err
+			}
+
+			dict, err = override.EnforceUnicity(dict)
+			if err != nil {
+				return err
+			}
 
 			if !opts.SkipValidation {
 				if err := schema.Validate(dict); err != nil {
@@ -360,11 +368,6 @@ func loadYamlModel(ctx context.Context, config types.ConfigDetails, opts *Option
 		}
 	}
 
-	dict, err = override.EnforceUnicity(dict)
-	if err != nil {
-		return nil, err
-	}
-
 	dict, err = transform.Canonical(dict)
 	if err != nil {
 		return nil, err

loader/override_test.go

@@ -165,3 +165,35 @@ services:
 	})
 	assert.NilError(t, err)
 }
+
+func TestOverrideVolume(t *testing.T) {
+	yaml := `
+name: test-override-volume
+services:
+  test:
+    image: test
+    volumes:
+      - ./src:/src
+`
+
+	override := `
+services:
+  test:
+    volumes:
+      - ./src:/src
+`
+	p, err := LoadWithContext(context.Background(), types.ConfigDetails{
+		ConfigFiles: []types.ConfigFile{
+			{
+				Filename: "base",
+				Content:  []byte(yaml),
+			},
+			{
+				Filename: "override",
+				Content:  []byte(override),
+			},
+		},
+	})
+	assert.NilError(t, err)
+	assert.Equal(t, len(p.Services["test"].Volumes), 1)
+}

override/uncity.go

@@ -62,7 +62,7 @@ func enforceUnicity(value any, p tree.Path) (any, error) {
 	case []any:
 		for pattern, indexer := range unique {
 			if p.Matches(pattern) {
-				var seq []any
+				seq := []any{}
 				keys := map[string]int{}
 				for i, entry := range v {
 					key, err := indexer(entry, p.Next(fmt.Sprintf("[%d]", i)))