fix: Allow setting STUN to an empty string (#1502)

kylecarbs · kylecarbs · commit 1ebc2dfbb1a5 · 2022-06-10T17:01:39.000Z
This allows users to entirely disable STUN.
diff --git a/cli/cliflag/cliflag.go b/cli/cliflag/cliflag.go
@@ -40,7 +40,11 @@ func StringVarP(flagset *pflag.FlagSet, p *string, name string, shorthand string
 func StringArrayVarP(flagset *pflag.FlagSet, ptr *[]string, name string, shorthand string, env string, def []string, usage string) {
 	val, ok := os.LookupEnv(env)
 	if ok {
-		def = strings.Split(val, ",")
+		if val == "" {
+			def = []string{}
+		} else {
+			def = strings.Split(val, ",")
+		}
 	}
 	flagset.StringArrayVarP(ptr, name, shorthand, def, usage)
 }
diff --git a/cli/cliflag/cliflag_test.go b/cli/cliflag/cliflag_test.go
@@ -96,6 +96,16 @@ func TestCliflag(t *testing.T) {
 		require.Equal(t, []string{"wow", "test"}, got)
 	})
 
+	t.Run("StringArrayEnvVarEmpty", func(t *testing.T) {
+		var ptr []string
+		flagset, name, shorthand, env, usage := randomFlag()
+		t.Setenv(env, "")
+		cliflag.StringArrayVarP(flagset, &ptr, name, shorthand, env, nil, usage)
+		got, err := flagset.GetStringArray(name)
+		require.NoError(t, err)
+		require.Equal(t, []string{}, got)
+	})
+
 	t.Run("IntDefault", func(t *testing.T) {
 		var ptr uint8
 		flagset, name, shorthand, env, usage := randomFlag()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,11 @@ func StringVarP(flagset pflag.FlagSet, p string, name string, shorthand string`
`40`	`40`	`func StringArrayVarP(flagset pflag.FlagSet, ptr []string, name string, shorthand string, env string, def []string, usage string) {`
`41`	`41`	`val, ok := os.LookupEnv(env)`
`42`	`42`	`if ok {`
`43`		`- def = strings.Split(val, ",")`
	`43`	`+ if val == "" {`
	`44`	`+ def = []string{}`
	`45`	`+ } else {`
	`46`	`+ def = strings.Split(val, ",")`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`flagset.StringArrayVarP(ptr, name, shorthand, def, usage)`
`46`	`50`	`}`