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

plugin/dnstap: remove config struct (#4258)

Browse source 
* plugin/dnstap: remove config struct

this struct is an uneeded intermidiate to get a dnstap it can be
removed. Remove the dnstapio subpkg: it's also not needed. Make *many*
functions and structs private now that we can.

Signed-off-by: Miek Gieben <miek@miek.nl>

* correct logging

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2020-11-05 14:37:16 +01:00 • committed by GitHub
parent fb5efa203d
commit 123da4c844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 102 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

40
plugin/dnstap/setup_test.go
View file

@ -8,26 +8,38 @@ import (
func TestConfig(t *testing.T) {
tests := []struct {
file string
path string
full bool
proto string
fail bool
in string
endpoint string
full bool
proto string
fail bool
}{
{"dnstap dnstap.sock full", "dnstap.sock", true, "unix", false},
{"dnstap unix://dnstap.sock", "dnstap.sock", false, "unix", false},
{"dnstap tcp://127.0.0.1:6000", "127.0.0.1:6000", false, "tcp", false},
{"dnstap", "fail", false, "tcp", true},
}
for _, c := range tests {
cad := caddy.NewTestController("dns", c.file)
conf, err := parseConfig(cad)
if c.fail {
if err == nil {
t.Errorf("%s: %s", c.file, err)
}
} else if err != nil || conf.target != c.path || conf.full != c.full || conf.proto != c.proto {
t.Errorf("Expected: %+v\nhave: %+v\nerror: %s", c, conf, err)
for i, tc := range tests {
c := caddy.NewTestController("dns", tc.in)
tap, err := parseConfig(c)
if tc.fail && err == nil {
t.Fatalf("Test %d: expected test to fail: %s: %s", i, tc.in, err)
}
if tc.fail {
continue
}
if err != nil {
t.Fatalf("Test %d: expected no error, got %s", i, err)
}
if x := tap.io.(*dio).endpoint; x != tc.endpoint {
t.Errorf("Test %d: expected endpoint %s, got %s", i, tc.endpoint, x)
}
if x := tap.io.(*dio).proto; x != tc.proto {
t.Errorf("Test %d: expected proto %s, got %s", i, tc.proto, x)
}
if x := tap.IncludeRawMessage; x != tc.full {
t.Errorf("Test %d: expected IncludeRawMessage %t, got %t", i, tc.full, x)
}
}
}