fix ability to override values set in env file by interpolation

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

Author: ndeloof

dotenv/env.go

@@ -56,7 +56,7 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
 			return envMap, err
 		}
 
-		env, err := ParseWithLookup(bytes.NewReader(b), func(k string) (string, bool) {
+		err = parseWithLookup(bytes.NewReader(b), envMap, func(k string) (string, bool) {
 			v, ok := currentEnv[k]
 			if ok {
 				return v, true
@@ -67,9 +67,6 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
 		if err != nil {
 			return envMap, fmt.Errorf("failed to read %s: %w", dotEnvFile, err)
 		}
-		for k, v := range env {
-			envMap[k] = v
-		}
 	}
 
 	return envMap, nil

dotenv/godotenv_test.go

@@ -741,3 +741,34 @@ func TestLoadWithFormat(t *testing.T) {
 	assert.NilError(t, err)
 	assert.DeepEqual(t, expectedValues, env)
 }
+
+func TestMultipleFiles(t *testing.T) {
+	base := filepath.Join(t.TempDir(), "base.env")
+	err := os.WriteFile(base, []byte(`
+ENV_HOSTNAME=localhost
+ENV_MY_URL="http://${ENV_HOSTNAME}"
+`), 0o600)
+	assert.NilError(t, err)
+
+	override := filepath.Join(t.TempDir(), "override.env")
+	err = os.WriteFile(override, []byte(`
+ENV_HOSTNAME=dev.my-company.com
+ENV_MY_URL="http://${ENV_HOSTNAME}"
+`), 0o600)
+	assert.NilError(t, err)
+
+	env, err := GetEnvFromFile(nil, []string{base, override})
+	assert.NilError(t, err)
+	assert.DeepEqual(t, env, map[string]string{
+		"ENV_HOSTNAME": "dev.my-company.com",
+		"ENV_MY_URL":   "http://dev.my-company.com",
+	})
+
+	osEnv := map[string]string{"ENV_HOSTNAME": "host.local"}
+	env, err = GetEnvFromFile(osEnv, []string{base, override})
+	assert.NilError(t, err)
+	assert.DeepEqual(t, env, map[string]string{
+		"ENV_HOSTNAME": "dev.my-company.com",
+		"ENV_MY_URL":   "http://host.local",
+	})
+}

transform/defaults.go

@@ -23,30 +23,19 @@ import (
 // DefaultValues contains the default value transformers for compose fields
 var DefaultValues = map[tree.Path]TransformFunc{}
 
-// For backward compatibility
-var defaultValues = DefaultValues
-
 func init() {
-	defaultValues["services.*.build"] = defaultBuildContext
-	defaultValues["services.*.secrets.*"] = defaultSecretMount
-	defaultValues["services.*.ports.*"] = portDefaults
-	defaultValues["services.*.deploy.resources.reservations.devices.*"] = deviceRequestDefaults
-	defaultValues["services.*.gpus.*"] = deviceRequestDefaults
+	DefaultValues["services.*.build"] = defaultBuildContext
+	DefaultValues["services.*.secrets.*"] = defaultSecretMount
+	DefaultValues["services.*.ports.*"] = portDefaults
+	DefaultValues["services.*.deploy.resources.reservations.devices.*"] = deviceRequestDefaults
+	DefaultValues["services.*.gpus.*"] = deviceRequestDefaults
 }
 
-// RegisterDefaultTransformer registers a custom transformer for the given path pattern
-func RegisterDefaultTransformer(path string, transformer TransformFunc) {
+// RegisterDefaultValue registers a custom transformer for the given path pattern
+func RegisterDefaultValue(path string, transformer TransformFunc) {
 	DefaultValues[tree.Path(path)] = transformer
 }
 
-// GetDefaultTransformers returns a copy of the current default transformers
-func GetDefaultTransformers() map[string]TransformFunc {
-	result := make(map[string]TransformFunc)
-	for path, transformer := range DefaultValues {
-		result[string(path)] = transformer
-	}
-	return result
-}
 
 // SetDefaultValues transforms a compose model to set default values to missing attributes
 func SetDefaultValues(yaml map[string]any) (map[string]any, error) {
@@ -58,7 +47,7 @@ func SetDefaultValues(yaml map[string]any) (map[string]any, error) {
 }
 
 func setDefaults(data any, p tree.Path) (any, error) {
-	for pattern, transformer := range defaultValues {
+	for pattern, transformer := range DefaultValues {
 		if p.Matches(pattern) {
 			t, err := transformer(data, p, false)
 			if err != nil {

transform/ports.go

@@ -18,7 +18,7 @@ package transform
 
 import (
 	"fmt"
-
+	
 	"github.com/compose-spec/compose-go/v2/tree"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/go-viper/mapstructure/v2"
@@ -102,34 +102,3 @@ func portDefaults(data any, _ tree.Path, _ bool) (any, error) {
 		return data, nil
 	}
 }
-
-// EnhancedPortDefaults is an example of an enhanced port defaults function
-// that supports additional protocols and domain names in the published field.
-// This function can be used as a replacement for the default portDefaults
-// by registering it with RegisterDefaultTransformer.
-//
-// Example usage:
-//   transform.RegisterDefaultTransformer("services.*.ports.*", transform.EnhancedPortDefaults)
-//
-// This function supports:
-// - Additional protocols: "http", "https", "tcp", "udp"
-// - Domain names in the published field (e.g., "example.com:80")
-// - All existing functionality of the original portDefaults
-func EnhancedPortDefaults(data any, _ tree.Path, _ bool) (any, error) {
-	switch v := data.(type) {
-	case map[string]any:
-		// Set default protocol if not specified
-		if _, ok := v["protocol"]; !ok {
-			v["protocol"] = "tcp"
-		}
-		// Set default mode if not specified
-		if _, ok := v["mode"]; !ok {
-			v["mode"] = "ingress"
-		}
-		// Additional logic can be added here to handle domain names
-		// in the published field or other custom transformations
-		return v, nil
-	default:
-		return data, nil
-	}
-}