Cleanups and tests (#272)

For some reasons there was a dnsserver/middleware.go that defined
the middleware handlers. This code was a repeat from
middleware/middleware.go. Removed dnsserver/middleware.go and replaced
all uses of dnsserver.Middleware with middleware.Middleware.

Added dnsserver/address_test.go to test the zone normalization (and to
improve the test coverage). The deleted file will also improve the test
coverage :)

middleware/cache/setup.go

@@ -22,7 +22,7 @@ func setup(c *caddy.Controller) error {
 	if err != nil {
 		return middleware.Error("cache", err)
 	}
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return NewCache(ttl, zones, next)
 	})
 

middleware/chaos/setup.go

@@ -20,7 +20,7 @@ func setup(c *caddy.Controller) error {
 		return middleware.Error("chaos", err)
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Chaos{Next: next, Version: version, Authors: authors}
 	})
 

middleware/dnssec/setup.go

@@ -22,7 +22,7 @@ func setup(c *caddy.Controller) error {
 		return middleware.Error("dnssec", err)
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return New(zones, keys, next)
 	})
 

middleware/errors/setup.go

@@ -54,7 +54,7 @@ func setup(c *caddy.Controller) error {
 	}
 	handler.Log = log.New(writer, "", 0)
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		handler.Next = next
 		return handler
 	})

middleware/etcd/setup.go

@@ -37,7 +37,7 @@ func setup(c *caddy.Controller) error {
 		})
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		e.Next = next
 		return e
 	})

middleware/file/setup.go

@@ -37,7 +37,7 @@ func setup(c *caddy.Controller) error {
 		})
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return File{Next: next, Zones: zones}
 	})
 

middleware/kubernetes/setup.go

@@ -42,7 +42,7 @@ func setup(c *caddy.Controller) error {
 		return kubernetes.APIConn.Stop()
 	})
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		kubernetes.Next = next
 		return kubernetes
 	})

middleware/loadbalance/setup.go

@@ -3,6 +3,7 @@ package loadbalance
 import (
 	"github.com/mholt/caddy"
 	"github.com/miekg/coredns/core/dnsserver"
+	"github.com/miekg/coredns/middleware"
 )
 
 func init() {
@@ -17,7 +18,7 @@ func setup(c *caddy.Controller) error {
 		// TODO(miek): block and option parsing
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return RoundRobin{Next: next}
 	})
 

middleware/log/setup.go

@@ -56,7 +56,7 @@ func setup(c *caddy.Controller) error {
 		return nil
 	})
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Logger{Next: next, Rules: rules, ErrorFunc: dnsserver.DefaultErrorFunc}
 	})
 

middleware/metrics/setup.go

@@ -22,7 +22,7 @@ func setup(c *caddy.Controller) error {
 		return middleware.Error("prometheus", err)
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		m.Next = next
 		return m
 	})

middleware/proxy/setup.go

@@ -19,7 +19,7 @@ func setup(c *caddy.Controller) error {
 	if err != nil {
 		return middleware.Error("proxy", err)
 	}
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Proxy{Next: next, Client: Clients(), Upstreams: upstreams}
 	})
 

middleware/rewrite/setup.go

@@ -23,7 +23,7 @@ func setup(c *caddy.Controller) error {
 		return middleware.Error("rewrite", err)
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Rewrite{Next: next, Rules: rewrites}
 	})
 

middleware/secondary/setup.go

@@ -36,7 +36,7 @@ func setup(c *caddy.Controller) error {
 		}
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Secondary{file.File{Next: next, Zones: zones}}
 	})
 

middleware/whoami/setup.go

@@ -20,7 +20,7 @@ func setupWhoami(c *caddy.Controller) error {
 		return middleware.Error("whoami", c.ArgErr())
 	}
 
-	dnsserver.GetConfig(c).AddMiddleware(func(next dnsserver.Handler) dnsserver.Handler {
+	dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
 		return Whoami{Next: next}
 	})