Introduce WithDiscardExtends

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

Author: ndeloof

cli/options.go

@@ -204,6 +204,12 @@ func WithDiscardEnvFile(o *ProjectOptions) error {
 	return nil
 }
 
+// WithDiscardExtends sets discards the `extends` section after merge
+func WithDiscardExtends(o *ProjectOptions) error {
+	o.loadOptions = append(o.loadOptions, loader.WithDiscardExtends)
+	return nil
+}
+
 // WithLoadOptions provides a hook to control how compose files are loaded
 func WithLoadOptions(loadOptions ...func(*loader.Options)) ProjectOptionsFn {
 	return func(o *ProjectOptions) error {

loader/extends.go

@@ -127,7 +127,9 @@ func applyServiceExtends(ctx context.Context, name string, services map[string]a
 		return nil, err
 	}
 
-	delete(merged, "extends")
+	if opts.discardExtends {
+		delete(merged, "extends")
+	}
 	services[name] = merged
 	return merged, nil
 }

loader/loader.go

@@ -72,6 +72,8 @@ type Options struct {
 	Interpolate *interp.Options
 	// Discard 'env_file' entries after resolving to 'environment' section
 	discardEnvFiles bool
+	// Discard 'extends' entries after merge
+	discardExtends bool
 	// Set project projectName
 	projectName string
 	// Indicates when the projectName was imperatively set or guessed from path
@@ -245,6 +247,11 @@ func WithDiscardEnvFiles(opts *Options) {
 	opts.discardEnvFiles = true
 }
 
+// WithDiscardExtends sets the Options to discard the `extends` section after merge
+func WithDiscardExtends(opts *Options) {
+	opts.discardExtends = true
+}
+
 // WithSkipValidation sets the Options to skip validation when loading sections
 func WithSkipValidation(opts *Options) {
 	opts.SkipValidation = true
@@ -542,7 +549,7 @@ func load(ctx context.Context, configDetails types.ConfigDetails, opts *Options,
 		return nil, errors.New("empty compose file")
 	}
 
-	if opts.projectName == "" {
+	if opts.projectName == "" && !opts.SkipValidation {
 		return nil, errors.New("project name must not be empty")
 	}
 

loader/loader_test.go

@@ -940,6 +940,28 @@ services:
 	assert.NilError(t, err)
 }
 
+func TestDiscardExtendsOption(t *testing.T) {
+	dict := `name: test
+services:
+  base:
+    image: base
+  web:
+    extends: base
+`
+	configDetails := buildConfigDetails(dict, nil)
+
+	// Default behavior keeps the `env_file` entries
+	model, err := LoadWithContext(context.TODO(), configDetails, func(options *Options) {
+		options.SkipNormalization = true
+		options.ResolvePaths = false
+	})
+	assert.NilError(t, err)
+	assert.DeepEqual(t, *model.Services["web"].Extends, types.ExtendsConfig{
+		Service: "base",
+	})
+
+}
+
 func TestDiscardEnvFileOption(t *testing.T) {
 	dict := `name: test
 services: