Skip to content

Print correct key on env-parse errors #812

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
merged 1 commit into from
Sep 19, 2023
Merged

Print correct key on env-parse errors #812

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
30 changes: 15 additions & 15 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func envStringArray(def string, key string, alts ...string) []string {
}

func envBoolOrError(def bool, key string, alts ...string) (bool, error) {
parse := func(val string) (bool, error) {
parse := func(key, val string) (bool, error) {
parsed, err := strconv.ParseBool(val)
if err == nil {
return parsed, nil
Expand All @@ -145,12 +145,12 @@ func envBoolOrError(def bool, key string, alts ...string) (bool, error) {
}

if val := os.Getenv(key); val != "" {
return parse(val)
return parse(key, val)
}
for _, alt := range alts {
if val := os.Getenv(alt); val != "" {
fmt.Fprintf(os.Stderr, "env %s has been deprecated, use %s instead\n", alt, key)
return parse(val)
return parse(alt, val)
}
}
return def, nil
Expand All @@ -166,7 +166,7 @@ func envBool(def bool, key string, alts ...string) bool {
}

func envIntOrError(def int, key string, alts ...string) (int, error) {
parse := func(val string) (int, error) {
parse := func(key, val string) (int, error) {
parsed, err := strconv.ParseInt(val, 0, 0)
if err == nil {
return int(parsed), nil
Expand All @@ -175,12 +175,12 @@ func envIntOrError(def int, key string, alts ...string) (int, error) {
}

if val := os.Getenv(key); val != "" {
return parse(val)
return parse(key, val)
}
for _, alt := range alts {
if val := os.Getenv(key); val != "" {
if val := os.Getenv(alt); val != "" {
fmt.Fprintf(os.Stderr, "env %s has been deprecated, use %s instead\n", alt, key)
return parse(val)
return parse(alt, val)
}
}
return def, nil
Expand All @@ -196,7 +196,7 @@ func envInt(def int, key string, alts ...string) int {
}

func envFloatOrError(def float64, key string, alts ...string) (float64, error) {
parse := func(val string) (float64, error) {
parse := func(key, val string) (float64, error) {
parsed, err := strconv.ParseFloat(val, 64)
if err == nil {
return parsed, nil
Expand All @@ -205,12 +205,12 @@ func envFloatOrError(def float64, key string, alts ...string) (float64, error) {
}

if val := os.Getenv(key); val != "" {
return parse(val)
return parse(key, val)
}
for _, alt := range alts {
if val := os.Getenv(key); val != "" {
if val := os.Getenv(alt); val != "" {
fmt.Fprintf(os.Stderr, "env %s has been deprecated, use %s instead\n", alt, key)
return parse(val)
return parse(alt, val)
}
}
return def, nil
Expand All @@ -226,7 +226,7 @@ func envFloat(def float64, key string, alts ...string) float64 {
}

func envDurationOrError(def time.Duration, key string, alts ...string) (time.Duration, error) {
parse := func(val string) (time.Duration, error) {
parse := func(key, val string) (time.Duration, error) {
parsed, err := time.ParseDuration(val)
if err == nil {
return parsed, nil
Expand All @@ -235,12 +235,12 @@ func envDurationOrError(def time.Duration, key string, alts ...string) (time.Dur
}

if val := os.Getenv(key); val != "" {
return parse(val)
return parse(key, val)
}
for _, alt := range alts {
if val := os.Getenv(key); val != "" {
if val := os.Getenv(alt); val != "" {
fmt.Fprintf(os.Stderr, "env %s has been deprecated, use %s instead\n", alt, key)
return parse(val)
return parse(alt, val)
}
}
return def, nil
Expand Down