Skip to content

fix ability to override values set in env file by interpolation #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix ability to override values set in env file by interpolation #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions dotenv/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
33 changes: 33 additions & 0 deletions dotenv/godotenv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,3 +741,36 @@ func TestLoadWithFormat(t *testing.T) {
assert.NilError(t, err)
assert.DeepEqual(t, expectedValues, env)
}

func TestMultipleFiles(t *testing.T) {
base, err := os.CreateTemp(t.TempDir(), "base.env")
assert.NilError(t, err)
err = os.WriteFile(base.Name(), []byte(`
ENV_HOSTNAME=localhost
ENV_MY_URL="http://${ENV_HOSTNAME}"
`), 0o600)
assert.NilError(t, err)

override, err := os.CreateTemp(t.TempDir(), "override.env")
assert.NilError(t, err)
err = os.WriteFile(override.Name(), []byte(`
ENV_HOSTNAME=dev.my-company.com
ENV_MY_URL="http://${ENV_HOSTNAME}"
`), 0o600)
assert.NilError(t, err)

env, err := GetEnvFromFile(nil, []string{base.Name(), override.Name()})
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.Name(), override.Name()})
assert.NilError(t, err)
assert.DeepEqual(t, env, map[string]string{
"ENV_HOSTNAME": "dev.my-company.com",
"ENV_MY_URL": "http://host.local",
})
}
Loading