feat: reset, not uninstall (#408)

reset, not uninstall

Author: laverya

cmd/embedded-cluster/install.go

@@ -333,7 +333,7 @@ var installCommand = &cli.Command{
 			logrus.Errorf("An installation has been detected on this machine.")
 			logrus.Infof("If you want to reinstall you need to remove the existing installation")
 			logrus.Infof("first. You can do this by running the following command:")
-			logrus.Infof("\n  sudo ./%s uninstall\n", binName)
+			logrus.Infof("\n  sudo ./%s reset\n", binName)
 			return ErrNothingElseToAdd
 		}
 		metrics.ReportApplyStarted(c)

cmd/embedded-cluster/join.go

@@ -111,7 +111,7 @@ var joinCommand = &cli.Command{
 			logrus.Errorf("An installation has been detected on this machine.")
 			logrus.Infof("If you want to reinstall you need to remove the existing installation")
 			logrus.Infof("first. You can do this by running the following command:")
-			logrus.Infof("\n  sudo ./%s uninstall\n", binName)
+			logrus.Infof("\n  sudo ./%s reset\n", binName)
 			return ErrNothingElseToAdd
 		}
 

cmd/embedded-cluster/main.go

@@ -32,7 +32,7 @@ func main() {
 			nodeCommands,
 			versionCommand,
 			joinCommand,
-			uninstallCommand,
+			resetCommand,
 		},
 	}
 	if err := app.RunContext(ctx, os.Args); err != nil {

cmd/embedded-cluster/node.go

@@ -10,6 +10,6 @@ var nodeCommands = &cli.Command{
 	Hidden: true, // this has been replaced by top-level commands
 	Subcommands: []*cli.Command{
 		joinCommand,
-		uninstallCommand,
+		resetCommand,
 	},
 }

cmd/embedded-cluster/uninstall.go

@@ -194,7 +194,7 @@ func (h *hostInfo) checkResetSafety(c *cli.Context) (bool, string, error) {
 		}
 	}
 	if len(workers) > 0 && len(controllers) == 1 {
-		message := fmt.Sprintf("Cannot uninstall the last %s node when there are other nodes in the cluster.", h.RoleName)
+		message := fmt.Sprintf("Cannot reset the last %s node when there are other nodes in the cluster.", h.RoleName)
 		return false, message, nil
 	}
 	return true, "", nil
@@ -284,19 +284,19 @@ func checkErrPrompt(c *cli.Context, err error) bool {
 	if c.Bool("force") {
 		return true
 	}
-	logrus.Info("An error occurred while trying to uninstall this node.")
+	logrus.Info("An error occurred while trying to reset this node.")
 	if c.Bool("no-prompt") {
 		return false
 	}
 	logrus.Info("Continuing may leave the cluster in an unexpected state.")
 	return prompts.New().Confirm("Do you want to continue anyway?", false)
 }
 
-var uninstallCommand = &cli.Command{
-	Name: "uninstall",
+var resetCommand = &cli.Command{
+	Name: "reset",
 	Before: func(c *cli.Context) error {
 		if os.Getuid() != 0 {
-			return fmt.Errorf("uninstall command must be run as root")
+			return fmt.Errorf("reset command must be run as root")
 		}
 		return nil
 	},
@@ -309,14 +309,14 @@ var uninstallCommand = &cli.Command{
 		},
 		&cli.BoolFlag{
 			Name:  "force",
-			Usage: "Ignore errors encountered when uninstalling the node (implies --no-prompt)",
+			Usage: "Ignore errors encountered when resetting the node (implies --no-prompt)",
 			Value: false,
 		},
 	},
 	Usage: fmt.Sprintf("Uninstall %s from the current node", binName),
 	Action: func(c *cli.Context) error {
 		logrus.Info("This will remove this node from the cluster and completely reset it.")
-		logrus.Info("Do not uninstall another node until this is complete.")
+		logrus.Info("Do not reset another node until this is complete.")
 		if !c.Bool("force") && !c.Bool("no-prompt") && !prompts.New().Confirm("Do you want to continue?", false) {
 			return fmt.Errorf("Aborting")
 		}

e2e/reset_test.go

@@ -104,7 +104,7 @@ func TestMultiNodeReset(t *testing.T) {
 	bin := strings.Split(command, " ")[0]
 	// reset worker node
 	t.Logf("%s: resetting worker node", time.Now().Format(time.RFC3339))
-	stdout, stderr, err = RunCommandOnNode(t, tc, 3, []string{bin, "uninstall", "--no-prompt"})
+	stdout, stderr, err = RunCommandOnNode(t, tc, 3, []string{bin, "reset", "--no-prompt"})
 	if err != nil {
 		t.Logf("stdout: %s\nstderr: %s", stdout, stderr)
 		t.Fatalf("fail to reset worker node")
@@ -114,7 +114,7 @@ func TestMultiNodeReset(t *testing.T) {
 	// reset a controller node
 	// this should fail with a prompt to override
 	t.Logf("%s: resetting controller node", time.Now().Format(time.RFC3339))
-	stdout, stderr, err = RunCommandOnNode(t, tc, 2, []string{bin, "uninstall", "--no-prompt"})
+	stdout, stderr, err = RunCommandOnNode(t, tc, 2, []string{bin, "reset", "--no-prompt"})
 	if err != nil {
 		t.Logf("stdout: %s\nstderr: %s", stdout, stderr)
 		t.Fatalf("fail to remove controller node %s:", err)

e2e/scripts/reset-installation.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 main() {
-    if ! embedded-cluster uninstall --no-prompt | tee /tmp/log ; then
+    if ! embedded-cluster reset --no-prompt | tee /tmp/log ; then
         echo "Failed to uninstall embedded-cluster"
         exit 1
     fi

e2e/sudo_test.go

@@ -26,7 +26,8 @@ func TestCommandsRequireSudo(t *testing.T) {
 	for _, cmd := range [][]string{
 		{"embedded-cluster", "node", "join", "https://test", "token"},
 		{"embedded-cluster", "join", "https://test", "token"},
-		{"embedded-cluster", "uninstall", "--force"},
+		{"embedded-cluster", "reset", "--force"},
+		{"embedded-cluster", "node", "reset", "--force"},
 		{"embedded-cluster", "shell"},
 		{"embedded-cluster", "install", "--no-prompt"},
 	} {