Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: reading remote configuration should not merge kvstore #1633

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: reading remote configuration should not merge kvstore #1633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions viper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1944,24 +1944,22 @@ func (v *Viper) getKeyValueConfig() error {
val, err := v.getRemoteConfig(rp)
if err != nil {
v.logger.Error(fmt.Errorf("get remote config: %w", err).Error())

continue
}

v.kvstore = val

return nil
}
return RemoteConfigError("No Files Found")
}

func (v *Viper) getRemoteConfig(provider RemoteProvider) (map[string]interface{}, error) {
config := make(map[string]interface{})
reader, err := RemoteConfig.Get(provider)
if err != nil {
return nil, err
}
err = v.unmarshalReader(reader, v.kvstore)
return v.kvstore, err
err = v.unmarshalReader(reader, config)
return config, err
}

// Retrieve the first found remote configuration.
Expand Down
Loading