mw/federation: add federation back as separate mw for k8s (#929)

* mw/federaration

This PR add the federation back as a middleware to keep it more
contained from the main kubernetes code.

It also makes parseRequest less import and pushes this functionlity down
in the k.Entries. This minimizes (or tries to) the importance for the
qtype in the query. In the end the qtype checking should only happen
in ServeDNS - but for k8s this might proof difficult.

Numerous other cleanup in code and kubernetes tests.

* up test coverage

1 files changed, 6 insertions, 6 deletions

diff --git a/middleware/test/helpers.go b/middleware/test/helpers.go
index 8d9cada43..2074f46c2 100644
--- a/middleware/test/helpers.go
+++ b/middleware/test/helpers.go
@@ -218,35 +218,35 @@ func Section(t *testing.T, tc Case, sec sect, rr []dns.RR) bool {
 		case *dns.SOA:
 			tt := section[i].(*dns.SOA)
 			if x.Ns != tt.Ns {
-				t.Errorf("SOA nameserver should be %q, but is %q", x.Ns, tt.Ns)
+				t.Errorf("SOA nameserver should be %q, but is %q", tt.Ns, x.Ns)
 				return false
 			}
 		case *dns.PTR:
 			tt := section[i].(*dns.PTR)
 			if x.Ptr != tt.Ptr {
-				t.Errorf("PTR ptr should be %q, but is %q", x.Ptr, tt.Ptr)
+				t.Errorf("PTR ptr should be %q, but is %q", tt.Ptr, x.Ptr)
 				return false
 			}
 		case *dns.CNAME:
 			tt := section[i].(*dns.CNAME)
 			if x.Target != tt.Target {
-				t.Errorf("CNAME target should be %q, but is %q", x.Target, tt.Target)
+				t.Errorf("CNAME target should be %q, but is %q", tt.Target, x.Target)
 				return false
 			}
 		case *dns.MX:
 			tt := section[i].(*dns.MX)
 			if x.Mx != tt.Mx {
-				t.Errorf("MX Mx should be %q, but is %q", x.Mx, tt.Mx)
+				t.Errorf("MX Mx should be %q, but is %q", tt.Mx, x.Mx)
 				return false
 			}
 			if x.Preference != tt.Preference {
-				t.Errorf("MX Preference should be %q, but is %q", x.Preference, tt.Preference)
+				t.Errorf("MX Preference should be %q, but is %q", tt.Preference, x.Preference)
 				return false
 			}
 		case *dns.NS:
 			tt := section[i].(*dns.NS)
 			if x.Ns != tt.Ns {
-				t.Errorf("NS nameserver should be %q, but is %q", x.Ns, tt.Ns)
+				t.Errorf("NS nameserver should be %q, but is %q", tt.Ns, x.Ns)
 				return false
 			}
 		case *dns.OPT: