Skip to content

C
Coredns
"include/svn:/svn.code.sf.net/p/irrlicht/code/trunk@2214" did not exist on "510bb72e652a6eefc77ee2d7c2b434c4e5342017"
Commit 28447234 authored by Miek Gieben's avatar Miek Gieben Committed by GitHub
Browse files
Options

mw/kubernetes: fix parseTests (#875) 

* mw/kubernetes: fix parseTests

Make parse tests table driven to remove a duplicate code, i.e. most
of the contents of parse_test.go can be removed as well as the
expectString helper function.

* cleanup parse tests
parent 7e56cc74
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 111 deletions
middleware/kubernetes/parse_test.go
View file @ 28447234
package kubernetes package kubernetes
import ( import (
"reflect"
"testing" "testing"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
func expectString(t *testing.T, function, qtype, query string, r *recordRequest, field, expected string) {
ref := reflect.ValueOf(r)
refField := reflect.Indirect(ref).FieldByName(field)
got := refField.String()
if got != expected {
t.Errorf("Expected %v(%v, \"%v\") to get %v == \"%v\". Instead got \"%v\".", function, query, qtype, field, expected, got)
}
}
func TestParseRequest(t *testing.T) { func TestParseRequest(t *testing.T) {
var tcs map[string]string
zone := "intern.webs.tests."
k := Kubernetes{Zones: []string{zone}} k := Kubernetes{Zones: []string{zone}}
f := "parseRequest"
// Test a valid SRV request
//
query := "_http._tcp.webs.mynamespace.svc.inter.webs.test."
r, e := k.parseRequest(query, dns.TypeSRV, zone)
if e != nil {
t.Errorf("Expected no error from parseRequest(%v, \"SRV\"). Instead got '%v'.", query, e)
}
tcs = map[string]string{
"port": "http",
"protocol": "tcp",
"endpoint": "",
"service": "webs",
"namespace": "mynamespace",
"podOrSvc": Svc,
"zone": zone,
}
for field, expected := range tcs {
expectString(t, f, "SRV", query, &r, field, expected)
}
// Test wildcard acceptance
//
query = "*.any.*.any.svc.inter.webs.test."
r, e = k.parseRequest(query, dns.TypeSRV, zone)
if e != nil {
t.Errorf("Expected no error from parseRequest(\"%v\", \"SRV\"). Instead got '%v'.", query, e)
}
tcs = map[string]string{ tests := []struct {
"port": "*", query string
"protocol": "any", qtype uint16
"endpoint": "", expected string // output from r.String()
"service": "*", }{
"namespace": "any", {
"podOrSvc": Svc, // valid SRV request
"zone": zone, "_http._tcp.webs.mynamespace.svc.inter.webs.test.", dns.TypeSRV,
} "http.tcp..webs.mynamespace.svc.intern.webs.tests..",
for field, expected := range tcs { },
expectString(t, f, "SRV", query, &r, field, expected) {
} // wildcard acceptance
"*.any.*.any.svc.inter.webs.test.", dns.TypeSRV,
// Test A request of endpoint "*.any..*.any.svc.intern.webs.tests..",
query = "1-2-3-4.webs.mynamespace.svc.inter.webs.test." },
r, e = k.parseRequest(query, dns.TypeA, zone) {
if e != nil { // A request of endpoint
t.Errorf("Expected no error from parseRequest(\"%v\", \"A\"). Instead got '%v'.", query, e) "1-2-3-4.webs.mynamespace.svc.inter.webs.test.", dns.TypeA,
} "..1-2-3-4.webs.mynamespace.svc.intern.webs.tests..",
tcs = map[string]string{ },
"port": "", {
"protocol": "", "inter.webs.test.", dns.TypeNS,
"endpoint": "1-2-3-4", "......intern.webs.tests..",
"service": "webs", },
"namespace": "mynamespace", }
"podOrSvc": Svc, for i, tc := range tests {
"zone": zone, r, e := k.parseRequest(tc.query, tc.qtype, zone)
}
for field, expected := range tcs {
expectString(t, f, "A", query, &r, field, expected)
}
// Test NS request
query = "inter.webs.test."
r, e = k.parseRequest(query, dns.TypeNS, zone)
if e != nil { if e != nil {
t.Errorf("Expected no error from parseRequest(\"%v\", \"NS\"). Instead got '%v'.", query, e) t.Errorf("Test %d, expected no error, got '%v'.", i, e)
} }
tcs = map[string]string{ rs := r.String()
"port": "", if rs != tc.expected {
"protocol": "", t.Errorf("Test %d, expected (stringyfied) recordRequest: %s, got %s", i, tc.expected, rs)
"endpoint": "",
"service": "",
"namespace": "",
"podOrSvc": "",
"zone": zone,
} }
for field, expected := range tcs {
expectString(t, f, "NS", query, &r, field, expected)
} }
}
// Invalid query tests func TestParseInvalidRequest(t *testing.T) {
invalidAQueries := []string{ k := Kubernetes{Zones: []string{zone}}
"_http._tcp.webs.mynamespace.svc.inter.webs.test.", // A requests cannot have port or protocol TODO(miek): this must return NODATA
} invalid := map[string]uint16{
for _, q := range invalidAQueries { "_http._tcp.webs.mynamespace.svc.inter.webs.test.": dns.TypeA, // A requests cannot have port or protocol
_, e = k.parseRequest(q, dns.TypeA, zone) "_http._pcp.webs.mynamespace.svc.inter.webs.test.": dns.TypeSRV, // SRV protocol must be tcp or udp
if e == nil { "_http._tcp.ep.webs.ns.svc.inter.webs.test.": dns.TypeSRV, // SRV requests cannot have an endpoint
t.Errorf("Expected error from %v(\"%v\", \"A\").", f, q) "_*._*.webs.mynamespace.svc.inter.webs.test.": dns.TypeSRV, // SRV request with invalid wildcards
}
}
invalidSRVQueries := []string{
"_http._pcp.webs.mynamespace.svc.inter.webs.test.", // SRV protocol must be tcp or udp
"_http._tcp.ep.webs.ns.svc.inter.webs.test.", // SRV requests cannot have an endpoint
"_*._*.webs.mynamespace.svc.inter.webs.test.", // SRV request with invalid wildcards
} }
for _, q := range invalidSRVQueries { for query, qtype := range invalid {
_, e = k.parseRequest(q, dns.TypeSRV, zone) if _, e := k.parseRequest(query, qtype, zone); e == nil {
if e == nil { t.Errorf("Expected error from %s:%d, got none", query, qtype)
t.Errorf("Expected error from %v(\"%v\", \"SRV\").", f, q)
} }
} }
} }
const zone = "intern.webs.tests."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment