diff options
| author |  Yong Tang <yong.tang.github@outlook.com>
| 2020-09-24 11:30:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-24 20:30:39 +0200 |
| commit | 9798dd067f53a74e3777cff539b2f01617c107c6 (patch) | |
| tree | fac3bbc495c9a7f78fd9a847fb44533bd6367d9a /plugin/transfer/setup.go | |
| parent | 279194f2e45c9dfeccafe95e515e0aced0ea8bdc (diff) | |
| download | coredns-9798dd067f53a74e3777cff539b2f01617c107c6.tar.gz coredns-9798dd067f53a74e3777cff539b2f01617c107c6.tar.zst coredns-9798dd067f53a74e3777cff539b2f01617c107c6.zip | |
Cherry-pick: Implement notifies for transfer plugin (#3972) (#4142)
* Implement notifies for transfer plugin (#3972)
* Fix notifies in transfer plugin
Signed-off-by: Miek Gieben <miek@miek.nl>
* Make it compile
Signed-off-by: Miek Gieben <miek@miek.nl>
* Port more plugins
Signed-off-by: Miek Gieben <miek@miek.nl>
* golint
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix tests
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix notifies in transfer plugin
Signed-off-by: Miek Gieben <miek@miek.nl>
* Make it compile
Signed-off-by: Miek Gieben <miek@miek.nl>
* Port more plugins
Signed-off-by: Miek Gieben <miek@miek.nl>
* golint
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix tests
Signed-off-by: Miek Gieben <miek@miek.nl>
* Fix tests
Signed-off-by: Miek Gieben <miek@miek.nl>
* really fix test
Signed-off-by: Miek Gieben <miek@miek.nl>
* Implement ixfr fallback and unify file and auto for transfering
Signed-off-by: Miek Gieben <miek@miek.nl>
* Add transfer tests
copied and modified from #3452
Signed-off-by: Miek Gieben <miek@miek.nl>
* Test correct selection of plugin
Signed-off-by: Miek Gieben <miek@miek.nl>
* add upstream back in
Signed-off-by: Miek Gieben <miek@miek.nl>
* Implement ixfr fallback and unify file and auto for transfering
Signed-off-by: Miek Gieben <miek@miek.nl>
* fix test
Signed-off-by: Miek Gieben <miek@miek.nl>
* properly merge
Signed-off-by: Miek Gieben <miek@miek.nl>
* Remove plugin/kubernetes/setup_transfer_test.go
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Co-authored-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/transfer/setup.go')
| -rw-r--r-- | plugin/transfer/setup.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugin/transfer/setup.go b/plugin/transfer/setup.go index 528e53847..e92d442bc 100644 --- a/plugin/transfer/setup.go +++ b/plugin/transfer/setup.go @@ -4,7 +4,7 @@ import ( "github.com/coredns/caddy" "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - parsepkg "github.com/coredns/coredns/plugin/pkg/parse" + "github.com/coredns/coredns/plugin/pkg/parse" "github.com/coredns/coredns/plugin/pkg/transport" ) @@ -16,7 +16,7 @@ func init() { } func setup(c *caddy.Controller) error { - t, err := parse(c) + t, err := parseTransfer(c) if err != nil { return plugin.Error("transfer", err) @@ -43,8 +43,7 @@ func setup(c *caddy.Controller) error { return nil } -func parse(c *caddy.Controller) (*Transfer, error) { - +func parseTransfer(c *caddy.Controller) (*Transfer, error) { t := &Transfer{} for c.Next() { x := &xfr{} @@ -82,14 +81,14 @@ func parse(c *caddy.Controller) (*Transfer, error) { x.to = append(x.to, host) continue } - normalized, err := parsepkg.HostPort(host, transport.Port) + normalized, err := parse.HostPort(host, transport.Port) if err != nil { return nil, err } x.to = append(x.to, normalized) } default: - return nil, plugin.Error("transfer", c.Errf("unknown property '%s'", c.Val())) + return nil, plugin.Error("transfer", c.Errf("unknown property %q", c.Val())) } } if len(x.to) == 0 { |