Skip to content

fix: use Key instead of OwnKey in rawEnvVars to properly reference existing defaults in complex structs #412

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
AndrewChubatiuk wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

fix: use Key instead of OwnKey in rawEnvVars to properly reference existing defaults in complex structs #412

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
2 changes: 1 addition & 1 deletion env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ func get(fieldParams FieldParams, opts Options) (val string, err error) {
val = os.Expand(val, opts.getRawEnv)
}

opts.rawEnvVars[fieldParams.OwnKey] = val
opts.rawEnvVars[fieldParams.Key] = val

if fieldParams.Unset {
defer os.Unsetenv(fieldParams.Key)
Expand Down
7 changes: 7 additions & 0 deletions env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,12 @@ func TestParseExpandOption(t *testing.T) {
ExpandKey string `env:"EXPAND_KEY"`
CompoundKey string `env:"HOST_PORT,expand" envDefault:"${HOST}:${PORT}"`
Default string `env:"DEFAULT,expand" envDefault:"def1"`
Component struct {
Port int `env:"PORT" envDefault:"5000"`
Internal struct {
Host string `env:"INTERNAL_HOST,expand" envDefault:"${HOST}:${COMPONENT_PORT}"`
}
} `envPrefix:"COMPONENT_"`
}

t.Setenv("HOST", "localhost")
Expand All @@ -1008,6 +1014,7 @@ func TestParseExpandOption(t *testing.T) {
isEqual(t, "qwerty12345", cfg.ExpandKey)
isEqual(t, "localhost:3000", cfg.CompoundKey)
isEqual(t, "def1", cfg.Default)
isEqual(t, "localhost:5000", cfg.Component.Internal.Host)
}

func TestParseExpandWithDefaultOption(t *testing.T) {
Expand Down
Loading