api,sink: resolve release-8.5 cherry-pick conflicts

Author: asddongmen

api/v2/changefeed.go

@@ -52,8 +52,6 @@ import (
 	"go.uber.org/zap"
 )
 
-<<<<<<< HEAD
-=======
 // validateChangefeedIDParam extracts and validates the changefeed ID from the
 // URL path parameter. On failure it writes the error to c and returns false.
 func validateChangefeedIDParam(c *gin.Context) (common.ChangeFeedDisplayName, bool) {
@@ -75,7 +73,6 @@ func genSinkURIInvalidError(sinkURI string, err error) error {
 		errors.ErrSinkURIInvalid, util.MaskSensitiveDataInURLError(err), maskSinkURIForError(sinkURI))
 }
 
->>>>>>> d38ea0a5d (api,sink: mask sink uri secrets (#5093))
 // CreateChangefeed handles create changefeed request,
 // it returns the changefeed's changefeedInfo that it just created
 // CreateChangefeed creates a changefeed

api/v2/changefeed_test.go

@@ -14,7 +14,7 @@
 package v2
 
 import (
-<<<<<<< HEAD
+	"net/url"
 	"testing"
 
 	"github.com/pingcap/ticdc/pkg/common"
@@ -79,12 +79,7 @@ func TestVerifyRouteConflict(t *testing.T) {
 	require.Contains(t, err.Error(), "target `db1`.`orders`")
 	require.Contains(t, err.Error(), "source `db1`.`orders`")
 	require.Contains(t, err.Error(), "source `db2`.`orders`")
-=======
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
+}
 
 func TestMaskSinkURIForError(t *testing.T) {
 	sinkURI := "kafka://127.0.0.1:9092/topic?protocol=canal-json" +
@@ -113,5 +108,4 @@ func mustParseURLError(t *testing.T, rawURL string) error {
 	_, err := url.Parse(rawURL)
 	require.Error(t, err)
 	return err
->>>>>>> d38ea0a5d (api,sink: mask sink uri secrets (#5093))
 }