Merge branch 'spf13:master' into master

This commit is contained in:
chowyi 2023-07-31 19:50:15 +08:00 committed by GitHub
commit bca1963cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions

View file

@ -24,9 +24,9 @@ func flattenAndMergeMap(shadow map[string]interface{}, m map[string]interface{},
}
for k, val := range m {
fullKey := prefix + k
switch val.(type) {
switch val := val.(type) {
case map[string]interface{}:
m2 = val.(map[string]interface{})
m2 = val
case map[interface{}]interface{}:
m2 = cast.ToStringMap(val)
default:

View file

@ -57,9 +57,9 @@ func flattenAndMergeMap(shadow map[string]interface{}, m map[string]interface{},
}
for k, val := range m {
fullKey := prefix + k
switch val.(type) {
switch val := val.(type) {
case map[string]interface{}:
m2 = val.(map[string]interface{})
m2 = val
case map[interface{}]interface{}:
m2 = cast.ToStringMap(val)
default:

View file

@ -57,9 +57,9 @@ func flattenAndMergeMap(shadow map[string]interface{}, m map[string]interface{},
}
for k, val := range m {
fullKey := prefix + k
switch val.(type) {
switch val := val.(type) {
case map[string]interface{}:
m2 = val.(map[string]interface{})
m2 = val
case map[interface{}]interface{}:
m2 = cast.ToStringMap(val)
default:

View file

@ -156,11 +156,11 @@ func deepCheckValue(assert *assert.Assertions, v *Viper, l layer, keys []string,
}
// deep scan of the map to get the final value
switch val.(type) {
switch val := val.(type) {
case map[interface{}]interface{}:
m = cast.ToStringMap(val)
case map[string]interface{}:
m = val.(map[string]interface{})
m = val
default:
assert.Fail(fmt.Sprintf("%s is not a map[string]interface{}", ms))
return

View file

@ -70,17 +70,17 @@ func copyAndInsensitiviseMap(m map[string]interface{}) map[string]interface{} {
}
func insensitiviseVal(val interface{}) interface{} {
switch val.(type) {
switch v := val.(type) {
case map[interface{}]interface{}:
// nested map: cast and recursively insensitivise
val = cast.ToStringMap(val)
insensitiviseMap(val.(map[string]interface{}))
case map[string]interface{}:
// nested map: recursively insensitivise
insensitiviseMap(val.(map[string]interface{}))
insensitiviseMap(v)
case []interface{}:
// nested array: recursively insensitivise
insensitiveArray(val.([]interface{}))
insensitiveArray(v)
}
return val
}

View file

@ -691,13 +691,13 @@ func (v *Viper) searchMap(source map[string]interface{}, path []string) interfac
}
// Nested case
switch next.(type) {
switch next := next.(type) {
case map[interface{}]interface{}:
return v.searchMap(cast.ToStringMap(next), path[1:])
case map[string]interface{}:
// Type assertion is safe here since it is only reached
// if the type of `next` is the same as the type being asserted
return v.searchMap(next.(map[string]interface{}), path[1:])
return v.searchMap(next, path[1:])
default:
// got a value but nested key expected, return "nil" for not found
return nil
@ -2076,9 +2076,9 @@ func (v *Viper) flattenAndMergeMap(shadow map[string]bool, m map[string]interfac
}
for k, val := range m {
fullKey := prefix + k
switch val.(type) {
switch val := val.(type) {
case map[string]interface{}:
m2 = val.(map[string]interface{})
m2 = val
case map[interface{}]interface{}:
m2 = cast.ToStringMap(val)
default: