Fix stubzone retention (#198)

Make the receiver a pointer so that the uptdateStubZones map update will
retain the stubzones found, unlike the current case where the update
will be applied and then promptly forgotten, because it is working on a
copy.

Add test/etcd_test.go to test a large part of the code. This didn't
catch the chaos middleware hack though. The chaos middleware zones are
now *not* automatically added. You have to take care of that by yourself
(docs updates).

When using debug queries and falling through to the next middleware in
etcd, restore the original (with o-o.debug) query before passing it on.

1 files changed, 0 insertions, 14 deletions

diff --git a/server/server.go b/server/server.go
index ab9ce884f..0ba6f7f01 100644
--- a/server/server.go
+++ b/server/server.go
@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"github.com/miekg/coredns/middleware"
-	"github.com/miekg/coredns/middleware/chaos"
 	"github.com/miekg/coredns/middleware/metrics"
 
 	"github.com/miekg/dns"
@@ -111,19 +110,6 @@ func New(addr string, configs []Config, gracefulTimeout time.Duration) (*Server,
 		}
 
 		s.zones[conf.Host] = z
-
-		// A bit of a hack. Loop through the middlewares of this zone and check if
-		// they have enabled the chaos middleware. If so add the special chaos zones.
-	Middleware:
-		for _, mid := range z.config.Middleware {
-			fn := mid(nil)
-			if _, ok := fn.(chaos.Chaos); ok {
-				for _, ch := range []string{"authors.bind.", "version.bind.", "version.server.", "hostname.bind.", "id.server."} {
-					s.zones[ch] = z
-				}
-				break Middleware
-			}
-		}
 	}
 
 	return s, nil