fix: cli usage info

pkg/cli/cli_handle.go

@@ -36,7 +36,7 @@ type CLIHandleCommand struct {
 	flagDebug bool
 
 	// Run Cleanup instead of Do if true.
-	Cleanup bool
+	flagCleanup bool
 
 	// testCLI is used for testing only.
 	testCLI string
@@ -50,23 +50,21 @@ func (c *CLIHandleCommand) Help() string {
 	return `
 Usage: {{ COMMAND }} [options]
 
-Run "do" commands in the CLI request YAML file at the given path:
+Handle "do" commands in the CLI request YAML file at the given path:
 
-      aod cli do -path "/path/to/file.yaml"
+      aod cli {{ COMMAND }} -path "/path/to/file.yaml"
 
+Handle "do" commands in the CLI request YAML file at the given path in debug mode:
 
-Run "do" commands in the CLI request YAML file at the given path in debug mode:
+      aod cli {{ COMMAND }} -path "/path/to/file.yaml" -debug
 
-      aod cli do -path "/path/to/file.yaml" -debug
+Handle "cleanup" commands in the CLI request YAML file at the given path:
 
-Run "cleanup" commands in the CLI request YAML file at the given path:
+      aod cli {{ COMMAND }} -path "/path/to/file.yaml" -cleanup
 
-      aod cli cleanup -path "/path/to/file.yaml"
+Handle "cleanup" commands in the CLI request YAML file at the given path in debug mode:
 
-
-Run "cleanup" commands in the CLI request YAML file at the given path in debug mode:
-
-      aod cli cleanup -path "/path/to/file.yaml" -debug
+      aod cli {{ COMMAND }} -path "/path/to/file.yaml" -cleanup -debug
 `
 }
 
@@ -84,6 +82,13 @@ 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,
@@ -133,7 +138,7 @@ func (c *CLIHandleCommand) handle(ctx context.Context) error {
 		req.CLI = c.testCLI
 	}
 	var err error
-	if c.Cleanup {
+	if c.flagCleanup {
 		err = h.Cleanup(ctx, &req)
 	} else {
 		err = h.Do(ctx, &req)

pkg/cli/cli_handle_test.go

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

pkg/cli/cli_validate.go

@@ -43,7 +43,7 @@ Usage: {{ COMMAND }} [options]
 
 Validate the IAM request YAML file at the given path:
 
-      aod cli validate -path "/path/to/file.yaml"
+      aod cli {{ COMMAND }} -path "/path/to/file.yaml"
 `
 }
 

pkg/cli/iam_handle.go

@@ -59,7 +59,7 @@ Usage: {{ COMMAND }} [options]
 
 Handle the IAM request YAML file in the given path:
 
-      aod iam handle -path "/path/to/file.yaml" -duration "2h" -start-time "2009-11-10T23:00:00Z"
+      aod iam {{ COMMAND }} -path "/path/to/file.yaml" -duration "2h" -start-time "2009-11-10T23:00:00Z"
 `
 }
 

pkg/cli/iam_validate.go

@@ -43,7 +43,7 @@ Usage: {{ COMMAND }} [options]
 
 Validate the IAM request YAML file at the given path:
 
-      aod iam validate -path "/path/to/file.yaml"
+      aod iam {{ COMMAND }} -path "/path/to/file.yaml"
 `
 }
 

pkg/cli/root.go

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