Revert "Implement notifies for transfer plugin (#3972)" (#3995)

This reverts commit 68f1dd5ddf.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

plugin/pkg/parse/parse.go

@@ -9,31 +9,41 @@ import (
 	"github.com/caddyserver/caddy"
 )
 
-// TransferIn parses transfer statements: 'transfer from [address...]'.
-func TransferIn(c *caddy.Controller) (froms []string, err error) {
+// Transfer parses transfer statements: 'transfer [to|from] [address...]'.
+func Transfer(c *caddy.Controller, secondary bool) (tos, froms []string, err error) {
 	if !c.NextArg() {
-		return nil, c.ArgErr()
+		return nil, nil, c.ArgErr()
 	}
 	value := c.Val()
 	switch value {
-	default:
-		return nil, c.Errf("unknown property %s", value)
-	case "from":
-		froms = c.RemainingArgs()
-		if len(froms) == 0 {
-			return nil, c.ArgErr()
+	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
+			}
 		}
+
+	case "from":
+		if !secondary {
+			return nil, nil, fmt.Errorf("can't use `transfer from` when not being a secondary")
+		}
+		froms = c.RemainingArgs()
 		for i := range froms {
 			if froms[i] != "*" {
 				normalized, err := HostPort(froms[i], transport.Port)
 				if err != nil {
-					return nil, err
+					return nil, nil, err
 				}
 				froms[i] = normalized
 			} else {
-				return nil, fmt.Errorf("can't use '*' in transfer from")
+				return nil, nil, fmt.Errorf("can't use '*' in transfer from")
 			}
 		}
 	}
-	return froms, nil
+	return
 }

plugin/pkg/parse/parse_test.go

@@ -6,41 +6,65 @@ import (
 	"github.com/caddyserver/caddy"
 )
 
-func TestTransferIn(t *testing.T) {
+func TestTransfer(t *testing.T) {
 	tests := []struct {
 		inputFileRules string
 		shouldErr      bool
+		secondary      bool
+		expectedTo     []string
 		expectedFrom   []string
 	}{
+		// OK transfer to
+		{
+			`to 127.0.0.1`,
+			false, false, []string{"127.0.0.1:53"}, []string{},
+		},
+		// OK transfer tos
+		{
+			`to 127.0.0.1 127.0.0.2`,
+			false, false, []string{"127.0.0.1:53", "127.0.0.2:53"}, []string{},
+		},
+		// OK transfer from
 		{
 			`from 127.0.0.1`,
-			false, []string{"127.0.0.1:53"},
+			false, true, []string{}, []string{"127.0.0.1:53"},
 		},
 		// OK transfer froms
 		{
 			`from 127.0.0.1 127.0.0.2`,
-			false, []string{"127.0.0.1:53", "127.0.0.2:53"},
+			false, true, []string{}, []string{"127.0.0.1:53", "127.0.0.2:53"},
+		},
+		// OK transfer tos/froms
+		{
+			`to 127.0.0.1 127.0.0.2
+			from 127.0.0.1 127.0.0.2`,
+			false, true, []string{"127.0.0.1:53", "127.0.0.2:53"}, []string{"127.0.0.1:53", "127.0.0.2:53"},
+		},
+		// Bad transfer from, secondary false
+		{
+			`from 127.0.0.1`,
+			true, false, []string{}, []string{},
 		},
 		// Bad transfer from garbage
 		{
 			`from !@#$%^&*()`,
-			true, []string{},
+			true, true, []string{}, []string{},
 		},
 		// Bad transfer from no args
 		{
 			`from`,
-			true, []string{},
+			true, false, []string{}, []string{},
 		},
 		// Bad transfer from *
 		{
 			`from *`,
-			true, []string{},
+			true, true, []string{}, []string{},
 		},
 	}
 
 	for i, test := range tests {
 		c := caddy.NewTestController("dns", test.inputFileRules)
-		froms, err := TransferIn(c)
+		tos, froms, err := Transfer(c, test.secondary)
 
 		if err == nil && test.shouldErr {
 			t.Fatalf("Test %d expected errors, but got no error %+v %+v", i, err, test)
@@ -48,6 +72,13 @@ func TestTransferIn(t *testing.T) {
 			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
 		}
 
+		if test.expectedTo != nil {
+			for j, got := range tos {
+				if got != test.expectedTo[j] {
+					t.Fatalf("Test %d expected %v, got %v", i, test.expectedTo[j], got)
+				}
+			}
+		}
 		if test.expectedFrom != nil {
 			for j, got := range froms {
 				if got != test.expectedFrom[j] {