fix ability to override values set in env file by interpolation

Signed-off-by: Nicolas De Loof <[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",
+	})
+}