Feature/split cluster into small files (#979)

* style(cluster): move ca-cert into manager_util.go

* style(cluster): rm once used struct

* style(cluster): manager_util.go -> cacert.go

* style(cluster): move task releated into builder.go

* refact(cluster): add function regenConfigTasks to dry

* feat(clustertask/action): simply code

* typo(cluster,repository): fix with make check

* refact(cluster): add sshTaskBuilder to reduce code

* refact(cluster): manager as module

* refact(dm,cluster): compatible with module cluster

* refact(cluster/manger): split into small files

* style(cluster/manager): unified clusterName to name

* typo(cluster/manager): naming

* refact(cluster,dm): use gOpt directly

components/cluster/command/clean.go

@@ -50,7 +50,7 @@ You can retain some nodes and roles data when cleanup the cluster, eg:
 				return cmd.Help()
 			}
 
-			return manager.CleanCluster(clusterName, gOpt, cleanOpt, skipConfirm)
+			return cm.CleanCluster(clusterName, gOpt, cleanOpt, skipConfirm)
 		},
 	}
 

components/cluster/command/deploy.go

@@ -19,8 +19,8 @@ import (
 	"path"
 
 	"github.com/pingcap/tiup/pkg/cliutil"
-	"github.com/pingcap/tiup/pkg/cluster"
 	"github.com/pingcap/tiup/pkg/cluster/executor"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	operator "github.com/pingcap/tiup/pkg/cluster/operation"
 	"github.com/pingcap/tiup/pkg/cluster/report"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
@@ -45,7 +45,7 @@ var (
 )
 
 func newDeploy() *cobra.Command {
-	opt := cluster.DeployOptions{
+	opt := manager.DeployOptions{
 		IdentityFile: path.Join(utils.UserHome(), ".ssh", "id_rsa"),
 	}
 	cmd := &cobra.Command{
@@ -77,17 +77,7 @@ func newDeploy() *cobra.Command {
 				teleTopology = string(data)
 			}
 
-			return manager.Deploy(
-				clusterName,
-				version,
-				topoFile,
-				opt,
-				postDeployHook,
-				skipConfirm,
-				gOpt.OptTimeout,
-				gOpt.SSHTimeout,
-				gOpt.SSHType,
-			)
+			return cm.Deploy(clusterName, version, topoFile, opt, postDeployHook, skipConfirm, gOpt)
 		},
 	}
 

components/cluster/command/destroy.go

@@ -50,7 +50,7 @@ You can retain some nodes and roles data when destroy cluster, eg:
 				}
 			}
 
-			return manager.DestroyCluster(clusterName, gOpt, destoyOpt, skipConfirm)
+			return cm.DestroyCluster(clusterName, gOpt, destoyOpt, skipConfirm)
 		},
 	}
 

components/cluster/command/disable.go

@@ -33,7 +33,7 @@ func newDisableCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.EnableCluster(clusterName, gOpt, false)
+			return cm.EnableCluster(clusterName, gOpt, false)
 		},
 	}
 

components/cluster/command/display.go

@@ -67,7 +67,7 @@ func newDisplayCmd() *cobra.Command {
 				return displayDashboardInfo(clusterName, tlsCfg)
 			}
 
-			return manager.Display(clusterName, gOpt)
+			return cm.Display(clusterName, gOpt)
 		},
 	}
 

components/cluster/command/edit_config.go

@@ -29,7 +29,7 @@ func newEditConfigCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.EditConfig(clusterName, skipConfirm)
+			return cm.EditConfig(clusterName, skipConfirm)
 		},
 	}
 

components/cluster/command/enable.go

@@ -33,7 +33,7 @@ func newEnableCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.EnableCluster(clusterName, gOpt, true)
+			return cm.EnableCluster(clusterName, gOpt, true)
 		},
 	}
 

components/cluster/command/exec.go

@@ -14,12 +14,12 @@
 package command
 
 import (
-	"github.com/pingcap/tiup/pkg/cluster"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	"github.com/spf13/cobra"
 )
 
 func newExecCmd() *cobra.Command {
-	opt := cluster.ExecOptions{}
+	opt := manager.ExecOptions{}
 	cmd := &cobra.Command{
 		Use:   "exec <cluster-name>",
 		Short: "Run shell command on host in the tidb cluster",
@@ -31,7 +31,7 @@ func newExecCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.Exec(clusterName, opt, gOpt)
+			return cm.Exec(clusterName, opt, gOpt)
 		},
 	}
 

components/cluster/command/list.go

@@ -22,7 +22,7 @@ func newListCmd() *cobra.Command {
 		Use:   "list",
 		Short: "List all clusters",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return manager.ListCluster()
+			return cm.ListCluster()
 		},
 	}
 	return cmd

components/cluster/command/patch.go

@@ -40,7 +40,7 @@ func newPatchCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.Patch(clusterName, args[1], gOpt, overwrite)
+			return cm.Patch(clusterName, args[1], gOpt, overwrite)
 		},
 	}
 

components/cluster/command/prune.go

@@ -28,7 +28,7 @@ func newPruneCmd() *cobra.Command {
 
 			clusterName := args[0]
 
-			return manager.DestroyTombstone(clusterName, gOpt, skipConfirm)
+			return cm.DestroyTombstone(clusterName, gOpt, skipConfirm)
 		},
 	}
 

components/cluster/command/reload.go

@@ -36,7 +36,7 @@ func newReloadCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.Reload(clusterName, gOpt, skipRestart)
+			return cm.Reload(clusterName, gOpt, skipRestart)
 		},
 	}
 

components/cluster/command/rename.go

@@ -34,7 +34,7 @@ func newRenameCmd() *cobra.Command {
 			newClusterName := args[1]
 			teleCommand = append(teleCommand, scrubClusterName(oldClusterName))
 
-			return manager.Rename(oldClusterName, gOpt, newClusterName)
+			return cm.Rename(oldClusterName, gOpt, newClusterName)
 		},
 	}
 

components/cluster/command/restart.go

@@ -33,7 +33,7 @@ func newRestartCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.RestartCluster(clusterName, gOpt)
+			return cm.RestartCluster(clusterName, gOpt)
 		},
 	}
 

components/cluster/command/root.go

@@ -25,9 +25,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/joomcode/errorx"
 	"github.com/pingcap/tiup/pkg/cliutil"
-	"github.com/pingcap/tiup/pkg/cluster"
 	"github.com/pingcap/tiup/pkg/cluster/executor"
 	"github.com/pingcap/tiup/pkg/cluster/flags"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	operator "github.com/pingcap/tiup/pkg/cluster/operation"
 	"github.com/pingcap/tiup/pkg/cluster/report"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
@@ -52,7 +52,7 @@ var (
 )
 
 var tidbSpec *spec.SpecManager
-var manager *cluster.Manager
+var cm *manager.Manager
 
 func scrubClusterName(n string) string {
 	return "cluster_" + telemetry.HashReport(n)
@@ -100,7 +100,7 @@ func init() {
 			}
 
 			tidbSpec = spec.GetSpecManager()
-			manager = cluster.NewManager("tidb", tidbSpec, spec.TiDBComponentVersion)
+			cm = manager.NewManager("tidb", tidbSpec, spec.TiDBComponentVersion)
 			logger.EnableAuditLog(spec.AuditDir())
 
 			// Running in other OS/ARCH Should be fine we only download manifest file.

components/cluster/command/scale_in.go

@@ -47,16 +47,7 @@ func newScaleInCmd() *cobra.Command {
 					UpdateTopology(clusterName, tidbSpec.Path(clusterName), metadata, nodes)
 			}
 
-			return manager.ScaleIn(
-				clusterName,
-				skipConfirm,
-				gOpt.OptTimeout,
-				gOpt.SSHTimeout,
-				gOpt.SSHType,
-				gOpt.Force,
-				gOpt.Nodes,
-				scale,
-			)
+			return cm.ScaleIn(clusterName, skipConfirm, gOpt, scale)
 		},
 	}
 

components/cluster/command/scale_out.go

@@ -17,16 +17,16 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/pingcap/tiup/pkg/cluster"
 	"github.com/pingcap/tiup/pkg/cluster/executor"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	"github.com/pingcap/tiup/pkg/cluster/spec"
 	"github.com/pingcap/tiup/pkg/cluster/task"
 	"github.com/pingcap/tiup/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
 func newScaleOutCmd() *cobra.Command {
-	opt := cluster.ScaleOutOptions{
+	opt := manager.ScaleOutOptions{
 		IdentityFile: filepath.Join(utils.UserHome(), ".ssh", "id_rsa"),
 	}
 	cmd := &cobra.Command{
@@ -51,16 +51,14 @@ func newScaleOutCmd() *cobra.Command {
 				teleTopology = string(data)
 			}
 
-			return manager.ScaleOut(
+			return cm.ScaleOut(
 				clusterName,
 				topoFile,
 				postScaleOutHook,
 				final,
 				opt,
 				skipConfirm,
-				gOpt.OptTimeout,
-				gOpt.SSHTimeout,
-				gOpt.SSHType,
+				gOpt,
 			)
 		},
 	}

components/cluster/command/start.go

@@ -35,7 +35,7 @@ func newStartCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.StartCluster(clusterName, gOpt, func(b *task.Builder, metadata spec.Metadata) {
+			return cm.StartCluster(clusterName, gOpt, func(b *task.Builder, metadata spec.Metadata) {
 				b.UpdateTopology(
 					clusterName,
 					tidbSpec.Path(clusterName),

components/cluster/command/stop.go

@@ -33,7 +33,7 @@ func newStopCmd() *cobra.Command {
 			clusterName := args[0]
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
-			return manager.StopCluster(clusterName, gOpt)
+			return cm.StopCluster(clusterName, gOpt)
 		},
 	}
 

components/cluster/command/upgrade.go

@@ -31,7 +31,7 @@ func newUpgradeCmd() *cobra.Command {
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 			teleCommand = append(teleCommand, version)
 
-			return manager.Upgrade(clusterName, version, gOpt, skipConfirm)
+			return cm.Upgrade(clusterName, version, gOpt, skipConfirm)
 		},
 	}
 	cmd.Flags().BoolVar(&gOpt.Force, "force", false, "Force upgrade without transferring PD leader")

components/dm/command/deploy.go

@@ -18,15 +18,15 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tiup/pkg/cliutil"
-	"github.com/pingcap/tiup/pkg/cluster"
 	"github.com/pingcap/tiup/pkg/cluster/executor"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	"github.com/pingcap/tiup/pkg/utils"
 	"github.com/spf13/cobra"
 	"golang.org/x/mod/semver"
 )
 
 func newDeployCmd() *cobra.Command {
-	opt := cluster.DeployOptions{
+	opt := manager.DeployOptions{
 		IdentityFile: path.Join(utils.UserHome(), ".ssh", "id_rsa"),
 	}
 	cmd := &cobra.Command{
@@ -56,17 +56,7 @@ func newDeployCmd() *cobra.Command {
 				return err
 			}
 
-			return manager.Deploy(
-				clusterName,
-				version,
-				topoFile,
-				opt,
-				nil,
-				skipConfirm,
-				gOpt.OptTimeout,
-				gOpt.SSHTimeout,
-				gOpt.SSHType,
-			)
+			return cm.Deploy(clusterName, version, topoFile, opt, nil, skipConfirm, gOpt)
 		},
 	}
 

components/dm/command/destroy.go

@@ -30,7 +30,7 @@ func newDestroyCmd() *cobra.Command {
 
 			clusterName := args[0]
 
-			return manager.DestroyCluster(clusterName, gOpt, operator.Options{}, skipConfirm)
+			return cm.DestroyCluster(clusterName, gOpt, operator.Options{}, skipConfirm)
 		},
 	}
 

components/dm/command/display.go

@@ -31,7 +31,7 @@ func newDisplayCmd() *cobra.Command {
 
 			clusterName = args[0]
 
-			return manager.Display(clusterName, gOpt)
+			return cm.Display(clusterName, gOpt)
 		},
 	}
 

components/dm/command/edit_config.go

@@ -28,7 +28,7 @@ func newEditConfigCmd() *cobra.Command {
 
 			clusterName := args[0]
 
-			return manager.EditConfig(clusterName, skipConfirm)
+			return cm.EditConfig(clusterName, skipConfirm)
 		},
 	}
 

components/dm/command/exec.go

@@ -14,12 +14,12 @@
 package command
 
 import (
-	"github.com/pingcap/tiup/pkg/cluster"
+	"github.com/pingcap/tiup/pkg/cluster/manager"
 	"github.com/spf13/cobra"
 )
 
 func newExecCmd() *cobra.Command {
-	opt := cluster.ExecOptions{}
+	opt := manager.ExecOptions{}
 	cmd := &cobra.Command{
 		Use:   "exec <cluster-name>",
 		Short: "Run shell command on host in the dm cluster",
@@ -30,7 +30,7 @@ func newExecCmd() *cobra.Command {
 
 			clusterName := args[0]
 
-			return manager.Exec(clusterName, opt, gOpt)
+			return cm.Exec(clusterName, opt, gOpt)
 		},
 	}