4
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-07-03 09:37:44 +00:00

Update dependencies (#1841)

This commit is contained in:
Wim
2022-06-11 23:07:42 +02:00
committed by GitHub
parent 3819062574
commit 8751fb4bb1
188 changed files with 5608 additions and 1334 deletions

View File

@ -11,5 +11,5 @@ trim_trailing_whitespace = true
[*.go]
indent_style = tab
[{Makefile, *.mk}]
[{Makefile,*.mk}]
indent_style = tab

View File

@ -1,5 +1,5 @@
//go:build !viper_toml2
// +build !viper_toml2
//go:build viper_toml1
// +build viper_toml1
package toml

View File

@ -1,5 +1,5 @@
//go:build viper_toml2
// +build viper_toml2
//go:build !viper_toml1
// +build !viper_toml1
package toml

View File

@ -1,5 +1,5 @@
//go:build !viper_yaml3
// +build !viper_yaml3
//go:build viper_yaml2
// +build viper_yaml2
package yaml

View File

@ -1,5 +1,5 @@
//go:build viper_yaml3
// +build viper_yaml3
//go:build !viper_yaml2
// +build !viper_yaml2
package yaml

View File

@ -1197,6 +1197,17 @@ func (v *Viper) BindEnv(input ...string) error {
return nil
}
// MustBindEnv wraps BindEnv in a panic.
// If there is an error binding an environment variable, MustBindEnv will
// panic.
func MustBindEnv(input ...string) { v.MustBindEnv(input...) }
func (v *Viper) MustBindEnv(input ...string) {
if err := v.BindEnv(input...); err != nil {
panic(fmt.Sprintf("error while binding environment variable: %v", err))
}
}
// Given a key, find the value.
//
// Viper will check to see if an alias exists first.
@ -1798,8 +1809,13 @@ func mergeMaps(
tsv, ok := sv.(map[interface{}]interface{})
if !ok {
v.logger.Error(
"Could not cast sv to map[interface{}]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v",
sk, svType, tvType, sv, tv)
"Could not cast sv to map[interface{}]interface{}",
"key", sk,
"st", svType,
"tt", tvType,
"sv", sv,
"tv", tv,
)
continue
}
@ -1811,8 +1827,13 @@ func mergeMaps(
tsv, ok := sv.(map[string]interface{})
if !ok {
v.logger.Error(
"Could not cast sv to map[string]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v",
sk, svType, tvType, sv, tv)
"Could not cast sv to map[string]interface{}",
"key", sk,
"st", svType,
"tt", tvType,
"sv", sv,
"tv", tv,
)
continue
}
mergeMaps(tsv, ttv, nil)