Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Coredns
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
Coredns
Commits
ed1f42cf
Commit
ed1f42cf
authored
Apr 25, 2020
by
Ambrose Chua
Committed by
GitHub
Apr 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mixed indentation within tests (#3855)
Signed-off-by:
Ambrose Chua
<
ambrose@chua.family
>
parent
74eabe90
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
286 additions
and
307 deletions
+286
-307
test/auto_test.go
test/auto_test.go
+7
-10
test/cache_test.go
test/cache_test.go
+7
-7
test/chaos_test.go
test/chaos_test.go
+1
-2
test/compression_scrub_test.go
test/compression_scrub_test.go
+6
-6
test/ds_file_test.go
test/ds_file_test.go
+2
-3
test/edns0_test.go
test/edns0_test.go
+1
-2
test/erratic_autopath_test.go
test/erratic_autopath_test.go
+15
-15
test/etcd_cache_test.go
test/etcd_cache_test.go
+5
-5
test/etcd_credentials_test.go
test/etcd_credentials_test.go
+4
-4
test/etcd_test.go
test/etcd_test.go
+9
-9
test/example_test.go
test/example_test.go
+10
-10
test/file_cname_proxy_test.go
test/file_cname_proxy_test.go
+9
-9
test/file_reload_test.go
test/file_reload_test.go
+9
-9
test/file_serve_test.go
test/file_serve_test.go
+20
-20
test/file_srv_additional_test.go
test/file_srv_additional_test.go
+3
-3
test/file_upstream_test.go
test/file_upstream_test.go
+33
-33
test/file_xfr_test.go
test/file_xfr_test.go
+5
-5
test/grpc_test.go
test/grpc_test.go
+2
-2
test/hosts_file_test.go
test/hosts_file_test.go
+5
-5
test/metrics_test.go
test/metrics_test.go
+40
-45
test/miek_test.go
test/miek_test.go
+21
-21
test/plugin_dnssec_test.go
test/plugin_dnssec_test.go
+8
-8
test/proxy_health_test.go
test/proxy_health_test.go
+2
-4
test/proxy_test.go
test/proxy_test.go
+4
-6
test/reload_test.go
test/reload_test.go
+25
-27
test/rewrite_test.go
test/rewrite_test.go
+6
-6
test/secondary_test.go
test/secondary_test.go
+11
-14
test/server_reverse_test.go
test/server_reverse_test.go
+6
-6
test/server_test.go
test/server_test.go
+5
-5
test/template_upstream_test.go
test/template_upstream_test.go
+3
-3
test/wildcard_test.go
test/wildcard_test.go
+2
-3
No files found.
test/auto_test.go
View file @
ed1f42cf
...
@@ -22,8 +22,7 @@ func TestAuto(t *testing.T) {
...
@@ -22,8 +22,7 @@ func TestAuto(t *testing.T) {
directory `
+
tmpdir
+
` db\.(.*) {1}
directory `
+
tmpdir
+
` db\.(.*) {1}
reload 1s
reload 1s
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -82,8 +81,7 @@ func TestAutoNonExistentZone(t *testing.T) {
...
@@ -82,8 +81,7 @@ func TestAutoNonExistentZone(t *testing.T) {
reload 1s
reload 1s
}
}
errors stdout
errors stdout
}
}`
`
i
,
err
:=
CoreDNSServer
(
corefile
)
i
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -121,8 +119,7 @@ func TestAutoAXFR(t *testing.T) {
...
@@ -121,8 +119,7 @@ func TestAutoAXFR(t *testing.T) {
reload 1s
reload 1s
transfer to *
transfer to *
}
}
}
}`
`
i
,
err
:=
CoreDNSServer
(
corefile
)
i
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -160,9 +157,9 @@ func TestAutoAXFR(t *testing.T) {
...
@@ -160,9 +157,9 @@ func TestAutoAXFR(t *testing.T) {
}
}
const
zoneContent
=
`; testzone
const
zoneContent
=
`; testzone
@
IN SOA
sns.dns.icann.org. noc.dns.icann.org. 2016082534 7200 3600 1209600 3600
@
IN SOA
sns.dns.icann.org. noc.dns.icann.org. 2016082534 7200 3600 1209600 3600
NS
a.iana-servers.net.
IN NS
a.iana-servers.net.
NS
b.iana-servers.net.
IN NS
b.iana-servers.net.
www IN A 127.0.0.1
www IN A
127.0.0.1
`
`
test/cache_test.go
View file @
ed1f42cf
...
@@ -17,9 +17,9 @@ func TestLookupCache(t *testing.T) {
...
@@ -17,9 +17,9 @@ func TestLookupCache(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -28,10 +28,10 @@ func TestLookupCache(t *testing.T) {
...
@@ -28,10 +28,10 @@ func TestLookupCache(t *testing.T) {
// Start caching forward CoreDNS that we want to test.
// Start caching forward CoreDNS that we want to test.
corefile
=
`example.org:0 {
corefile
=
`example.org:0 {
forward . `
+
udp
+
`
forward . `
+
udp
+
`
cache 10
cache 10
}
}`
`
i
,
udp
,
_
,
err
=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/chaos_test.go
View file @
ed1f42cf
...
@@ -13,8 +13,7 @@ import (
...
@@ -13,8 +13,7 @@ import (
func
TestChaos
(
t
*
testing
.
T
)
{
func
TestChaos
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
chaos
chaos
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/compression_scrub_test.go
View file @
ed1f42cf
...
@@ -9,12 +9,12 @@ import (
...
@@ -9,12 +9,12 @@ import (
func
TestCompressScrub
(
t
*
testing
.
T
)
{
func
TestCompressScrub
(
t
*
testing
.
T
)
{
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
erratic {
erratic {
drop 0
drop 0
delay 0
delay 0
large
large
}
}
}`
}`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/ds_file_test.go
View file @
ed1f42cf
...
@@ -35,9 +35,8 @@ func TestLookupDS(t *testing.T) {
...
@@ -35,9 +35,8 @@ func TestLookupDS(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`miek.nl:0 {
corefile
:=
`miek.nl:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/edns0_test.go
View file @
ed1f42cf
...
@@ -9,8 +9,7 @@ import (
...
@@ -9,8 +9,7 @@ import (
func
TestEDNS0
(
t
*
testing
.
T
)
{
func
TestEDNS0
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
whoami
whoami
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/erratic_autopath_test.go
View file @
ed1f42cf
...
@@ -17,7 +17,7 @@ func setupProxyTargetCoreDNS(t *testing.T, fn func(string)) {
...
@@ -17,7 +17,7 @@ func setupProxyTargetCoreDNS(t *testing.T, fn func(string)) {
defer
os
.
Remove
(
tmpdir
)
defer
os
.
Remove
(
tmpdir
)
content
:=
`
content
:=
`
example.org. IN
SOA sns.dns.icann.org. noc.dns.icann.org. 1 3600 3600 3600 3600
example.org. IN
SOA sns.dns.icann.org. noc.dns.icann.org. 1 3600 3600 3600 3600
google.com. IN SOA ns1.google.com. dns-admin.google.com. 1 3600 3600 3600 3600
google.com. IN SOA ns1.google.com. dns-admin.google.com. 1 3600 3600 3600 3600
google.com. IN A 172.217.25.110
google.com. IN A 172.217.25.110
...
@@ -30,9 +30,9 @@ google.com. IN A 172.217.25.110
...
@@ -30,9 +30,9 @@ google.com. IN A 172.217.25.110
defer
os
.
Remove
(
path
)
defer
os
.
Remove
(
path
)
corefile
:=
`.:0 {
corefile
:=
`.:0 {
file `
+
path
+
`
file `
+
path
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get proxy target CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get proxy target CoreDNS serving instance: %s"
,
err
)
...
@@ -45,12 +45,12 @@ google.com. IN A 172.217.25.110
...
@@ -45,12 +45,12 @@ google.com. IN A 172.217.25.110
func
TestLookupAutoPathErratic
(
t
*
testing
.
T
)
{
func
TestLookupAutoPathErratic
(
t
*
testing
.
T
)
{
setupProxyTargetCoreDNS
(
t
,
func
(
proxyPath
string
)
{
setupProxyTargetCoreDNS
(
t
,
func
(
proxyPath
string
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
erratic
erratic
autopath @erratic
autopath @erratic
forward . `
+
proxyPath
+
`
forward . `
+
proxyPath
+
`
debug
debug
}
}
`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -91,11 +91,11 @@ func TestLookupAutoPathErratic(t *testing.T) {
...
@@ -91,11 +91,11 @@ func TestLookupAutoPathErratic(t *testing.T) {
func
TestAutoPathErraticNotLoaded
(
t
*
testing
.
T
)
{
func
TestAutoPathErraticNotLoaded
(
t
*
testing
.
T
)
{
setupProxyTargetCoreDNS
(
t
,
func
(
proxyPath
string
)
{
setupProxyTargetCoreDNS
(
t
,
func
(
proxyPath
string
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
autopath @erratic
autopath @erratic
forward . `
+
proxyPath
+
`
forward . `
+
proxyPath
+
`
debug
debug
}
}`
`
i
,
err
:=
CoreDNSServer
(
corefile
)
i
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/etcd_cache_test.go
View file @
ed1f42cf
...
@@ -15,11 +15,11 @@ import (
...
@@ -15,11 +15,11 @@ import (
func
TestEtcdCache
(
t
*
testing
.
T
)
{
func
TestEtcdCache
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
etcd skydns.test {
etcd skydns.test {
path /skydns
path /skydns
}
}
cache skydns.test
cache skydns.test
}`
}`
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/etcd_credentials_test.go
View file @
ed1f42cf
...
@@ -11,10 +11,10 @@ import (
...
@@ -11,10 +11,10 @@ import (
func
TestEtcdCredentials
(
t
*
testing
.
T
)
{
func
TestEtcdCredentials
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
etcd skydns.test {
etcd skydns.test {
path /skydns
path /skydns
}
}
}`
}`
ex
,
_
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
ex
,
_
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/etcd_test.go
View file @
ed1f42cf
...
@@ -41,15 +41,15 @@ func TestEtcdStubLoop(t *testing.T) {
...
@@ -41,15 +41,15 @@ func TestEtcdStubLoop(t *testing.T) {
func
TestEtcdStubAndProxyLookup
(
t
*
testing
.
T
)
{
func
TestEtcdStubAndProxyLookup
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
etcd skydns.local {
etcd skydns.local {
stubzones
stubzones
path /skydns
path /skydns
endpoint http://localhost:2379
endpoint http://localhost:2379
upstream
upstream
fallthrough
fallthrough
}
}
forward . 8.8.8.8:53
forward . 8.8.8.8:53
}`
}`
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/example_test.go
View file @
ed1f42cf
...
@@ -2,15 +2,15 @@ package test
...
@@ -2,15 +2,15 @@ package test
const
exampleOrg
=
`; example.org test file
const
exampleOrg
=
`; example.org test file
$TTL 3600
$TTL 3600
@
IN SOA
sns.dns.icann.org. noc.dns.icann.org. 2015082541 7200 3600 1209600 3600
@
IN SOA
sns.dns.icann.org. noc.dns.icann.org. 2015082541 7200 3600 1209600 3600
@
IN NS
b.iana-servers.net.
@
IN NS
b.iana-servers.net.
@
IN NS
a.iana-servers.net.
@
IN NS
a.iana-servers.net.
@
IN A
127.0.0.1
@
IN A
127.0.0.1
@
IN A
127.0.0.2
@
IN A
127.0.0.2
short
1 IN A
127.0.0.3
short
1 IN A
127.0.0.3
*.w
3600 IN TXT
"Wildcard"
*.w
3600 IN TXT
"Wildcard"
a.b.c.w
IN TXT
"Not a wildcard"
a.b.c.w
IN TXT
"Not a wildcard"
cname
IN CNAME
www.example.net.
cname
IN CNAME
www.example.net.
service
IN SRV
8080 10 10 @
service
IN SRV
8080 10 10 @
`
`
test/file_cname_proxy_test.go
View file @
ed1f42cf
...
@@ -19,9 +19,9 @@ func TestZoneExternalCNAMELookupWithoutProxy(t *testing.T) {
...
@@ -19,9 +19,9 @@ func TestZoneExternalCNAMELookupWithoutProxy(t *testing.T) {
// Corefile with for example without proxy section.
// Corefile with for example without proxy section.
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -51,12 +51,12 @@ func TestZoneExternalCNAMELookupWithProxy(t *testing.T) {
...
@@ -51,12 +51,12 @@ func TestZoneExternalCNAMELookupWithProxy(t *testing.T) {
// Corefile with for example proxy section.
// Corefile with for example proxy section.
corefile
:=
`.:0 {
corefile
:=
`.:0 {
file `
+
name
+
` example.org {
file `
+
name
+
` example.org {
upstream
upstream
}
}
forward . 8.8.8.8 8.8.4.4
forward . 8.8.8.8 8.8.4.4
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/file_reload_test.go
View file @
ed1f42cf
...
@@ -18,16 +18,16 @@ func TestZoneReload(t *testing.T) {
...
@@ -18,16 +18,16 @@ func TestZoneReload(t *testing.T) {
defer
rm
()
defer
rm
()
// Corefile with two stanzas
// Corefile with two stanzas
corefile
:=
`example.org:0 {
corefile
:=
`
file `
+
name
+
` {
example.org:0 {
reload 1s
file `
+
name
+
` {
}
reload 1s
}
}
}
example.net:0 {
file `
+
name
+
`
}`
example.net:0 {
file `
+
name
+
`
}
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/file_serve_test.go
View file @
ed1f42cf
...
@@ -12,19 +12,19 @@ func TestZoneEDNS0Lookup(t *testing.T) {
...
@@ -12,19 +12,19 @@ func TestZoneEDNS0Lookup(t *testing.T) {
t
.
Parallel
()
t
.
Parallel
()
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
@
3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. (
@
3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. (
2017042745 ; serial
2017042745 ; serial
7200 ; refresh (2 hours)
7200 ; refresh (2 hours)
3600 ; retry (1 hour)
3600 ; retry (1 hour)
1209600 ; expire (2 weeks)
1209600 ; expire (2 weeks)
3600 ; minimum (1 hour)
3600 ; minimum (1 hour)
)
)
3600 IN NS
a.iana-servers.net.
3600 IN NS
a.iana-servers.net.
3600 IN NS
b.iana-servers.net.
3600 IN NS
b.iana-servers.net.
www
IN A
127.0.0.1
www
IN A
127.0.0.1
www
IN AAAA ::1
www IN AAAA ::1
`
)
`
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
...
@@ -33,9 +33,9 @@ www IN AAAA ::1
...
@@ -33,9 +33,9 @@ www IN AAAA ::1
// Corefile with for example without proxy section.
// Corefile with for example without proxy section.
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -59,7 +59,7 @@ func TestZoneNoNS(t *testing.T) {
...
@@ -59,7 +59,7 @@ func TestZoneNoNS(t *testing.T) {
t
.
Parallel
()
t
.
Parallel
()
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
@
3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. (
@
3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. (
2017042745 ; serial
2017042745 ; serial
7200 ; refresh (2 hours)
7200 ; refresh (2 hours)
3600 ; retry (1 hour)
3600 ; retry (1 hour)
...
@@ -67,8 +67,8 @@ func TestZoneNoNS(t *testing.T) {
...
@@ -67,8 +67,8 @@ func TestZoneNoNS(t *testing.T) {
3600 ; minimum (1 hour)
3600 ; minimum (1 hour)
)
)
www
IN A
127.0.0.1
www
IN A
127.0.0.1
www
IN AAAA ::1
www IN AAAA ::1
`
)
`
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
...
@@ -77,9 +77,9 @@ www IN AAAA ::1
...
@@ -77,9 +77,9 @@ www IN AAAA ::1
// Corefile with for example without proxy section.
// Corefile with for example without proxy section.
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/file_srv_additional_test.go
View file @
ed1f42cf
...
@@ -19,9 +19,9 @@ func TestZoneSRVAdditional(t *testing.T) {
...
@@ -19,9 +19,9 @@ func TestZoneSRVAdditional(t *testing.T) {
// Corefile with for example without proxy section.
// Corefile with for example without proxy section.
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/file_upstream_test.go
View file @
ed1f42cf
...
@@ -10,18 +10,18 @@ import (
...
@@ -10,18 +10,18 @@ import (
func
TestFileUpstream
(
t
*
testing
.
T
)
{
func
TestFileUpstream
(
t
*
testing
.
T
)
{
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
@ 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. (
@ 3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. (
2017042745 ; serial
2017042745 ; serial
7200 ; refresh (2 hours)
7200 ; refresh (2 hours)
3600 ; retry (1 hour)
3600 ; retry (1 hour)
1209600 ; expire (2 weeks)
1209600 ; expire (2 weeks)
3600 ; minimum (1 hour)
3600 ; minimum (1 hour)
)
)
3600 IN NS
a.iana-servers.net.
3600 IN NS
a.iana-servers.net.
3600 IN NS
b.iana-servers.net.
3600 IN NS
b.iana-servers.net.
www 3600 IN CNAME
www.example.net.
www 3600 IN CNAME www.example.net.
`
)
`
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
...
@@ -29,15 +29,15 @@ www 3600 IN CNAME www.example.net.
...
@@ -29,15 +29,15 @@ www 3600 IN CNAME www.example.net.
defer
rm
()
defer
rm
()
corefile
:=
`.:0 {
corefile
:=
`.:0 {
file `
+
name
+
` example.org {
file `
+
name
+
` example.org {
upstream
upstream
}
}
hosts {
hosts {
10.0.0.1 www.example.net.
10.0.0.1 www.example.net.
fallthrough
fallthrough
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -64,11 +64,11 @@ www 3600 IN CNAME www.example.net.
...
@@ -64,11 +64,11 @@ www 3600 IN CNAME www.example.net.
// example.org contains a cname to foo.example.org; this should be resolved via upstream.Self.
// example.org contains a cname to foo.example.org; this should be resolved via upstream.Self.
func
TestFileUpstreamAdditional
(
t
*
testing
.
T
)
{
func
TestFileUpstreamAdditional
(
t
*
testing
.
T
)
{
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
name
,
rm
,
err
:=
test
.
TempFile
(
"."
,
`$ORIGIN example.org.
@ 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. 2017042745 7200 3600 1209600 3600
@ 3600 IN SOA
sns.dns.icann.org. noc.dns.icann.org. 2017042745 7200 3600 1209600 3600
3600 IN NS
b.iana-servers.net.
3600 IN NS
b.iana-servers.net.
www 3600 IN CNAME
www.foo
www 3600 IN CNAME www.foo
`
)
`
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
t
.
Fatalf
(
"Failed to create zone: %s"
,
err
)
...
@@ -78,7 +78,7 @@ www 3600 IN CNAME www.foo
...
@@ -78,7 +78,7 @@ www 3600 IN CNAME www.foo
name2
,
rm2
,
err2
:=
test
.
TempFile
(
"."
,
`$ORIGIN foo.example.org.
name2
,
rm2
,
err2
:=
test
.
TempFile
(
"."
,
`$ORIGIN foo.example.org.
@ 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. 2017042745 7200 3600 1209600 3600
@ 3600 IN SOA sns.dns.icann.org. noc.dns.icann.org. 2017042745 7200 3600 1209600 3600
3600 IN NS
b.iana-servers.net.
3600 IN NS
b.iana-servers.net.
www 3600 IN A 127.0.0.53
www 3600 IN A 127.0.0.53
`
)
`
)
...
@@ -88,14 +88,14 @@ www 3600 IN A 127.0.0.53
...
@@ -88,14 +88,14 @@ www 3600 IN A 127.0.0.53
defer
rm2
()
defer
rm2
()
corefile
:=
`.:0 {
corefile
:=
`.:0 {
file `
+
name
+
` example.org {
file `
+
name
+
` example.org {
upstream
upstream
}
}
file `
+
name2
+
` foo.example.org {
file `
+
name2
+
` foo.example.org {
upstream
upstream
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/file_xfr_test.go
View file @
ed1f42cf
...
@@ -29,11 +29,11 @@ func TestLargeAXFR(t *testing.T) {
...
@@ -29,11 +29,11 @@ func TestLargeAXFR(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.com:0 {
corefile
:=
`example.com:0 {
file `
+
name
+
` {
file `
+
name
+
` {
transfer to *
transfer to *
}
}
}
}`
`
// Start server, and send an AXFR query to the TCP port. We set the deadline to prevent the test from hanging.
// Start server, and send an AXFR query to the TCP port. We set the deadline to prevent the test from hanging.
i
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/grpc_test.go
View file @
ed1f42cf
...
@@ -14,8 +14,8 @@ import (
...
@@ -14,8 +14,8 @@ import (
func
TestGrpc
(
t
*
testing
.
T
)
{
func
TestGrpc
(
t
*
testing
.
T
)
{
corefile
:=
`grpc://.:0 {
corefile
:=
`grpc://.:0 {
whoami
whoami
}
}`
`
g
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
g
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/hosts_file_test.go
View file @
ed1f42cf
...
@@ -8,11 +8,11 @@ import (
...
@@ -8,11 +8,11 @@ import (
func
TestHostsInlineLookup
(
t
*
testing
.
T
)
{
func
TestHostsInlineLookup
(
t
*
testing
.
T
)
{
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
hosts highly_unlikely_to_exist_hosts_file example.org {
hosts highly_unlikely_to_exist_hosts_file example.org {
10.0.0.1 example.org
10.0.0.1 example.org
fallthrough
fallthrough
}
}
}`
}`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/metrics_test.go
View file @
ed1f42cf
package
test
package
test
import
(
import
(
"fmt"
"io/ioutil"
"io/ioutil"
"os"
"os"
"path/filepath"
"path/filepath"
...
@@ -18,16 +17,16 @@ import (
...
@@ -18,16 +17,16 @@ import (
// Start test server that has metrics enabled. Then tear it down again.
// Start test server that has metrics enabled. Then tear it down again.
func
TestMetricsServer
(
t
*
testing
.
T
)
{
func
TestMetricsServer
(
t
*
testing
.
T
)
{
corefile
:=
`example.org:0 {
corefile
:=
`
chaos CoreDNS-001 miek@miek.nl
example.org:0 {
prometheus localhost:0
chaos CoreDNS-001 miek@miek.nl
}
prometheus localhost:0
}
example.com:0 {
forward . 8.8.4.4:53
prometheus localhost:0
}`
example.com:0 {
forward . 8.8.4.4:53
prometheus localhost:0
}
`
srv
,
err
:=
CoreDNSServer
(
corefile
)
srv
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -37,12 +36,11 @@ example.com:0 {
...
@@ -37,12 +36,11 @@ example.com:0 {
func
TestMetricsRefused
(
t
*
testing
.
T
)
{
func
TestMetricsRefused
(
t
*
testing
.
T
)
{
metricName
:=
"coredns_dns_responses_total"
metricName
:=
"coredns_dns_responses_total"
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
forward . 8.8.8.8:53
forward . 8.8.8.8:53
prometheus localhost:0
prometheus localhost:0
}
}`
`
srv
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
srv
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -82,8 +80,7 @@ func TestMetricsAuto(t *testing.T) {
...
@@ -82,8 +80,7 @@ func TestMetricsAuto(t *testing.T) {
reload 1s
reload 1s
}
}
prometheus localhost:0
prometheus localhost:0
}
}`
`
i
,
err
:=
CoreDNSServer
(
corefile
)
i
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -140,22 +137,20 @@ func TestMetricsAuto(t *testing.T) {
...
@@ -140,22 +137,20 @@ func TestMetricsAuto(t *testing.T) {
func
TestMetricsSeveralBlocs
(
t
*
testing
.
T
)
{
func
TestMetricsSeveralBlocs
(
t
*
testing
.
T
)
{
cacheSizeMetricName
:=
"coredns_cache_entries"
cacheSizeMetricName
:=
"coredns_cache_entries"
addrMetrics
:=
"localhost:9155"
addrMetrics
:=
"localhost:9155"
corefile
:=
`
corefile
:=
fmt
.
Sprintf
(
`
example.org:0 {
example.org:0 {
prometheus `
+
addrMetrics
+
`
prometheus %s
forward . 8.8.8.8:53 {
forward . 8.8.8.8:53 {
force_tcp
force_tcp
}
}
}
}
google.com:0 {
google.com:0 {
prometheus `
+
addrMetrics
+
`
prometheus %s
forward . 8.8.8.8:53 {
forward . 8.8.8.8:53 {
force_tcp
force_tcp
}
}
cache
cache
}`
}
`
,
addrMetrics
,
addrMetrics
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -190,16 +185,16 @@ google.com:0 {
...
@@ -190,16 +185,16 @@ google.com:0 {
}
}
func
TestMetricsPluginEnabled
(
t
*
testing
.
T
)
{
func
TestMetricsPluginEnabled
(
t
*
testing
.
T
)
{
corefile
:=
`example.org:0 {
corefile
:=
`
chaos CoreDNS-001 miek@miek.nl
example.org:0 {
prometheus localhost:0
chaos CoreDNS-001 miek@miek.nl
}
prometheus localhost:0
}
example.com:0 {
forward . 8.8.4.4:53
prometheus localhost:0
}`
example.com:0 {
forward . 8.8.4.4:53
prometheus localhost:0
}
`
srv
,
err
:=
CoreDNSServer
(
corefile
)
srv
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -230,14 +225,14 @@ func TestMetricsAvailable(t *testing.T) {
...
@@ -230,14 +225,14 @@ func TestMetricsAvailable(t *testing.T) {
procCache
:=
"coredns_cache_entries"
procCache
:=
"coredns_cache_entries"
procCacheMiss
:=
"coredns_cache_misses_total"
procCacheMiss
:=
"coredns_cache_misses_total"
procForward
:=
"coredns_dns_request_duration_seconds"
procForward
:=
"coredns_dns_request_duration_seconds"
corefileWithMetrics
:=
`
corefileWithMetrics
:=
`.:0 {
.:0 {
prometheus localhost:0
prometheus localhost:0
cache
cache
forward . 8.8.8.8 {
forward . 8.8.8.8 {
force_tcp
force_tcp
}
}
}`
}`
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
defer
inst
.
Stop
()
defer
inst
.
Stop
()
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/miek_test.go
View file @
ed1f42cf
...
@@ -4,28 +4,28 @@ const miekNL = `; miek.nl test zone
...
@@ -4,28 +4,28 @@ const miekNL = `; miek.nl test zone
$TTL 30M
$TTL 30M
$ORIGIN miek.nl.
$ORIGIN miek.nl.
@ IN SOA linode.atoom.net. miek.miek.nl. (
@ IN SOA linode.atoom.net. miek.miek.nl. (
1282630059 ; Serial
1282630059 ; Serial
4H ; Refresh
4H ; Refresh
1H ; Retry
1H ; Retry
7D ; Expire
7D ; Expire
4H ) ; Negative Cache TTL
4H ) ; Negative Cache TTL
IN NS
linode.atoom.net.
IN NS
linode.atoom.net.
IN NS
ns-ext.nlnetlabs.nl.
IN NS
ns-ext.nlnetlabs.nl.
IN NS
omval.tednet.nl.
IN NS
omval.tednet.nl.
IN NS
ext.ns.whyscream.net.
IN NS
ext.ns.whyscream.net.
IN MX
1 aspmx.l.google.com.
IN MX
1 aspmx.l.google.com.
IN MX
5 alt1.aspmx.l.google.com.
IN MX
5 alt1.aspmx.l.google.com.
IN MX
5 alt2.aspmx.l.google.com.
IN MX
5 alt2.aspmx.l.google.com.
IN MX
10 aspmx2.googlemail.com.
IN MX
10 aspmx2.googlemail.com.
IN MX
10 aspmx3.googlemail.com.
IN MX
10 aspmx3.googlemail.com.
IN A
176.58.119.54
IN A
176.58.119.54
IN AAAA
2a01:7e00::f03c:91ff:fe79:234c
IN AAAA
2a01:7e00::f03c:91ff:fe79:234c
IN HINFO
"Please stop asking for ANY" "See draft-ietf-dnsop-refuse-any"
IN HINFO
"Please stop asking for ANY" "See draft-ietf-dnsop-refuse-any"
a
IN A
176.58.119.54
a
IN A
176.58.119.54
IN AAAA
2a01:7e00::f03c:91ff:fe79:234c
IN AAAA
2a01:7e00::f03c:91ff:fe79:234c
www
IN CNAME
a
www
IN CNAME
a
archive
IN CNAME
a
archive
IN CNAME
a
`
`
test/plugin_dnssec_test.go
View file @
ed1f42cf
...
@@ -21,14 +21,14 @@ func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
...
@@ -21,14 +21,14 @@ func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
defer
rm1
()
defer
rm1
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
rewrite type ANY HINFO
rewrite type ANY HINFO
dnssec {
dnssec {
key file `
+
base
+
`
key file `
+
base
+
`
}
}
loadbalance
loadbalance
}
}`
`
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
ex
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/proxy_health_test.go
View file @
ed1f42cf
...
@@ -15,8 +15,7 @@ func TestProxyThreeWay(t *testing.T) {
...
@@ -15,8 +15,7 @@ func TestProxyThreeWay(t *testing.T) {
erratic {
erratic {
drop 2
drop 2
}
}
}
}`
`
up1
,
err
:=
CoreDNSServer
(
corefileUp1
)
up1
,
err
:=
CoreDNSServer
(
corefileUp1
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -26,8 +25,7 @@ func TestProxyThreeWay(t *testing.T) {
...
@@ -26,8 +25,7 @@ func TestProxyThreeWay(t *testing.T) {
corefileUp2
:=
`example.org:0 {
corefileUp2
:=
`example.org:0 {
whoami
whoami
}
}`
`
up2
,
err
:=
CoreDNSServer
(
corefileUp2
)
up2
,
err
:=
CoreDNSServer
(
corefileUp2
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/proxy_test.go
View file @
ed1f42cf
...
@@ -17,9 +17,8 @@ func TestLookupProxy(t *testing.T) {
...
@@ -17,9 +17,8 @@ func TestLookupProxy(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -54,9 +53,8 @@ func BenchmarkProxyLookup(b *testing.B) {
...
@@ -54,9 +53,8 @@ func BenchmarkProxyLookup(b *testing.B) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
err
:=
CoreDNSServer
(
corefile
)
i
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/reload_test.go
View file @
ed1f42cf
...
@@ -14,9 +14,9 @@ import (
...
@@ -14,9 +14,9 @@ import (
func
TestReload
(
t
*
testing
.
T
)
{
func
TestReload
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
whoami
whoami
}
}`
`
coreInput
:=
NewInput
(
corefile
)
coreInput
:=
NewInput
(
corefile
)
c
,
err
:=
CoreDNSServer
(
corefile
)
c
,
err
:=
CoreDNSServer
(
corefile
)
...
@@ -60,11 +60,11 @@ func send(t *testing.T, server string) {
...
@@ -60,11 +60,11 @@ func send(t *testing.T, server string) {
}
}
func
TestReloadHealth
(
t
*
testing
.
T
)
{
func
TestReloadHealth
(
t
*
testing
.
T
)
{
corefile
:=
`
corefile
:=
`
.:0 {
.:0 {
health 127.0.0.1:52182
health 127.0.0.1:52182
whoami
whoami
}`
}`
c
,
err
:=
CoreDNSServer
(
corefile
)
c
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
...
@@ -81,12 +81,12 @@ func TestReloadHealth(t *testing.T) {
...
@@ -81,12 +81,12 @@ func TestReloadHealth(t *testing.T) {
}
}
func
TestReloadMetricsHealth
(
t
*
testing
.
T
)
{
func
TestReloadMetricsHealth
(
t
*
testing
.
T
)
{
corefile
:=
`
corefile
:=
`
.:0 {
.:0 {
prometheus 127.0.0.1:53183
prometheus 127.0.0.1:53183
health 127.0.0.1:53184
health 127.0.0.1:53184
whoami
whoami
}`
}`
c
,
err
:=
CoreDNSServer
(
corefile
)
c
,
err
:=
CoreDNSServer
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
...
@@ -154,15 +154,14 @@ func TestReloadSeveralTimeMetrics(t *testing.T) {
...
@@ -154,15 +154,14 @@ func TestReloadSeveralTimeMetrics(t *testing.T) {
// that is not used in another test
// that is not used in another test
promAddress
:=
"127.0.0.1:53185"
promAddress
:=
"127.0.0.1:53185"
proc
:=
"coredns_build_info"
proc
:=
"coredns_build_info"
corefileWithMetrics
:=
`
corefileWithMetrics
:=
`.:0 {
.:0 {
prometheus `
+
promAddress
+
`
prometheus `
+
promAddress
+
`
whoami
whoami
}`
}`
corefileWithoutMetrics
:=
`
corefileWithoutMetrics
:=
`.:0 {
.:0 {
whoami
whoami
}`
}`
if
err
:=
collectMetricsInfo
(
promAddress
,
proc
);
err
==
nil
{
if
err
:=
collectMetricsInfo
(
promAddress
,
proc
);
err
==
nil
{
t
.
Errorf
(
"Prometheus is listening before the test started"
)
t
.
Errorf
(
"Prometheus is listening before the test started"
)
}
}
...
@@ -211,14 +210,14 @@ func TestMetricsAvailableAfterReload(t *testing.T) {
...
@@ -211,14 +210,14 @@ func TestMetricsAvailableAfterReload(t *testing.T) {
procMetric
:=
"coredns_build_info"
procMetric
:=
"coredns_build_info"
procCache
:=
"coredns_cache_entries"
procCache
:=
"coredns_cache_entries"
procForward
:=
"coredns_dns_request_duration_seconds"
procForward
:=
"coredns_dns_request_duration_seconds"
corefileWithMetrics
:=
`
corefileWithMetrics
:=
`.:0 {
.:0 {
prometheus `
+
promAddress
+
`
prometheus `
+
promAddress
+
`
cache
cache
forward . 8.8.8.8 {
forward . 8.8.8.8 {
force_tcp
force_tcp
}
}
}`
}`
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
if
err
!=
nil
{
if
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
...
@@ -265,23 +264,22 @@ func TestMetricsAvailableAfterReloadAndFailedReload(t *testing.T) {
...
@@ -265,23 +264,22 @@ func TestMetricsAvailableAfterReloadAndFailedReload(t *testing.T) {
procMetric
:=
"coredns_build_info"
procMetric
:=
"coredns_build_info"
procCache
:=
"coredns_cache_entries"
procCache
:=
"coredns_cache_entries"
procForward
:=
"coredns_dns_request_duration_seconds"
procForward
:=
"coredns_dns_request_duration_seconds"
corefileWithMetrics
:=
`
corefileWithMetrics
:=
`.:0 {
.:0 {
prometheus `
+
promAddress
+
`
prometheus `
+
promAddress
+
`
cache
cache
forward . 8.8.8.8 {
forward . 8.8.8.8 {
force_tcp
force_tcp
}
}
}`
}`
invalidCorefileWithMetrics
:=
`
invalidCorefileWithMetrics
:=
`.:0 {
.:0 {
prometheus `
+
promAddress
+
`
prometheus `
+
promAddress
+
`
cache
cache
forward . 8.8.8.8 {
forward . 8.8.8.8 {
force_tcp
force_tcp
}
}
invalid
invalid
}`
}`
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
inst
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefileWithMetrics
)
if
err
!=
nil
{
if
err
!=
nil
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
if
strings
.
Contains
(
err
.
Error
(),
inUse
)
{
...
...
test/rewrite_test.go
View file @
ed1f42cf
...
@@ -10,12 +10,12 @@ import (
...
@@ -10,12 +10,12 @@ import (
func
TestRewrite
(
t
*
testing
.
T
)
{
func
TestRewrite
(
t
*
testing
.
T
)
{
t
.
Parallel
()
t
.
Parallel
()
corefile
:=
`.:0 {
corefile
:=
`.:0 {
rewrite type MX a
rewrite type MX a
rewrite edns0 local set 0xffee hello-world
rewrite edns0 local set 0xffee hello-world
erratic . {
erratic . {
drop 0
drop 0
}
}
}`
}`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/secondary_test.go
View file @
ed1f42cf
...
@@ -15,8 +15,7 @@ func TestEmptySecondaryZone(t *testing.T) {
...
@@ -15,8 +15,7 @@ func TestEmptySecondaryZone(t *testing.T) {
secondary {
secondary {
transfer from 127.0.0.1:1717
transfer from 127.0.0.1:1717
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -43,11 +42,10 @@ func TestSecondaryZoneTransfer(t *testing.T) {
...
@@ -43,11 +42,10 @@ func TestSecondaryZoneTransfer(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
` {
file `
+
name
+
` {
transfer to *
transfer to *
}
}
}
}`
`
i
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
_
,
tcp
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -59,8 +57,8 @@ func TestSecondaryZoneTransfer(t *testing.T) {
...
@@ -59,8 +57,8 @@ func TestSecondaryZoneTransfer(t *testing.T) {
secondary {
secondary {
transfer from `
+
tcp
+
`
transfer from `
+
tcp
+
`
}
}
}
}`
`
i1
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i1
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -93,11 +91,10 @@ func TestIxfrResponse(t *testing.T) {
...
@@ -93,11 +91,10 @@ func TestIxfrResponse(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
` {
file `
+
name
+
` {
transfer to *
transfer to *
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
test/server_reverse_test.go
View file @
ed1f42cf
...
@@ -11,8 +11,8 @@ func TestClasslessReverse(t *testing.T) {
...
@@ -11,8 +11,8 @@ func TestClasslessReverse(t *testing.T) {
// 25 -> so anything above 1.127 won't be answered, below is OK.
// 25 -> so anything above 1.127 won't be answered, below is OK.
corefile
:=
`192.168.1.0/25:0 {
corefile
:=
`192.168.1.0/25:0 {
whoami
whoami
}
}`
`
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -51,8 +51,8 @@ func TestClasslessReverse(t *testing.T) {
...
@@ -51,8 +51,8 @@ func TestClasslessReverse(t *testing.T) {
func
TestReverse
(
t
*
testing
.
T
)
{
func
TestReverse
(
t
*
testing
.
T
)
{
corefile
:=
`192.168.1.0/24:0 {
corefile
:=
`192.168.1.0/24:0 {
whoami
whoami
}
}`
`
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -97,8 +97,8 @@ func TestReverse(t *testing.T) {
...
@@ -97,8 +97,8 @@ func TestReverse(t *testing.T) {
func
TestReverseInAddr
(
t
*
testing
.
T
)
{
func
TestReverseInAddr
(
t
*
testing
.
T
)
{
corefile
:=
`1.168.192.in-addr.arpa:0 {
corefile
:=
`1.168.192.in-addr.arpa:0 {
whoami
whoami
}
}`
`
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
s
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/server_test.go
View file @
ed1f42cf
...
@@ -10,9 +10,9 @@ import (
...
@@ -10,9 +10,9 @@ import (
func
TestProxyToChaosServer
(
t
*
testing
.
T
)
{
func
TestProxyToChaosServer
(
t
*
testing
.
T
)
{
t
.
Parallel
()
t
.
Parallel
()
corefile
:=
`.:0 {
corefile
:=
`.:0 {
chaos CoreDNS-001 miek@miek.nl
chaos CoreDNS-001 miek@miek.nl
}
}`
`
chaos
,
udpChaos
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
chaos
,
udpChaos
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
@@ -22,8 +22,8 @@ func TestProxyToChaosServer(t *testing.T) {
...
@@ -22,8 +22,8 @@ func TestProxyToChaosServer(t *testing.T) {
corefileProxy
:=
`.:0 {
corefileProxy
:=
`.:0 {
forward . `
+
udpChaos
+
`
forward . `
+
udpChaos
+
`
}
}`
`
proxy
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefileProxy
)
proxy
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefileProxy
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance"
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance"
)
...
...
test/template_upstream_test.go
View file @
ed1f42cf
...
@@ -8,7 +8,7 @@ import (
...
@@ -8,7 +8,7 @@ import (
func
TestTemplateUpstream
(
t
*
testing
.
T
)
{
func
TestTemplateUpstream
(
t
*
testing
.
T
)
{
corefile
:=
`.:0 {
corefile
:=
`.:0 {
# CNAME
# CNAME
template IN ANY cname.example.net. {
template IN ANY cname.example.net. {
match ".*"
match ".*"
answer "cname.example.net. 60 IN CNAME target.example.net."
answer "cname.example.net. 60 IN CNAME target.example.net."
...
@@ -20,8 +20,8 @@ func TestTemplateUpstream(t *testing.T) {
...
@@ -20,8 +20,8 @@ func TestTemplateUpstream(t *testing.T) {
match ".*"
match ".*"
answer "target.example.net. 60 IN A 1.2.3.4"
answer "target.example.net. 60 IN A 1.2.3.4"
}
}
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
t
.
Fatalf
(
"Could not get CoreDNS serving instance: %s"
,
err
)
...
...
test/wildcard_test.go
View file @
ed1f42cf
...
@@ -17,9 +17,8 @@ func TestLookupWildcard(t *testing.T) {
...
@@ -17,9 +17,8 @@ func TestLookupWildcard(t *testing.T) {
defer
rm
()
defer
rm
()
corefile
:=
`example.org:0 {
corefile
:=
`example.org:0 {
file `
+
name
+
`
file `
+
name
+
`
}
}`
`
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
i
,
udp
,
_
,
err
:=
CoreDNSServerAndPorts
(
corefile
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment