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/pkg/parse/parse.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/pkg/parse/parse.go')
| -rw-r--r-- | plugin/pkg/parse/parse.go | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/plugin/pkg/parse/parse.go b/plugin/pkg/parse/parse.go index 356d6c21c..300a57a8b 100644 --- a/plugin/pkg/parse/parse.go +++ b/plugin/pkg/parse/parse.go @@ -8,41 +8,31 @@ import ( "github.com/coredns/coredns/plugin/pkg/transport" ) -// Transfer parses transfer statements: 'transfer [to|from] [address...]'. -func Transfer(c *caddy.Controller, secondary bool) (tos, froms []string, err error) { +// TransferIn parses transfer statements: 'transfer from [address...]'. +func TransferIn(c *caddy.Controller) (froms []string, err error) { if !c.NextArg() { - return nil, nil, c.ArgErr() + return nil, c.ArgErr() } value := c.Val() switch value { - case "to": - tos = c.RemainingArgs() - for i := range tos { - if tos[i] != "*" { - normalized, err := HostPort(tos[i], transport.Port) - if err != nil { - return nil, nil, err - } - tos[i] = normalized - } - } - + default: + return nil, c.Errf("unknown property %s", value) case "from": - if !secondary { - return nil, nil, fmt.Errorf("can't use `transfer from` when not being a secondary") - } froms = c.RemainingArgs() + if len(froms) == 0 { + return nil, c.ArgErr() + } for i := range froms { if froms[i] != "*" { normalized, err := HostPort(froms[i], transport.Port) if err != nil { - return nil, nil, err + return nil, err } froms[i] = normalized } else { - return nil, nil, fmt.Errorf("can't use '*' in transfer from") + return nil, fmt.Errorf("can't use '*' in transfer from") } } } - return + return froms, nil } |