From 88cea415a7d563dc29ffe3b7882218f5fe238e0c Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 27 Jan 2015 13:31:57 -0800 Subject: [PATCH] client: NewDiscoveryKeysAPI -> NewKeysAPIWithPrefix --- client/keys.go | 9 +++------ discovery/discovery.go | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client/keys.go b/client/keys.go index 5322206d1..a120feac0 100644 --- a/client/keys.go +++ b/client/keys.go @@ -40,16 +40,13 @@ var ( ) func NewKeysAPI(c Client) KeysAPI { - return &httpKeysAPI{ - client: c, - prefix: defaultV2KeysPrefix, - } + return NewKeysAPIWithPrefix(c, defaultV2KeysPrefix) } -func NewDiscoveryKeysAPI(c Client) KeysAPI { +func NewKeysAPIWithPrefix(c Client, p string) KeysAPI { return &httpKeysAPI{ client: c, - prefix: "", + prefix: p, } } diff --git a/discovery/discovery.go b/discovery/discovery.go index d7520dd63..2f06901f7 100644 --- a/discovery/discovery.go +++ b/discovery/discovery.go @@ -125,7 +125,7 @@ func newDiscovery(durl, dproxyurl string, id types.ID) (*discovery, error) { if err != nil { return nil, err } - dc := client.NewDiscoveryKeysAPI(c) + dc := client.NewKeysAPIWithPrefix(c, "") return &discovery{ cluster: token, c: dc,