Skip to content

feat!: set default if var is set but empty #248

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

Merged
caarlos0 merged 1 commit into from
Jan 21, 2023
Merged

feat!: set default if var is set but empty #248

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: 2 additions & 0 deletions env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ func getOr(key, defaultValue string, defExists bool, envs map[string]string) (st
switch {
case (!exists || key == "") && defExists:
return defaultValue, true, true
case exists && value == "" && defExists:
return defaultValue, true, true
case !exists:
return "", false, false
}
Expand Down
12 changes: 11 additions & 1 deletion env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,16 @@ type NestedStruct struct {
NestedVar string `env:"nestedvar"`
}

func TestIssue245(t *testing.T) {
t.Setenv("NAME_NOT_SET", "")
type user struct {
Name string `env:"NAME_NOT_SET" envDefault:"abcd"`
}
cfg := user{}
isNoErr(t, Parse(&cfg))
isEqual(t, cfg.Name, "abcd")
Comment thread
caarlos0 marked this conversation as resolved.
}

func TestParsesEnv(t *testing.T) {
tos := func(v interface{}) string {
return fmt.Sprintf("%v", v)
Expand Down Expand Up @@ -671,7 +681,7 @@ func TestErrorRequiredWithDefault(t *testing.T) {

t.Setenv("IS_REQUIRED", "")
isNoErr(t, Parse(cfg))
isEqual(t, "", cfg.IsRequired)
isEqual(t, "important", cfg.IsRequired)
}

func TestErrorRequiredNotSet(t *testing.T) {
Expand Down