TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pkg/fall: make Zero and Root vars not funcs (#1367)

Browse source 
These can be just vars. Think that was intended as well.
This commit is contained in:
Miek Gieben 2018-01-09 22:29:19 +00:00 • committed by GitHub
parent a19ea63d3a
commit cced1a4c12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugin/template/template_test.go
View file

@ -16,13 +16,12 @@ import (
)
func TestHandler(t *testing.T) {
rcodeFallthrough := 3841 // reserved for private use, used to indicate a fallthrough
exampleDomainATemplate := template{
regex: []*regexp.Regexp{regexp.MustCompile("(^|[.])ip-10-(?P<b>[0-9]*)-(?P<c>[0-9]*)-(?P<d>[0-9]*)[.]example[.]$")},
answer: []*gotmpl.Template{gotmpl.Must(gotmpl.New("answer").Parse("{{ .Name }} 60 IN A 10.{{ .Group.b }}.{{ .Group.c }}.{{ .Group.d }}"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
exampleDomainANSTemplate := template{
@ -32,7 +31,7 @@ func TestHandler(t *testing.T) {
authority: []*gotmpl.Template{gotmpl.Must(gotmpl.New("authority").Parse("example. IN NS ns0.example.com."))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
exampleDomainMXTemplate := template{
@ -41,7 +40,7 @@ func TestHandler(t *testing.T) {
additional: []*gotmpl.Template{gotmpl.Must(gotmpl.New("additional").Parse("{{ .Name }} 60 IN A 10.{{ .Group.b }}.{{ .Group.c }}.{{ .Group.d }}"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
invalidDomainTemplate := template{
@ -50,7 +49,7 @@ func TestHandler(t *testing.T) {
answer: []*gotmpl.Template{gotmpl.Must(gotmpl.New("answer").Parse("invalid. 60 {{ .Class }} SOA a.invalid. b.invalid. (1 60 60 60 60)"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
rcodeServfailTemplate := template{
@ -58,7 +57,7 @@ func TestHandler(t *testing.T) {
rcode: dns.RcodeServerFailure,
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
brokenTemplate := template{
@ -66,7 +65,7 @@ func TestHandler(t *testing.T) {
answer: []*gotmpl.Template{gotmpl.Must(gotmpl.New("answer").Parse("{{ .Name }} 60 IN TXT \"{{ index .Match 2 }}\""))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
nonRRTemplate := template{
@ -74,7 +73,7 @@ func TestHandler(t *testing.T) {
answer: []*gotmpl.Template{gotmpl.Must(gotmpl.New("answer").Parse("{{ .Name }}"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
nonRRAdditionalTemplate := template{
@ -82,7 +81,7 @@ func TestHandler(t *testing.T) {
additional: []*gotmpl.Template{gotmpl.Must(gotmpl.New("answer").Parse("{{ .Name }}"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
nonRRAuthoritativeTemplate := template{
@ -90,7 +89,7 @@ func TestHandler(t *testing.T) {
authority: []*gotmpl.Template{gotmpl.Must(gotmpl.New("authority").Parse("{{ .Name }}"))},
qclass: dns.ClassANY,
qtype: dns.TypeANY,
fall: fall.F{Zones: []string{"."}},
fall: fall.Root,
zones: []string{"."},
}
@ -297,7 +296,6 @@ func TestHandler(t *testing.T) {
// TestMultiSection verfies that a corefile with mutliple but different template sections works
func TestMultiSection(t *testing.T) {
rcodeFallthrough := 3841 // reserved for private use, used to indicate a fallthrough
ctx := context.TODO()
multisectionConfig := `
@ -438,5 +436,6 @@ func TestMultiSection(t *testing.T) {
if code != dns.RcodeNameError {
t.Fatalf("TestMultiSection expected NXDOMAIN resolving something.example. IN MX, got %v, %v", code, dns.RcodeToString[code])
}
}
const rcodeFallthrough = 3841 // reserved for private use, used to indicate a fallthrough