switch back, follow up later

abcxyz · Jun 28, 2023 · a86b369 · a86b369
1 parent 7016de7
commit a86b369
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/pkg/cli/cli_handle.go b/pkg/cli/cli_handle.go
@@ -36,7 +36,7 @@ type CLIHandleCommand struct {
 	flagDebug bool
 
 	// Run Cleanup instead of Do if true.
-	flagCleanup bool
+	Cleanup bool
 
 	// testCLI is used for testing only.
 	testCLI string
@@ -50,21 +50,13 @@ func (c *CLIHandleCommand) Help() string {
 	return `
 Usage: {{ COMMAND }} [options]
 
-Handle "do" commands in the CLI request YAML file at the given path:
+Handle CLI request YAML file at the given path:
 
       {{ COMMAND }} -path "/path/to/file.yaml"
 
-Handle "do" commands in the CLI request YAML file at the given path in debug mode:
+Handle CLI request YAML file at the given path in debug mode:
 
       {{ COMMAND }} -path "/path/to/file.yaml" -debug
-
-Handle "cleanup" commands in the CLI request YAML file at the given path:
-
-      {{ COMMAND }} -path "/path/to/file.yaml" -cleanup
-
-Handle "cleanup" commands in the CLI request YAML file at the given path in debug mode:
-
-      {{ COMMAND }} -path "/path/to/file.yaml" -cleanup -debug
 `
 }
 
@@ -82,13 +74,6 @@ func (c *CLIHandleCommand) Flags() *cli.FlagSet {
 		Usage:   `The path of CLI request file, in YAML format.`,
 	})
 
-	f.BoolVar(&cli.BoolVar{
-		Name:    "cleanup",
-		Target:  &c.flagCleanup,
-		Default: false,
-		Usage:   `Handle CLI request cleanup.`,
-	})
-
 	f.BoolVar(&cli.BoolVar{
 		Name:    "debug",
 		Target:  &c.flagDebug,
@@ -138,7 +123,7 @@ func (c *CLIHandleCommand) handle(ctx context.Context) error {
 		req.CLI = c.testCLI
 	}
 	var err error
-	if c.flagCleanup {
+	if c.Cleanup {
 		err = h.Cleanup(ctx, &req)
 	} else {
 		err = h.Do(ctx, &req)

diff --git a/pkg/cli/cli_handle_test.go b/pkg/cli/cli_handle_test.go
@@ -61,6 +61,7 @@ cleanup:
 		name      string
 		args      []string
 		testCLI   string
+		cleanup   bool
 		expOut    string
 		expErr    string
 		expStdErr string
@@ -82,14 +83,16 @@ Successfully completed commands`,
 		},
 		{
 			name:    "success_cleanup",
-			args:    []string{"-path", filepath.Join(dir, "valid.yaml"), "-cleanup"},
+			args:    []string{"-path", filepath.Join(dir, "valid.yaml")},
 			testCLI: "echo",
+			cleanup: true,
 			expOut:  `Successfully completed commands`,
 		},
 		{
 			name:    "success_cleanup_with_debug",
-			args:    []string{"-path", filepath.Join(dir, "valid.yaml"), "-debug", "-cleanup"},
+			args:    []string{"-path", filepath.Join(dir, "valid.yaml"), "-debug"},
 			testCLI: "echo",
+			cleanup: true,
 			expOut: `
 cleanup1
 cleanup2
@@ -119,8 +122,9 @@ Successfully completed commands`,
 		},
 		{
 			name:      "handler_cleanup_failure",
-			args:      []string{"-path", filepath.Join(dir, "valid.yaml"), "-cleanup"},
+			args:      []string{"-path", filepath.Join(dir, "valid.yaml")},
 			testCLI:   "ls",
+			cleanup:   true,
 			expErr:    `failed to run command "cleanup1"`,
 			expStdErr: "ls: cannot access 'cleanup1': No such file or directory",
 		},
@@ -140,6 +144,7 @@ Successfully completed commands`,
 			ctx := logging.WithLogger(context.Background(), logging.TestLogger(t))
 
 			cmd := CLIHandleCommand{
+				Cleanup: tc.cleanup,
 				testCLI: tc.testCLI,
 			}
 			_, stdout, stderr := cmd.Pipe()

diff --git a/pkg/cli/root.go b/pkg/cli/root.go
@@ -47,9 +47,12 @@ var rootCmd = func() cli.Command {
 					Name:        "cli",
 					Description: "Perform operations related to the CLI request",
 					Commands: map[string]cli.CommandFactory{
-						"handle": func() cli.Command {
+						"do": func() cli.Command {
 							return &CLIHandleCommand{}
 						},
+						"cleanup": func() cli.Command {
+							return &CLIHandleCommand{Cleanup: true}
+						},
 						"validate": func() cli.Command {
 							return &CLIValidateCommand{}
 						},