load: apply !reset on extended services (#455)

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

Author: ndeloof

loader/loader.go

@@ -255,7 +255,6 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
 	loaded = append(loaded, mainFile)
 
 	includeRefs := make(map[string][]types.IncludeConfig)
-	first := true
 	for _, file := range configDetails.ConfigFiles {
 		var postProcessor PostProcessor
 		configDict := file.Config
@@ -285,22 +284,21 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
 				}
 			}
 
-			if first {
-				first = false
+			if model == nil {
 				model = cfg
-				return nil
-			}
-			merged, err := merge([]*types.Config{model, cfg})
-			if err != nil {
-				return err
+			} else {
+				merged, err := merge([]*types.Config{model, cfg})
+				if err != nil {
+					return err
+				}
+				model = merged
 			}
 			if postProcessor != nil {
-				err = postProcessor.Apply(merged)
+				err = postProcessor.Apply(model)
 				if err != nil {
 					return err
 				}
 			}
-			model = merged
 			return nil
 		}
 

loader/loader_test.go

@@ -422,6 +422,27 @@ services:
 	assert.Equal(t, svcB.Build.Context, bDir)
 }
 
+func TestLoadExtendsWihReset(t *testing.T) {
+	actual, err := loadYAML(`
+name: load-extends
+services:
+  foo:
+    extends:
+      service: bar
+    volumes: !reset []
+  bar:
+    image: alpine
+    command: echo
+    volumes:
+       - .:/src
+`)
+	assert.NilError(t, err)
+	assert.Check(t, is.Len(actual.Services, 2))
+	foo, err := actual.GetService("foo")
+	assert.NilError(t, err)
+	assert.Check(t, len(foo.Volumes) == 0)
+}
+
 func TestLoadCredentialSpec(t *testing.T) {
 	actual, err := loadYAML(`
 name: load-credential-spec