glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-11-16 18:07:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up

Browse source
This commit is contained in:
Jason Lee 2024-01-06 20:41:43 +08:00 committed by Theo Brigitte
parent 66afe6ded0
commit 568aa46942
No known key found for this signature in database
GPG key ID: 62A81E0F3445587C
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
viper.go
View file

@ -689,47 +689,53 @@ func (v *Viper) searchMap(source map[string]any, path []string) any {
return nil return nil
} }
// searchMapWithAliases recursively searches for slice field in source map and
// replace them with the environment variable value if it exists.
//
// Returns replaced values.
func (v *Viper) searchAndReplaceSliceValueWithEnv(source any, envKey string) any { func (v *Viper) searchAndReplaceSliceValueWithEnv(source any, envKey string) any {
switch v1 := source.(type) { switch sourceValue := source.(type) {
case []any: case []any:
var newSlices []any var newSliceValues []any
for i, value := range v1 { for i, sliceValue := range sourceValue {
envKey := envKey + v.keyDelim + strconv.Itoa(i) envKey := envKey + v.keyDelim + strconv.Itoa(i)
switch v2 := value.(type) { switch existingValue := sliceValue.(type) {
case map[string]any: case map[string]any:
val := v.searchAndReplaceSliceValueWithEnv(v2, envKey) newVal := v.searchAndReplaceSliceValueWithEnv(existingValue, envKey)
newSlices = append(newSlices, val) newSliceValues = append(newSliceValues, newVal)
default: default:
if val, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok { if newVal, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok {
newSlices = append(newSlices, val) newSliceValues = append(newSliceValues, newVal)
} else { } else {
newSlices = append(newSlices, v2) newSliceValues = append(newSliceValues, existingValue)
} }
} }
} }
return newSlices return newSliceValues
case map[string]any: case map[string]any:
var newMapValue map[string]any = make(map[string]any) var newMapValues map[string]any = make(map[string]any)
for key, mapValue := range sourceValue {
for k, v2 := range v1 { envKey := envKey + v.keyDelim + key
envKey := envKey + v.keyDelim + k switch existingValue := mapValue.(type) {
switch v3 := v2.(type) {
case map[string]any: case map[string]any:
val := v.searchAndReplaceSliceValueWithEnv(v3, envKey) newVal := v.searchAndReplaceSliceValueWithEnv(existingValue, envKey)
newMapValue[k] = val newMapValues[key] = newVal
default: default:
if val, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok { if newVal, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok {
newMapValue[k] = val newMapValues[key] = newVal
} else { } else {
newMapValue[k] = v3 newMapValues[key] = existingValue
} }
} }
} }
return newMapValue return newMapValues
default: default:
if val, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok { if newVal, ok := v.getEnv(v.mergeWithEnvPrefix(envKey)); ok {
return val return newVal
} else { } else {
return source return source
} }