Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugins: calling Dispenser itself is a mistake (#3323)

Browse Source 
Remove all these uses and just make them work on caddy.Controller. Also
don't export parsing functions as their should be private to the plugin.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2019-09-28 10:41:12 +01:00
committed by GitHub
parent ba5d4a6372
commit 03a3695ea9
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/dnstap/setup.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/coredns/coredns/plugin/pkg/parse"
"github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
)
var log = clog.NewWithPlugin("dnstap")
@@ -30,7 +29,7 @@ type config struct {
full bool
}
func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
func parseConfig(d *caddy.Controller) (c config, err error) {
d.Next() // directive name
if !d.Args(&c.target) {
@@ -56,7 +55,7 @@ func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
}
func setup(c *caddy.Controller) error {
conf, err := parseConfig(&c.Dispenser)
conf, err := parseConfig(c)
if err != nil {
return err
}

2
plugin/dnstap/setup_test.go
View File

@@ -21,7 +21,7 @@ func TestConfig(t *testing.T) {
}
for _, c := range tests {
cad := caddy.NewTestController("dns", c.file)
conf, err := parseConfig(&cad.Dispenser)
conf, err := parseConfig(cad)
if c.fail {
if err == nil {
t.Errorf("%s: %s", c.file, err)