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

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>

1 files changed, 3 insertions, 4 deletions

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