diff options
| author |  Miek Gieben <miek@miek.nl>
| 2020-07-07 21:38:07 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-07-07 12:38:07 -0700 |
| commit | 68f1dd5ddf0451cc3a1b24a72c2965b8d896ffba (patch) | |
| tree | dfac4d4c60f1e3a088737e15119c7648f056e407 /plugin/pkg/parse/parse.go | |
| parent | 435d27b58d813ccc01ecc6d8620b78929c516c25 (diff) | |
| download | coredns-68f1dd5ddf0451cc3a1b24a72c2965b8d896ffba.tar.gz coredns-68f1dd5ddf0451cc3a1b24a72c2965b8d896ffba.tar.zst coredns-68f1dd5ddf0451cc3a1b24a72c2965b8d896ffba.zip | |
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>
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 232e163fd..75f60c05e 100644 --- a/plugin/pkg/parse/parse.go +++ b/plugin/pkg/parse/parse.go @@ -9,41 +9,31 @@ import ( "github.com/caddyserver/caddy" ) -// 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 } |