aboutsummaryrefslogtreecommitdiff
path: root/middleware
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-09-06 23:28:41 +0100
committerGravatar Chris O'Haver <cohaver@infoblox.com> 2017-09-06 18:28:41 -0400
commit9528777fc5c825b1ffacbbb45e29c45e2aa82145 (patch)
tree90a03a0091516d3a1c3f70b13fbee54e7338e70b /middleware
parentc514197d6b0af035e58ca3b3dc3b6211ebced4b1 (diff)
downloadcoredns-9528777fc5c825b1ffacbbb45e29c45e2aa82145.tar.gz
coredns-9528777fc5c825b1ffacbbb45e29c45e2aa82145.tar.zst
coredns-9528777fc5c825b1ffacbbb45e29c45e2aa82145.zip
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
Diffstat (limited to 'middleware')
-rw-r--r--middleware/autopath/setup.go3
-rw-r--r--middleware/federation/setup.go4
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