Merge branch 'main' into fix-dockerfile

tikv · Aug 22, 2022 · b5f229d · b5f229d
2 parents a6aea2d + ff3a1f0
commit b5f229d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 34 deletions.
diff --git a/cdc/cdc/sink/sink_test.go b/cdc/cdc/sink/sink_test.go
@@ -31,37 +31,23 @@ func TestValidateSink(t *testing.T) {
 	replicateConfig := config.GetDefaultReplicaConfig()
 	opts := make(map[string]string)
 
-	// test sink uri right
-	sinkURI := "tikv://127.0.0.1:3306/"
-	err := Validate(ctx, sinkURI, replicateConfig, opts)
-	require.Nil(t, err)
-
-	sinkURI = "tikv://127.0.0.1:3306/?concurrency=4"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.Nil(t, err)
-
-	sinkURI = "tikv://127.0.0.1:3306,127.0.0.1:3307/?concurrency=4"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.Nil(t, err)
-
-	sinkURI = "blackhole://"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.Nil(t, err)
-
-	// test sink uri wrong
-	sinkURI = "tikv://http://127.0.0.1:3306/"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.NotNil(t, err)
-
-	sinkURI = "tikv://127.0.0.1:3306a/"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.NotNil(t, err)
-
-	sinkURI = "tikv://a127.0.0.1:3306/"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.NotNil(t, err)
-
-	sinkURI = "tikv://127.0.0.1:3306, tikv://127.0.0.1:3307/"
-	err = Validate(ctx, sinkURI, replicateConfig, opts)
-	require.NotNil(t, err)
+	testCases := []struct {
+		sinkURI  string
+		expected bool
+	}{
+		{"tikv://127.0.0.1:3306/", true},
+		{"tikv://127.0.0.1:3306/?concurrency=4", true},
+		{"blackhole://", true},
+		{"tikv://127.0.0.1:3306,127.0.0.1:3307/", true},
+		{"tikv://hostname:3306", true},
+		{"tikv://http://127.0.0.1:3306/", false},
+		{"tikv://127.0.0.1:3306a/", false},
+		{"tikv://127.0.0.1:3306, tikv://127.0.0.1:3307/", false},
+		{"tikv://hostname:3306x", false},
+	}
+
+	for _, tc := range testCases {
+		err := Validate(ctx, tc.sinkURI, replicateConfig, opts)
+		require.Equal(t, tc.expected, err == nil)
+	}
 }
diff --git a/cdc/cdc/sink/tikv.go b/cdc/cdc/sink/tikv.go
@@ -408,7 +408,7 @@ func parseTiKVUri(sinkURI *url.URL, opts map[string]string) (*tikvconfig.Config,
 	if len(pdAddr) > 0 {
 		for i, addr := range pdAddr {
 			host, port, err := net.SplitHostPort(addr)
-			if err != nil || !validator.IsIP(host) || !validator.IsPort(port) {
+			if err != nil || !validator.IsHost(host) || !validator.IsPort(port) {
 				err = fmt.Errorf("Invalid pd addr: %v, err: %v", addr, err)
 				return nil, nil, cerror.WrapError(cerror.ErrTiKVInvalidConfig, err)
 			}