status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pull http config flag merge into public method

This commit is contained in:
Kyle Havlovitz 2018-02-05 15:00:04 -08:00
parent 06efeea731
commit d16f103b48
No known key found for this signature in database
GPG Key ID: 8A5E6B173056AD6C
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/flags/http.go
View File

@ -87,6 +87,12 @@ func (f *HTTPFlags) Token() string {
func (f *HTTPFlags) APIClient() (*api.Client, error) {
c := api.DefaultConfig()
f.MergeOntoConfig(c)
return api.NewClient(c)
}
func (f *HTTPFlags) MergeOntoConfig(c *api.Config) {
f.address.Merge(&c.Address)
f.token.Merge(&c.Token)
f.caFile.Merge(&c.TLSConfig.CAFile)
@ -95,6 +101,4 @@ func (f *HTTPFlags) APIClient() (*api.Client, error) {
f.keyFile.Merge(&c.TLSConfig.KeyFile)
f.tlsServerName.Merge(&c.TLSConfig.Address)
f.datacenter.Merge(&c.Datacenter)
return api.NewClient(c)
}