Make CoreDNS a server type plugin for Caddy (#220)

* Make CoreDNS a server type plugin for Caddy

Remove code we don't need and port all middleware over. Fix all tests
and rework the documentation.

Also make `go generate` build a caddy binary which we then copy into
our directory. This means `go build`-builds remain working as-is.

And new etc instances in each etcd test for better isolation.
Fix more tests and rework test.Server with the newer support Caddy offers.

Fix Makefile to support new mode of operation.

1 files changed, 11 insertions, 6 deletions

diff --git a/test/proxy_test.go b/test/proxy_test.go
index 56ef159fb..ca04e1ae8 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -28,14 +28,20 @@ func TestLookupProxy(t *testing.T) {
 	defer rm()
 
 	corefile := `example.org:0 {
-	file ` + name + `
+       file ` + name + `
 }
 `
-	ex, _, udp, err := Server(t, corefile)
+
+	i, err := CoreDNSServer(corefile)
 	if err != nil {
-		t.Fatalf("Could get server: %s", err)
+		t.Fatalf("could not get CoreDNS serving instance: %s", err)
+	}
+
+	udp, _ := CoreDNSServerPorts(i, 0)
+	if udp == "" {
+		t.Fatalf("could not get udp listening port")
 	}
-	defer ex.Stop()
+	defer i.Stop()
 
 	log.SetOutput(ioutil.Discard)
 
@@ -43,8 +49,7 @@ func TestLookupProxy(t *testing.T) {
 	state := middleware.State{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
 	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
 	if err != nil {
-		t.Error("Expected to receive reply, but didn't")
-		return
+		t.Fatal("Expected to receive reply, but didn't")
 	}
 	// expect answer section with A record in it
 	if len(resp.Answer) == 0 {