cmd: eliminate tiflow dependencies in cmd package (#1006)

close #1008

api/v1/api.go

@@ -24,8 +24,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/api/middleware"
-	pv2 "github.com/pingcap/ticdc/api/v2"
-	v2 "github.com/pingcap/ticdc/api/v2"
+	"github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/pkg/config"
 	"github.com/pingcap/ticdc/pkg/errors"
 	"github.com/pingcap/ticdc/pkg/server"
@@ -41,12 +40,12 @@ func setV1Header(c *gin.Context) {
 // OpenAPIV1 provides CDC v1 APIs
 type OpenAPIV1 struct {
 	server server.Server
-	v2     pv2.OpenAPIV2
+	v2     v2.OpenAPIV2
 }
 
 // NewOpenAPIV1 creates a new OpenAPIV1.
 func NewOpenAPIV1(c server.Server) OpenAPIV1 {
-	return OpenAPIV1{c, pv2.NewOpenAPIV2(c)}
+	return OpenAPIV1{c, v2.NewOpenAPIV2(c)}
 }
 
 // RegisterOpenAPIV1Routes registers routes for OpenAPIV1

api/v2/changefeed.go

@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/api/middleware"
 	"github.com/pingcap/ticdc/downstreamadapter/sink"
-	apperror "github.com/pingcap/ticdc/pkg/apperror"
+	"github.com/pingcap/ticdc/pkg/apperror"
 	"github.com/pingcap/ticdc/pkg/common"
 	"github.com/pingcap/ticdc/pkg/config"
 	"github.com/pingcap/ticdc/pkg/errors"

api/v2/model.go

@@ -20,11 +20,11 @@ import (
 	"github.com/pingcap/ticdc/pkg/common"
 	"github.com/pingcap/ticdc/pkg/config"
 	"github.com/pingcap/ticdc/pkg/errors"
+	"github.com/pingcap/ticdc/pkg/util"
 	"github.com/pingcap/tiflow/cdc/model"
 	bf "github.com/pingcap/tiflow/pkg/binlog-filter"
 	"github.com/pingcap/tiflow/pkg/integrity"
 	"github.com/pingcap/tiflow/pkg/security"
-	"github.com/pingcap/tiflow/pkg/util"
 )
 
 // EmptyResponse return empty {} to http client

cmd/cdc/cli/cli.go

@@ -14,9 +14,13 @@
 package cli
 
 import (
+	"context"
+	"os"
+
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
-	"github.com/pingcap/tiflow/pkg/logutil"
+	"github.com/pingcap/ticdc/cmd/util"
+	"github.com/pingcap/ticdc/pkg/errors"
+	"github.com/pingcap/ticdc/pkg/logger"
 	"github.com/spf13/cobra"
 )
 
@@ -35,7 +39,13 @@ func NewCmdCli() *cobra.Command {
 	cf.AddFlags(cmds)
 	cmds.PersistentPreRun = func(cmd *cobra.Command, args []string) {
 		// Here we will initialize the logging configuration and set the current default context.
-		cancel := util.InitCmd(cmd, &logutil.Config{Level: cf.GetLogLevel()})
+		err := logger.InitLogger(&logger.Config{Level: cf.GetLogLevel()})
+		if err != nil {
+			cmd.Printf("init logger error %v\n", errors.Trace(err))
+			os.Exit(1)
+		}
+		_, cancel := context.WithCancel(context.Background())
+		defer cancel()
 		util.LogHTTPProxies()
 		// A notify that complete immediately, it skips the second signal essentially.
 		doneNotify := func() <-chan struct{} {

cmd/cdc/cli/cli_capture_list.go

@@ -14,10 +14,11 @@
 package cli
 
 import (
+	"context"
+
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 
@@ -43,8 +44,7 @@ func (o *listCaptureOptions) complete(f factory.Factory) error {
 
 // run runs the `cli capture list` command.
 func (o *listCaptureOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
-
+	ctx := context.Background()
 	raw, err := o.apiv2Client.Captures().List(ctx)
 	if err != nil {
 		return err

cmd/cdc/cli/cli_changefeed_create.go

@@ -24,13 +24,12 @@ import (
 	"github.com/pingcap/log"
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
 	"github.com/pingcap/ticdc/pkg/config"
 	"github.com/pingcap/ticdc/pkg/filter"
+	putil "github.com/pingcap/ticdc/pkg/util"
 	"github.com/pingcap/tiflow/cdc/model"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
-	putil "github.com/pingcap/tiflow/pkg/util"
 	"github.com/spf13/cobra"
 	"github.com/tikv/client-go/v2/oracle"
 	"go.uber.org/zap"
@@ -354,8 +353,7 @@ func newCmdCreateChangefeed(f factory.Factory) *cobra.Command {
 		Short: "Create a new replication task (changefeed)",
 		Args:  cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			ctx := cmdcontext.GetDefaultContext()
-
+			ctx := context.Background()
 			util.CheckErr(o.complete(f))
 			util.CheckErr(o.validate(cmd))
 			util.CheckErr(o.run(ctx, cmd))

cmd/cdc/cli/cli_changefeed_list.go

@@ -14,14 +14,14 @@
 package cli
 
 import (
+	"context"
 	"time"
 
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	v2 "github.com/pingcap/ticdc/pkg/api/v2"
 	"github.com/pingcap/tiflow/cdc/api/owner"
 	"github.com/pingcap/tiflow/cdc/model"
-	"github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 
@@ -66,7 +66,7 @@ func (o *listChangefeedOptions) complete(f factory.Factory) error {
 
 // run the `cli changefeed list` command.
 func (o *listChangefeedOptions) run(cmd *cobra.Command) error {
-	ctx := context.GetDefaultContext()
+	ctx := context.Background()
 
 	raw, err := o.apiClient.Changefeeds().List(ctx, o.namespace, "all")
 	if err != nil {

cmd/cdc/cli/cli_changefeed_move_table.go

@@ -17,8 +17,8 @@ import (
 	"context"
 
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 

cmd/cdc/cli/cli_changefeed_pause.go

@@ -14,10 +14,11 @@
 package cli
 
 import (
+	"context"
+
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	"github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 
@@ -55,7 +56,7 @@ func (o *pauseChangefeedOptions) complete(f factory.Factory) error {
 
 // run the `cli changefeed pause` command.
 func (o *pauseChangefeedOptions) run() error {
-	ctx := context.GetDefaultContext()
+	ctx := context.Background()
 	return o.apiClient.Changefeeds().Pause(ctx, o.namespace, o.changefeedID)
 }
 

cmd/cdc/cli/cli_changefeed_query.go

@@ -19,10 +19,10 @@ import (
 	"github.com/pingcap/errors"
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
 	cerror "github.com/pingcap/ticdc/pkg/errors"
 	"github.com/pingcap/tiflow/cdc/model"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 

cmd/cdc/cli/cli_changefeed_remove.go

@@ -14,13 +14,13 @@
 package cli
 
 import (
+	"context"
 	"strings"
 
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
 	cerror "github.com/pingcap/ticdc/pkg/errors"
-	"github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 
@@ -56,7 +56,7 @@ func (o *removeChangefeedOptions) complete(f factory.Factory) error {
 
 // run the `cli changefeed remove` command.
 func (o *removeChangefeedOptions) run(cmd *cobra.Command) error {
-	ctx := context.GetDefaultContext()
+	ctx := context.Background()
 
 	changefeedDetail, err := o.apiClient.Changefeeds().Get(ctx, o.namespace, o.changefeedID)
 	if err != nil {

cmd/cdc/cli/cli_changefeed_resume.go

@@ -20,10 +20,9 @@ import (
 
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
 	cerror "github.com/pingcap/ticdc/pkg/errors"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 	"github.com/tikv/client-go/v2/oracle"
 )
@@ -195,7 +194,7 @@ func (o *resumeChangefeedOptions) validateParams(ctx context.Context) error {
 
 // run the `cli changefeed resume` command.
 func (o *resumeChangefeedOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
+	ctx := context.Background()
 
 	if err := o.validateParams(ctx); err != nil {
 		return err

cmd/cdc/cli/cli_changefeed_statistics.go

@@ -20,9 +20,8 @@ import (
 
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 	"github.com/tikv/client-go/v2/oracle"
 )
@@ -96,7 +95,7 @@ func (o *statisticsChangefeedOptions) runCliWithAPIClient(ctx context.Context, c
 
 // run the `cli changefeed statistics` command.
 func (o *statisticsChangefeedOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
+	ctx := context.Background()
 
 	tick := time.NewTicker(time.Duration(o.interval) * time.Second)
 	var lastTime time.Time

cmd/cdc/cli/cli_changefeed_update.go

@@ -14,16 +14,16 @@
 package cli
 
 import (
+	"context"
 	"encoding/json"
 	"strings"
 
 	"github.com/pingcap/log"
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
-	putil "github.com/pingcap/tiflow/pkg/util"
+	putil "github.com/pingcap/ticdc/pkg/util"
 	"github.com/r3labs/diff"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -91,7 +91,7 @@ func (o *updateChangefeedOptions) complete(f factory.Factory) error {
 
 // run the `cli changefeed update` command.
 func (o *updateChangefeedOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
+	ctx := context.Background()
 
 	old, err := o.apiV2Client.Changefeeds().Get(ctx, o.namespace, o.changefeedID)
 	if err != nil {

cmd/cdc/cli/cli_changefeed_update_test.go

@@ -22,9 +22,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
+	putil "github.com/pingcap/ticdc/pkg/util"
 	v2 "github.com/pingcap/tiflow/cdc/api/v2"
 	"github.com/pingcap/tiflow/pkg/config"
-	putil "github.com/pingcap/tiflow/pkg/util"
 	"github.com/stretchr/testify/require"
 )
 

cmd/cdc/cli/cli_tso_query.go

@@ -14,9 +14,10 @@
 package cli
 
 import (
+	"context"
+
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
-	"github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
+	"github.com/pingcap/ticdc/cmd/util"
 	"github.com/spf13/cobra"
 	"github.com/tikv/client-go/v2/oracle"
 	pd "github.com/tikv/pd/client"
@@ -45,7 +46,7 @@ func (o *queryTsoOptions) complete(f factory.Factory) error {
 
 // run runs the `cli tso query` command.
 func (o *queryTsoOptions) run(cmd *cobra.Command) error {
-	ctx := context.GetDefaultContext()
+	ctx := context.Background()
 
 	ts, logic, err := o.pdClient.GetTS(ctx)
 	if err != nil {

cmd/cdc/cli/cli_unsafe_delete_service_gc_safepoint.go

@@ -14,14 +14,14 @@
 package cli
 
 import (
+	"context"
 	"strings"
 
 	"github.com/pingcap/errors"
 	v2 "github.com/pingcap/ticdc/api/v2"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	apiv2client "github.com/pingcap/ticdc/pkg/api/v2"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 )
 
@@ -74,7 +74,7 @@ func (o *unsafeDeleteServiceGcSafepointOptions) complete(f factory.Factory) erro
 
 // run runs the `cli unsafe delete-service-gc-safepoint` command.
 func (o *unsafeDeleteServiceGcSafepointOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
+	ctx := context.Background()
 
 	err := o.apiClient.Unsafe().DeleteServiceGcSafePoint(ctx, o.getUpstreamConfig())
 	if err == nil {

cmd/cdc/cli/cli_unsafe_reset.go

@@ -14,12 +14,13 @@
 package cli
 
 import (
+	"context"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/ticdc/cmd/cdc/factory"
+	"github.com/pingcap/ticdc/cmd/util"
 	"github.com/pingcap/ticdc/pkg/etcd"
 	"github.com/pingcap/ticdc/pkg/txnutil/gc"
-	cmdcontext "github.com/pingcap/tiflow/pkg/cmd/context"
-	"github.com/pingcap/tiflow/pkg/cmd/util"
 	"github.com/spf13/cobra"
 	pd "github.com/tikv/pd/client"
 )
@@ -66,7 +67,7 @@ func (o *unsafeResetOptions) addFlags(cmd *cobra.Command) {
 
 // run runs the `cli unsafe reset` command.
 func (o *unsafeResetOptions) run(cmd *cobra.Command) error {
-	ctx := cmdcontext.GetDefaultContext()
+	ctx := context.Background()
 	defer o.pdClient.Close()
 	defer o.etcdClient.Close()