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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show stats 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/coredns/coredns/plugin/pkg/parse"
"github.com/caddyserver/caddy" "github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
) )
var log = clog.NewWithPlugin("dnstap") var log = clog.NewWithPlugin("dnstap")
@ -30,7 +29,7 @@ type config struct {
full bool full bool
} }
func parseConfig(d *caddyfile.Dispenser) (c config, err error) { func parseConfig(d *caddy.Controller) (c config, err error) {
d.Next() // directive name d.Next() // directive name
if !d.Args(&c.target) { if !d.Args(&c.target) {
@ -56,7 +55,7 @@ func parseConfig(d *caddyfile.Dispenser) (c config, err error) {
} }
func setup(c *caddy.Controller) error { func setup(c *caddy.Controller) error {
conf, err := parseConfig(&c.Dispenser) conf, err := parseConfig(c)
if err != nil { if err != nil {
return err return err
} }

2
plugin/dnstap/setup_test.go
View file

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

8
plugin/forward/setup.go
View file

@ -13,7 +13,6 @@ import (
"github.com/coredns/coredns/plugin/pkg/transport" "github.com/coredns/coredns/plugin/pkg/transport"
"github.com/caddyserver/caddy" "github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
) )
func init() { plugin.Register("forward", setup) } func init() { plugin.Register("forward", setup) }
@ -74,7 +73,7 @@ func parseForward(c *caddy.Controller) (*Forward, error) {
return nil, plugin.ErrOnce return nil, plugin.ErrOnce
} }
i++ i++
f, err = ParseForwardStanza(&c.Dispenser) f, err = parseStanza(c)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -82,8 +81,7 @@ func parseForward(c *caddy.Controller) (*Forward, error) {
return f, nil return f, nil
} }
// ParseForwardStanza parses one forward stanza func parseStanza(c *caddy.Controller) (*Forward, error) {
func ParseForwardStanza(c *caddyfile.Dispenser) (*Forward, error) {
f := New() f := New()
if !c.Args(&f.from) { if !c.Args(&f.from) {
@ -128,7 +126,7 @@ func ParseForwardStanza(c *caddyfile.Dispenser) (*Forward, error) {
return f, nil return f, nil
} }
func parseBlock(c *caddyfile.Dispenser, f *Forward) error { func parseBlock(c *caddy.Controller, f *Forward) error {
switch c.Val() { switch c.Val() {
case "except": case "except":
ignore := c.RemainingArgs() ignore := c.RemainingArgs()

7
plugin/grpc/setup.go
View file

@ -11,7 +11,6 @@ import (
pkgtls "github.com/coredns/coredns/plugin/pkg/tls" pkgtls "github.com/coredns/coredns/plugin/pkg/tls"
"github.com/caddyserver/caddy" "github.com/caddyserver/caddy"
"github.com/caddyserver/caddy/caddyfile"
) )
func init() { plugin.Register("grpc", setup) } func init() { plugin.Register("grpc", setup) }
@ -50,7 +49,7 @@ func parseGRPC(c *caddy.Controller) (*GRPC, error) {
return nil, plugin.ErrOnce return nil, plugin.ErrOnce
} }
i++ i++
g, err = parseGRPCStanza(&c.Dispenser) g, err = parseStanza(c)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -58,7 +57,7 @@ func parseGRPC(c *caddy.Controller) (*GRPC, error) {
return g, nil return g, nil
} }
func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) { func parseStanza(c *caddy.Controller) (*GRPC, error) {
g := newGRPC() g := newGRPC()
if !c.Args(&g.from) { if !c.Args(&g.from) {
@ -99,7 +98,7 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) {
return g, nil return g, nil
} }
func parseBlock(c *caddyfile.Dispenser, g *GRPC) error { func parseBlock(c *caddy.Controller, g *GRPC) error {
switch c.Val() { switch c.Val() {
case "except": case "except":