diff options
Diffstat (limited to 'middleware/etcd')
| -rw-r--r-- | middleware/etcd/proxy_lookup_test.go | 2 | ||||
| -rw-r--r-- | middleware/etcd/setup.go | 8 | ||||
| -rw-r--r-- | middleware/etcd/setup_test.go | 4 | ||||
| -rw-r--r-- | middleware/etcd/stub.go | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/middleware/etcd/proxy_lookup_test.go b/middleware/etcd/proxy_lookup_test.go index bafdfba06..0404da04b 100644 --- a/middleware/etcd/proxy_lookup_test.go +++ b/middleware/etcd/proxy_lookup_test.go @@ -16,7 +16,7 @@ import ( func TestProxyLookupFailDebug(t *testing.T) { etc := newEtcdMiddleware() - etc.Proxy = proxy.New([]string{"127.0.0.1:154"}) + etc.Proxy = proxy.NewLookup([]string{"127.0.0.1:154"}) etc.Debugging = true for _, serv := range servicesProxy { diff --git a/middleware/etcd/setup.go b/middleware/etcd/setup.go index 081d17347..065b3e884 100644 --- a/middleware/etcd/setup.go +++ b/middleware/etcd/setup.go @@ -49,7 +49,7 @@ func setup(c *caddy.Controller) error { func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { stub := make(map[string]proxy.Proxy) etc := Etcd{ - Proxy: proxy.New([]string{"8.8.8.8:53", "8.8.4.4:53"}), + Proxy: proxy.NewLookup([]string{"8.8.8.8:53", "8.8.4.4:53"}), PathPrefix: "skydns", Ctx: context.Background(), Inflight: &singleflight.Group{}, @@ -57,7 +57,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { } var ( tlsConfig *tls.Config - err error + err error endpoints = []string{defaultEndpoint} stubzones = false ) @@ -96,7 +96,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { if err != nil { return &Etcd{}, false, err } - etc.Proxy = proxy.New(ups) + etc.Proxy = proxy.NewLookup(ups) case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) @@ -134,7 +134,7 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { if err != nil { return &Etcd{}, false, c.ArgErr() } - etc.Proxy = proxy.New(ups) + etc.Proxy = proxy.NewLookup(ups) case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) diff --git a/middleware/etcd/setup_test.go b/middleware/etcd/setup_test.go index 39b934a43..90b645eb0 100644 --- a/middleware/etcd/setup_test.go +++ b/middleware/etcd/setup_test.go @@ -12,9 +12,9 @@ import ( "github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/pkg/dnsrecorder" "github.com/miekg/coredns/middleware/pkg/singleflight" + "github.com/miekg/coredns/middleware/pkg/tls" "github.com/miekg/coredns/middleware/proxy" "github.com/miekg/coredns/middleware/test" - "github.com/miekg/coredns/middleware/pkg/tls" etcdc "github.com/coreos/etcd/client" "github.com/mholt/caddy" @@ -33,7 +33,7 @@ func newEtcdMiddleware() *Etcd { client, _ := newEtcdClient(endpoints, tlsc) return &Etcd{ - Proxy: proxy.New([]string{"8.8.8.8:53"}), + Proxy: proxy.NewLookup([]string{"8.8.8.8:53"}), PathPrefix: "skydns", Ctx: context.Background(), Inflight: &singleflight.Group{}, diff --git a/middleware/etcd/stub.go b/middleware/etcd/stub.go index 1c4634853..8c1924b57 100644 --- a/middleware/etcd/stub.go +++ b/middleware/etcd/stub.go @@ -67,7 +67,7 @@ Services: } for domain, nss := range nameservers { - stubmap[domain] = proxy.New(nss) + stubmap[domain] = proxy.NewLookup(nss) } // atomic swap (at least that's what we hope it is) if len(stubmap) > 0 { |