Bump compose-go v2.1.5

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

vendor/github.com/compose-spec/compose-go/v2/loader/extends.go

@@ -22,11 +22,8 @@ import (
 	"path/filepath"
 
 	"github.com/compose-spec/compose-go/v2/consts"
-	"github.com/compose-spec/compose-go/v2/interpolation"
 	"github.com/compose-spec/compose-go/v2/override"
 	"github.com/compose-spec/compose-go/v2/paths"
-	"github.com/compose-spec/compose-go/v2/template"
-	"github.com/compose-spec/compose-go/v2/transform"
 	"github.com/compose-spec/compose-go/v2/types"
 )
 
@@ -71,22 +68,10 @@ func applyServiceExtends(ctx context.Context, name string, services map[string]a
 	)
 	switch v := extends.(type) {
 	case map[string]any:
-		if opts.Interpolate != nil {
-			v, err = interpolation.Interpolate(v, *opts.Interpolate)
-			if err != nil {
-				return nil, err
-			}
-		}
 		ref = v["service"].(string)
 		file = v["file"]
 		opts.ProcessEvent("extends", v)
 	case string:
-		if opts.Interpolate != nil {
-			v, err = opts.Interpolate.Substitute(v, template.Mapping(opts.Interpolate.LookupValue))
-			if err != nil {
-				return nil, err
-			}
-		}
 		ref = v
 		opts.ProcessEvent("extends", map[string]any{"service": ref})
 	}
@@ -190,12 +175,6 @@ func getExtendsBaseFromFile(
 			)
 		}
 
-		// Attempt to make a canonical model so ResolveRelativePaths can operate on source:target short syntaxes
-		source, err = transform.Canonical(source, true)
-		if err != nil {
-			return nil, nil, err
-		}
-
 		var remotes []paths.RemoteResource
 		for _, loader := range opts.RemoteResourceLoaders() {
 			remotes = append(remotes, loader.Accept)

vendor/github.com/compose-spec/compose-go/v2/loader/include.go

@@ -30,7 +30,7 @@ import (
 )
 
 // loadIncludeConfig parse the required config from raw yaml
-func loadIncludeConfig(source any, options *Options) ([]types.IncludeConfig, error) {
+func loadIncludeConfig(source any) ([]types.IncludeConfig, error) {
 	if source == nil {
 		return nil, nil
 	}
@@ -45,23 +45,13 @@ func loadIncludeConfig(source any, options *Options) ([]types.IncludeConfig, err
 			}
 		}
 	}
-	if options.Interpolate != nil {
-		for i, config := range configs {
-			interpolated, err := interp.Interpolate(config.(map[string]any), *options.Interpolate)
-			if err != nil {
-				return nil, err
-			}
-			configs[i] = interpolated
-		}
-	}
-
 	var requires []types.IncludeConfig
 	err := Transform(source, &requires)
 	return requires, err
 }
 
 func ApplyInclude(ctx context.Context, workingDir string, environment types.Mapping, model map[string]any, options *Options, included []string) error {
-	includeConfig, err := loadIncludeConfig(model["include"], options)
+	includeConfig, err := loadIncludeConfig(model["include"])
 	if err != nil {
 		return err
 	}

vendor/github.com/compose-spec/compose-go/v2/loader/loader.go

@@ -367,23 +367,6 @@ func loadYamlModel(ctx context.Context, config types.ConfigDetails, opts *Option
 		}
 	}
 
-	if opts.Interpolate != nil && !opts.SkipInterpolation {
-		dict, err = interp.Interpolate(dict, *opts.Interpolate)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	dict, err = transform.Canonical(dict, opts.SkipInterpolation)
-	if err != nil {
-		return nil, err
-	}
-
-	dict, err = override.EnforceUnicity(dict)
-	if err != nil {
-		return nil, err
-	}
-
 	if !opts.SkipDefaultValues {
 		dict, err = transform.SetDefaultValues(dict)
 		if err != nil {
@@ -432,6 +415,13 @@ func loadYamlFile(ctx context.Context, file types.ConfigFile, opts *Options, wor
 			return errors.New("Top-level object must be a mapping")
 		}
 
+		if opts.Interpolate != nil && !opts.SkipInterpolation {
+			cfg, err = interp.Interpolate(cfg, *opts.Interpolate)
+			if err != nil {
+				return err
+			}
+		}
+
 		fixEmptyNotNull(cfg)
 
 		if !opts.SkipExtends {
@@ -460,6 +450,11 @@ func loadYamlFile(ctx context.Context, file types.ConfigFile, opts *Options, wor
 			return err
 		}
 
+		dict, err = override.EnforceUnicity(dict)
+		if err != nil {
+			return err
+		}
+
 		if !opts.SkipValidation {
 			if err := schema.Validate(dict); err != nil {
 				return fmt.Errorf("validating %s: %w", file.Filename, err)
@@ -469,7 +464,15 @@ func loadYamlFile(ctx context.Context, file types.ConfigFile, opts *Options, wor
 				delete(dict, "version")
 			}
 		}
-		return nil
+
+		dict, err = transform.Canonical(dict, opts.SkipInterpolation)
+		if err != nil {
+			return err
+		}
+
+		// Canonical transformation can reveal duplicates, typically as ports can be a range and conflict with an override
+		dict, err = override.EnforceUnicity(dict)
+		return err
 	}
 
 	var processor PostProcessor