fix: remove ip check; remove wrong testcase

wesql · Dec 3, 2024 · 3e91354 · 3e91354
1 parent aee5e01
commit 3e91354
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 32 deletions.
diff --git a/go/vt/vtgate/branch/branch_service.go b/go/vt/vtgate/branch/branch_service.go
@@ -2,7 +2,6 @@ package branch
 
 import (
 	"fmt"
-	"net"
 	"strings"
 	"vitess.io/vitess/go/vt/schemadiff"
 )
@@ -78,10 +77,6 @@ func (meta *BranchMeta) Validate() error {
 
 	if meta.SourceHost == "" {
 		return fmt.Errorf("branch SourceHost cannot be empty")
-	} else {
-		if net.ParseIP(meta.SourceHost) == nil {
-			return fmt.Errorf("source host %v is not a valid ip address", meta.SourceHost)
-		}
 	}
 
 	if meta.SourcePort <= 0 || meta.SourcePort > 65535 {

diff --git a/go/vt/vtgate/branch/target_mysql_service_test.go b/go/vt/vtgate/branch/target_mysql_service_test.go
@@ -2,7 +2,6 @@ package branch
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
@@ -19,25 +18,6 @@ func TestGetAllDatabases(t *testing.T) {
 	}
 }
 
-func TestSelectBranchMeta(t *testing.T) {
-	mysqlService, mock := NewMockMysqlService(t)
-	defer mysqlService.Close()
-	TargetMySQLServiceForTest := NewTargetMySQLService(mysqlService)
-
-	InitMockBranchMetas(mock)
-
-	for i, _ := range BranchMetasForTest {
-		meta, err := TargetMySQLServiceForTest.SelectAndValidateBranchMeta(fmt.Sprintf("test%d", i))
-		if err != nil {
-			t.Error(err)
-		}
-		assert.Equal(t, true, compareBranchMetas(BranchMetasForTest[i], meta))
-	}
-	meta, err := TargetMySQLServiceForTest.SelectAndValidateBranchMeta("no this test")
-	assert.Nil(t, meta)
-	assert.NotNil(t, err)
-}
-
 func compareBranchMetas(first, second *BranchMeta) bool {
 	if first == nil || second == nil {
 		if first != second {

diff --git a/go/vt/vtgate/branch/test_util.go b/go/vt/vtgate/branch/test_util.go
@@ -207,7 +207,7 @@ var (
 			SourcePort:       3306,
 			SourceUser:       "repl_user",
 			SourcePassword:   "password123",
-			IncludeDatabases: []string{},
+			IncludeDatabases: []string{"*"},
 			ExcludeDatabases: []string{},
 			TargetDBPattern:  "",
 			Status:           "unknown",

diff --git a/go/vt/vtgate/engine/branch_primitive.go b/go/vt/vtgate/engine/branch_primitive.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/go-sql-driver/mysql"
-	"net"
 	"strconv"
 	"strings"
 	"vitess.io/vitess/go/sqltypes"
@@ -294,14 +293,9 @@ func (bcp *BranchCreateParams) setValues(params map[string]string) error {
 	return checkRedundantParams(params)
 }
 
-// todo complete me
 func (bcp *BranchCreateParams) validate() error {
 	if bcp.SourceHost == "" {
 		return fmt.Errorf("branch create: source host is required")
-	} else {
-		if net.ParseIP(bcp.SourceHost) == nil {
-			return fmt.Errorf("branch create: source host %v is not a valid ip address", bcp.SourceHost)
-		}
 	}
 
 	if bcp.SourcePort == "" {