glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-06-30 23:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: read remote config shoud not merge kvstore

Browse source
This commit is contained in:
Astone 2023-09-14 13:58:27 +08:00 committed by GitHub
parent 336e9f0a93
commit fa85280436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
viper.go
View file

@ -1944,24 +1944,22 @@ func (v *Viper) getKeyValueConfig() error {
val, err := v.getRemoteConfig(rp) val, err := v.getRemoteConfig(rp)
if err != nil { if err != nil {
v.logger.Error(fmt.Errorf("get remote config: %w", err).Error()) v.logger.Error(fmt.Errorf("get remote config: %w", err).Error())
continue continue
} }
v.kvstore = val v.kvstore = val
return nil return nil
} }
return RemoteConfigError("No Files Found") return RemoteConfigError("No Files Found")
} }
func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]interface{}, error) { func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]interface{}, error) {
config := make(map[string]interface{})
reader, err := RemoteConfig.Get(provider) reader, err := RemoteConfig.Get(provider)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = v.unmarshalReader(reader, v.kvstore) err = v.unmarshalReader(reader, config)
return v.kvstore, err return config, err
} }
// Retrieve the first found remote configuration. // Retrieve the first found remote configuration.