glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-11-20 03:47:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: handle other options for prefix

Browse source
This commit is contained in:
Cédric Fabianski 2023-12-18 18:07:28 +01:00
parent 0b0a1104ba
commit cf43d0dcb8
No known key found for this signature in database
GPG key ID: 189A0D6C64F9E873
2 changed files with 74 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
viper.go
View file

@ -1240,8 +1240,9 @@ func (v *Viper) BindFlagValue(key string, flag FlagValue) error {
// If only a key is provided, it will use the env key matching the key, uppercased.
// If more arguments are provided, they will represent the env variable names that
// should bind to this key and will be taken in the specified order.
// EnvPrefix will be used when set when env name is not provided.
func BindEnv(input ...string) error { return v.BindEnv(input...) }
// EnvPrefix will be used when set.
func BindEnv(input ...string) error { return v.BindEnv(input...) }
func BindEnvNoPrefix(input ...string) error { return v.BindEnvNoPrefix(input...) }
func (v *Viper) BindEnv(input ...string) error {
if len(input) == 0 {
@ -1253,7 +1254,33 @@ func (v *Viper) BindEnv(input ...string) error {
if len(input) == 1 {
v.env[key] = append(v.env[key], v.mergeWithEnvPrefix(key))
} else {
v.env[key] = append(v.env[key], input[1:]...)
for _, otherKey := range input[1:] {
v.env[key] = append(v.env[key], v.mergeWithEnvPrefix(otherKey))
}
}
return nil
}
// BindEnvNoPrefix binds a Viper key to a ENV variable.
// ENV variables are case sensitive.
// If only a key is provided, it will use the env key matching the key, uppercased.
// If more arguments are provided, they will represent the env variable names that
// should bind to this key and will be taken in the specified order.
// EnvPrefix will not be used even when set.
func (v *Viper) BindEnvNoPrefix(input ...string) error {
if len(input) == 0 {
return fmt.Errorf("missing key to bind to")
}
key := strings.ToLower(input[0])
if len(input) == 1 {
v.env[key] = append(v.env[key], strings.ToUpper(key))
} else {
for _, otherKey := range input[1:] {
v.env[key] = append(v.env[key], strings.ToUpper(otherKey))
}
}
return nil

46
viper_test.go
View file

@ -658,10 +658,10 @@ func TestEnvPrefix(t *testing.T) {
SetEnvPrefix("foo") // will be uppercased automatically
BindEnv("id")
BindEnv("f", "FOOD") // not using prefix
BindEnv("f", "FOOD")
t.Setenv("FOO_ID", "13")
t.Setenv("FOOD", "apple")
t.Setenv("FOO_FOOD", "apple")
t.Setenv("FOO_NAME", "crunk")
assert.Equal(t, "13", Get("id"))
@ -694,6 +694,48 @@ func TestAutoEnvWithPrefix(t *testing.T) {
assert.Equal(t, "13", Get("bar"))
}
func TestAutoEnvWithPrefixAndOthers(t *testing.T) {
Reset()
AutomaticEnv()
replacer := strings.NewReplacer("-", "_", ".", "_")
SetEnvKeyReplacer(replacer)
SetEnvPrefix("foo")
BindEnv([]string{"bar", "baz.id", "qux"}...)
t.Setenv("FOO_BAZ_ID", "13")
assert.Equal(t, "13", Get("bar"))
}
func TestAutoEnvWithPrefixAndOthersNoPrefixArray(t *testing.T) {
Reset()
AutomaticEnv()
replacer := strings.NewReplacer("-", "_", ".", "_")
SetEnvKeyReplacer(replacer)
SetEnvPrefix("foo")
BindEnvNoPrefix([]string{"bar", "OTHER"}...)
t.Setenv("OTHER", "13")
assert.Equal(t, "13", Get("bar"))
}
func TestAutoEnvWithPrefixAndOthersNoPrefixSingle(t *testing.T) {
Reset()
AutomaticEnv()
replacer := strings.NewReplacer("-", "_", ".", "_")
SetEnvKeyReplacer(replacer)
SetEnvPrefix("foo")
BindEnvNoPrefix([]string{"bar"}...)
t.Setenv("BAR", "13")
assert.Equal(t, "13", Get("bar"))
}
func TestSetEnvKeyReplacer(t *testing.T) {
Reset()