Skip to content

Revert dotenv/env.go to before 8da9902, update test #814

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

Revert dotenv/env.go to before 8da9902, update test #814

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
4 changes: 3 additions & 1 deletion dotenv/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package dotenv
import (
"bytes"
"fmt"
"maps"
"os"
"path/filepath"
)
Expand Down Expand Up @@ -56,7 +57,7 @@ func GetEnvFromFile(currentEnv map[string]string, filenames []string) (map[strin
return envMap, err
}

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

return envMap, nil
Expand Down
23 changes: 10 additions & 13 deletions dotenv/godotenv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,32 +743,29 @@ func TestLoadWithFormat(t *testing.T) {
}

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)
base := filepath.Join(t.TempDir(), ".local.env")
err := os.WriteFile(base, []byte(`TLD=local`), 0o600)
assert.NilError(t, err)

override := filepath.Join(t.TempDir(), "override.env")
override := filepath.Join(t.TempDir(), ".env")
err = os.WriteFile(override, []byte(`
ENV_HOSTNAME=dev.my-company.com
ENV_MY_URL="http://${ENV_HOSTNAME}"
TLD=org
URL="http://example.${TLD}"
`), 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",
"TLD": "org",
"URL": "http://example.local",
})

osEnv := map[string]string{"ENV_HOSTNAME": "host.local"}
osEnv := map[string]string{"TLD": "org"}
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",
"TLD": "org",
"URL": "http://example.org",
})
}