chore(volume): change client use subcommand

Author: duanhongyi

internal/completion/completion.go

@@ -847,24 +847,3 @@ func (c *VolumesUnmountCompletion) CompletionFunc(cmd *cobra.Command, args []str
 	}
 	return ptsArgCompletion.CompletionFunc(cmd, args, toComplete)
 }
-
-type VolumesCmdCompletion struct {
-	ArgsLen    int
-	ConfigFile *string
-}
-
-func (c *VolumesCmdCompletion) CompletionFunc(_ *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	cmds := []string{"ls", "cp", "rm"}
-	if c.ArgsLen < 0 || len(args) == c.ArgsLen {
-
-		var results []string
-		for _, cmd := range cmds {
-			if strings.HasPrefix(cmd, toComplete) {
-				results = append(results, cmd)
-			}
-		}
-		return results, cobra.ShellCompDirectiveNoFileComp
-
-	}
-	return nil, cobra.ShellCompDirectiveNoFileComp
-}

internal/parser/limits.go

@@ -62,7 +62,7 @@ func limitSetCommand(cmdr *commands.DryccCmd) *cobra.Command {
 		Example: template.CustomExample(
 			"drycc limits set web=std1.large.c1m2",
 			map[string]string{
-				"<ptype>": i18n.T("The process type as defined in your Procfile, such as 'web' or 'worker'."),
+				"<ptype>": i18n.T("The process type as defined in your Procfile, such as 'web' or 'worker'"),
 				"<value>": i18n.T("The limit plan id to apply to the process type"),
 			},
 		),

internal/parser/volumes.go

@@ -196,29 +196,55 @@ func volumesRemoveCommand(cmdr *commands.DryccCmd) *cobra.Command {
 }
 
 func volumesClientCommand(cmdr *commands.DryccCmd) *cobra.Command {
-	volumesCmdCompletion := completion.VolumesCmdCompletion{ArgsLen: 0, ConfigFile: &cmdr.ConfigFile}
 	cmd := &cobra.Command{
-		Use: "client <cmd> <args>...",
+		Use:   "client",
+		Short: i18n.T("The client used to manage volume files"),
+	}
+	cmd.AddCommand(&cobra.Command{
+		Use: "ls <target>",
 		Example: template.CustomExample(
-			"drycc volumes client ls vol://myvolume/",
+			"drycc volumes client ls vol://myvolume/tmp",
 			map[string]string{
-				"<cmd>": i18n.T(`ls         list volume files
-           cp         copy volume files
-           rm         remove volume files`),
-				"<args>": i18n.T(`arguments for running commands, when cmd is 'cp', args should be '[source] [dest]'.
-           volume path format 'vol://volumename/', '/' is equivalent to the mount path.`),
+				"<target>": i18n.T("The target path of volume"),
 			},
 		),
+		Short: i18n.T("List volume objects"),
+		Args:  cobra.ExactArgs(1),
+		RunE: func(_ *cobra.Command, args []string) error {
+			return cmdr.VolumesClient(app, "ls", args...)
+		},
+	})
 
-		Short:             i18n.T("The client used to manage volume files"),
-		Args:              cobra.MinimumNArgs(2),
-		ValidArgsFunction: volumesCmdCompletion.CompletionFunc,
+	cmd.AddCommand(&cobra.Command{
+		Use: "cp <source> <target>",
+		Example: template.CustomExample(
+			"drycc volumes client cp vol://myvolume/tmp /tmp",
+			map[string]string{
+				"<source>": i18n.T("The volume or local source path"),
+				"<target>": i18n.T("The volume or local target path"),
+			},
+		),
+		Short: i18n.T("Copy volume objects"),
+		Args:  cobra.ExactArgs(2),
 		RunE: func(_ *cobra.Command, args []string) error {
-			cmdType := args[0]
-			cmdArgs := args[1:]
-			return cmdr.VolumesClient(app, cmdType, cmdArgs...)
+			return cmdr.VolumesClient(app, "cp", args...)
 		},
-	}
+	})
+
+	cmd.AddCommand(&cobra.Command{
+		Use: "rm <target>",
+		Example: template.CustomExample(
+			"drycc volumes client rm vol://myvolume/tmp",
+			map[string]string{
+				"<target>": i18n.T("The target path of volume"),
+			},
+		),
+		Short: i18n.T("Remove volume objects"),
+		Args:  cobra.ExactArgs(1),
+		RunE: func(_ *cobra.Command, args []string) error {
+			return cmdr.VolumesClient(app, "rm", args...)
+		},
+	})
 
 	return cmd
 }