do not interpolate service.environment

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

Author: ndeloof

cli/options_test.go

@@ -167,9 +167,9 @@ func TestProjectName(t *testing.T) {
 	})
 
 	t.Run("by COMPOSE_PROJECT_NAME", func(t *testing.T) {
-		err := os.Setenv("COMPOSE_PROJECT_NAME", "my_project_from_env")
+		err := os.Setenv(consts.ComposeProjectName, "my_project_from_env")
 		assert.NilError(t, err)
-		defer os.Unsetenv("COMPOSE_PROJECT_NAME")
+		defer os.Unsetenv(consts.ComposeProjectName)
 		opts, err := NewProjectOptions([]string{"testdata/simple/compose.yaml"}, WithOsEnv)
 		assert.NilError(t, err)
 		p, err := ProjectFromOptions(context.TODO(), opts)

dotenv/godotenv.go

@@ -167,7 +167,7 @@ func ReadFile(filename string, lookupFn LookupFn) (map[string]string, error) {
 	return ParseWithLookup(file, lookupFn)
 }
 
-func expandVariables(value string, envMap map[string]string, lookupFn LookupFn) (string, error) {
+func ExpandVariables(value string, envMap map[string]string, lookupFn LookupFn) (string, error) {
 	retVal, err := template.Substitute(value, func(k string) (string, bool) {
 		if v, ok := lookupFn(k); ok {
 			return v, true

dotenv/godotenv_var_expansion_test.go

@@ -43,7 +43,7 @@ func TestExpandIfEmptyOrUnset(t *testing.T) {
 
 	for _, expected := range templateResults {
 		t.Run(expected.name, func(t *testing.T) {
-			result, err := expandVariables(expected.input, envMap, notFoundLookup)
+			result, err := ExpandVariables(expected.input, envMap, notFoundLookup)
 			require.NoError(t, err)
 			assert.Equal(t, expected.result, result)
 		})
@@ -75,7 +75,7 @@ func TestExpandIfUnset(t *testing.T) {
 
 	for _, expected := range templateResults {
 		t.Run(expected.name, func(t *testing.T) {
-			result, err := expandVariables(expected.input, envMap, notFoundLookup)
+			result, err := ExpandVariables(expected.input, envMap, notFoundLookup)
 			require.NoError(t, err)
 			assert.Equal(t, expected.result, result)
 		})
@@ -111,7 +111,7 @@ func TestErrorIfEmptyOrUnset(t *testing.T) {
 
 	for _, expected := range templateResults {
 		t.Run(expected.name, func(t *testing.T) {
-			result, err := expandVariables(expected.input, envMap, notFoundLookup)
+			result, err := ExpandVariables(expected.input, envMap, notFoundLookup)
 			assert.Equal(t, expected.err, err)
 			assert.Equal(t, expected.result, result)
 		})
@@ -147,7 +147,7 @@ func TestErrorIfUnset(t *testing.T) {
 
 	for _, expected := range templateResults {
 		t.Run(expected.name, func(t *testing.T) {
-			result, err := expandVariables(expected.input, envMap, notFoundLookup)
+			result, err := ExpandVariables(expected.input, envMap, notFoundLookup)
 			assert.Equal(t, expected.err, err)
 			assert.Equal(t, expected.result, result)
 		})

dotenv/parser.go

@@ -157,7 +157,7 @@ func (p *parser) extractVarValue(src string, envMap map[string]string, lookupFn
 		// Remove inline comments on unquoted lines
 		value, _, _ = strings.Cut(value, " #")
 		value = strings.TrimRightFunc(value, unicode.IsSpace)
-		retVal, err := expandVariables(value, envMap, lookupFn)
+		retVal, err := ExpandVariables(value, envMap, lookupFn)
 		return retVal, rest, err
 	}
 
@@ -194,7 +194,7 @@ func (p *parser) extractVarValue(src string, envMap map[string]string, lookupFn
 		if quote == prefixDoubleQuote {
 			// expand standard shell escape sequences & then interpolate
 			// variables on the result
-			retVal, err := expandVariables(expandEscapes(value), envMap, lookupFn)
+			retVal, err := ExpandVariables(expandEscapes(value), envMap, lookupFn)
 			if err != nil {
 				return "", "", err
 			}

interpolation/interpolation.go

@@ -33,6 +33,17 @@ type Options struct {
 	TypeCastMapping map[tree.Path]Cast
 	// Substitution function to use
 	Substitute func(string, template.Mapping) (string, error)
+	// Exclude do not run interpolation on matching paths
+	Exclude []tree.Path
+}
+
+func (opts *Options) Clone() *Options {
+	return &Options{
+		Substitute:      opts.Substitute,
+		LookupValue:     opts.LookupValue,
+		TypeCastMapping: opts.TypeCastMapping,
+		Exclude:         opts.Exclude,
+	}
 }
 
 // LookupValue is a function which maps from variable names to values.
@@ -70,6 +81,11 @@ func Interpolate(config map[string]interface{}, opts Options) (map[string]interf
 }
 
 func recursiveInterpolate(value interface{}, path tree.Path, opts Options) (interface{}, error) {
+	for _, pattern := range opts.Exclude {
+		if path.Matches(pattern) {
+			return value, nil
+		}
+	}
 	switch value := value.(type) {
 	case string:
 		newValue, err := opts.Substitute(value, template.Mapping(opts.LookupValue))
@@ -127,8 +143,8 @@ func newPathError(path tree.Path, err error) error {
 	}
 }
 
-func (o Options) getCasterForPath(path tree.Path) (Cast, bool) {
-	for pattern, caster := range o.TypeCastMapping {
+func (opts Options) getCasterForPath(path tree.Path) (Cast, bool) {
+	for pattern, caster := range opts.TypeCastMapping {
 		if path.Matches(pattern) {
 			return caster, true
 		}

loader/environment.go

@@ -40,6 +40,11 @@ func resolveServicesEnvironment(dict map[string]any, environment types.Mapping)
 		if !ok {
 			continue
 		}
+		if _, ok := serviceConfig[types.LoaderEnvironment]; !ok && environment != nil {
+			serviceConfig[types.LoaderEnvironment] = map[string]string(environment)
+		}
+		services[service] = serviceConfig
+
 		serviceEnv, ok := serviceConfig["environment"].([]any)
 		if !ok {
 			continue
@@ -58,7 +63,6 @@ func resolveServicesEnvironment(dict map[string]any, environment types.Mapping)
 			}
 		}
 		serviceConfig["environment"] = envs
-		services[service] = serviceConfig
 	}
 	dict["services"] = services
 }

loader/include.go

@@ -25,7 +25,6 @@ import (
 	"strings"
 
 	"github.com/compose-spec/compose-go/v2/dotenv"
-	interp "github.com/compose-spec/compose-go/v2/interpolation"
 	"github.com/compose-spec/compose-go/v2/types"
 )
 
@@ -142,11 +141,8 @@ func ApplyInclude(ctx context.Context, workingDir string, environment types.Mapp
 			ConfigFiles: types.ToConfigFiles(r.Path),
 			Environment: environment.Clone().Merge(envFromFile),
 		}
-		loadOptions.Interpolate = &interp.Options{
-			Substitute:      options.Interpolate.Substitute,
-			LookupValue:     config.LookupEnv,
-			TypeCastMapping: options.Interpolate.TypeCastMapping,
-		}
+		loadOptions.Interpolate = options.Interpolate.Clone()
+		loadOptions.Interpolate.LookupValue = config.LookupEnv
 		imported, err := loadYamlModel(ctx, config, loadOptions, &cycleTracker{}, included)
 		if err != nil {
 			return err

loader/loader.go

@@ -179,6 +179,7 @@ func (o *Options) clone() *Options {
 		SkipConsistencyCheck:       o.SkipConsistencyCheck,
 		SkipExtends:                o.SkipExtends,
 		SkipInclude:                o.SkipInclude,
+		SkipResolveEnvironment:     o.SkipResolveEnvironment,
 		Interpolate:                o.Interpolate,
 		discardEnvFiles:            o.discardEnvFiles,
 		projectName:                o.projectName,
@@ -362,6 +363,9 @@ func toOptions(configDetails *types.ConfigDetails, options []func(*Options)) *Op
 		op(opts)
 	}
 	opts.ResourceLoaders = append(opts.ResourceLoaders, localResourceLoader{configDetails.WorkingDir})
+	if opts.SkipResolveEnvironment {
+		opts.Interpolate.Exclude = append(opts.Interpolate.Exclude, "services.*.environment")
+	}
 	return opts
 }
 
@@ -724,8 +728,10 @@ func processExtensions(dict map[string]any, p tree.Path, extensions map[string]a
 			}
 		}
 		if !skip && strings.HasPrefix(key, "x-") {
-			extras[key] = value
-			delete(dict, key)
+			if key != types.LoaderEnvironment {
+				extras[key] = value
+				delete(dict, key)
+			}
 			continue
 		}
 		switch v := value.(type) {