From 9528777fc5c825b1ffacbbb45e29c45e2aa82145 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 6 Sep 2017 23:28:41 +0100 Subject: [PATCH] mw/autopath: correct type for type switch (#1029) * mw/autopath: correct type for type switch Use pointer to kubernetes as that is what is registered. Fix up federation which had the same mistake. * here --- middleware/autopath/setup.go | 3 +-- middleware/federation/setup.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/middleware/autopath/setup.go b/middleware/autopath/setup.go index d28a6b409..368d92cf4 100644 --- a/middleware/autopath/setup.go +++ b/middleware/autopath/setup.go @@ -28,12 +28,11 @@ func setup(c *caddy.Controller) error { // Do this in OnStartup, so all middleware has been initialized. c.OnStartup(func() error { - // TODO(miek): fabricate test to proof this is not thread safe. m := dnsserver.GetConfig(c).Handler(mw) if m == nil { return nil } - if x, ok := m.(kubernetes.Kubernetes); ok { + if x, ok := m.(*kubernetes.Kubernetes); ok { ap.searchFunc = x.AutoPath } if x, ok := m.(*erratic.Erratic); ok { diff --git a/middleware/federation/setup.go b/middleware/federation/setup.go index de37fce2b..1ef635603 100644 --- a/middleware/federation/setup.go +++ b/middleware/federation/setup.go @@ -30,7 +30,7 @@ func setup(c *caddy.Controller) error { if m == nil { return nil } - if x, ok := m.(kubernetes.Kubernetes); ok { + if x, ok := m.(*kubernetes.Kubernetes); ok { fed.Federations = x.Federations } return nil @@ -38,7 +38,7 @@ func setup(c *caddy.Controller) error { dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler { fed.Next = next - return nil + return fed }) return nil