fix: Use default value for empty env vars (#7297)

Signed-off-by: Simon Behar <simbeh7@gmail.com>
argoproj · Dec 15, 2021 · 06e5950 · 06e5950
1 parent 2f96c46
commit 06e5950
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/util/env/env.go b/util/env/env.go
@@ -10,7 +10,7 @@ import (
 
 func LookupEnvDurationOr(key string, o time.Duration) time.Duration {
 	v, found := os.LookupEnv(key)
-	if found {
+	if found && v != "" {
 		d, err := time.ParseDuration(v)
 		if err != nil {
 			log.WithField(key, v).WithError(err).Panic("failed to parse")
@@ -23,7 +23,7 @@ func LookupEnvDurationOr(key string, o time.Duration) time.Duration {
 
 func LookupEnvIntOr(key string, o int) int {
 	v, found := os.LookupEnv(key)
-	if found {
+	if found && v != "" {
 		d, err := strconv.Atoi(v)
 		if err != nil {
 			log.WithField(key, v).WithError(err).Panic("failed to convert to int")
@@ -36,7 +36,7 @@ func LookupEnvIntOr(key string, o int) int {
 
 func LookupEnvFloatOr(key string, o float64) float64 {
 	v, found := os.LookupEnv(key)
-	if found {
+	if found && v != "" {
 		d, err := strconv.ParseFloat(v, 64)
 		if err != nil {
 			log.WithField(key, v).WithError(err).Panic("failed to convert to float")

diff --git a/util/env/env_test.go b/util/env/env_test.go
@@ -15,6 +15,8 @@ func TestLookupEnvDurationOr(t *testing.T) {
 	assert.Panics(t, func() { LookupEnvDurationOr("FOO", time.Second) }, "bad value")
 	_ = os.Setenv("FOO", "1h")
 	assert.Equal(t, time.Hour, LookupEnvDurationOr("FOO", time.Second), "env var value")
+	_ = os.Setenv("FOO", "")
+	assert.Equal(t, time.Second, LookupEnvDurationOr("FOO", time.Second), "empty var value; default value")
 }
 
 func TestLookupEnvIntOr(t *testing.T) {
@@ -24,6 +26,8 @@ func TestLookupEnvIntOr(t *testing.T) {
 	assert.Panics(t, func() { LookupEnvIntOr("FOO", 1) }, "bad value")
 	_ = os.Setenv("FOO", "2")
 	assert.Equal(t, 2, LookupEnvIntOr("FOO", 1), "env var value")
+	_ = os.Setenv("FOO", "")
+	assert.Equal(t, 1, LookupEnvIntOr("FOO", 1), "empty var value; default value")
 }
 
 func TestLookupEnvFloatOr(t *testing.T) {
@@ -33,4 +37,6 @@ func TestLookupEnvFloatOr(t *testing.T) {
 	assert.Panics(t, func() { LookupEnvFloatOr("FOO", 1.) }, "bad value")
 	_ = os.Setenv("FOO", "2.0")
 	assert.Equal(t, 2., LookupEnvFloatOr("FOO", 1.), "env var value")
+	_ = os.Setenv("FOO", "")
+	assert.Equal(t, 1., LookupEnvFloatOr("FOO", 1.), "empty var value; default value")
 }