working commit

cmd/mstorectl/filecmd.go

@@ -22,40 +22,42 @@ import (
 
 func (util *FileUtil) CreateFileCmds() *cobra.Command {
 	var subCmd = &cobra.Command{
-		Use:   "file",
-		Short: "File operation",
+		Use:     "files",
+		Short:   "File operation",
+		Aliases: []string{"file"},
 	}
 	const defaultTimeout uint64 = 10
+
+	subCmd.PersistentFlags().StringVarP(&util.commonFileParams.Username, "user", "u", "", "Username")
+	subCmd.PersistentFlags().StringVarP(&util.commonFileParams.Password, "pass", "p", "", "Password")
+	subCmd.PersistentFlags().Uint64VarP(&util.commonFileParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
+	subCmd.MarkPersistentFlagRequired("host")
+	subCmd.MarkFlagsRequiredTogether("user", "pass")
+
 	// PutFile
 	var putFileCmd = &cobra.Command{
-		Use:   "put",
-		Short: "Put file to storage",
-		Run:   util.PutFile,
+		Use:     "put",
+		Aliases: []string{"push"},
+		Short:   "Put file to storage",
+		Run:     util.PutFile,
 	}
-	putFileCmd.Flags().StringVarP(&util.putFileParams.Username, "user", "u", "", "Username")
-	putFileCmd.Flags().StringVarP(&util.putFileParams.Password, "pass", "p", "", "Password")
 	putFileCmd.Flags().StringVarP(&util.putFileParams.Source, "src", "s", "", "Source path")
 	putFileCmd.Flags().StringVarP(&util.putFileParams.Dest, "dest", "d", "", "Desctination path")
-	putFileCmd.Flags().Uint64VarP(&util.putFileParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	putFileCmd.MarkFlagsRequiredTogether("src", "dest")
-	putFileCmd.MarkFlagsRequiredTogether("user", "pass")
 	putFileCmd.MarkFlagFilename("src")
 
 	subCmd.AddCommand(putFileCmd)
 
 	// GetFile
 	var getFileCmd = &cobra.Command{
-		Use:   "get",
-		Short: "Get file from storage",
-		Run:   util.GetFile,
+		Use:     "get",
+		Aliases: []string{"pull"},
+		Short:   "Get file from storage",
+		Run:     util.GetFile,
 	}
-	getFileCmd.Flags().StringVarP(&util.getFileParams.Username, "user", "u", "", "Username")
-	getFileCmd.Flags().StringVarP(&util.getFileParams.Password, "pass", "p", "", "Password")
 	getFileCmd.Flags().StringVarP(&util.getFileParams.Source, "src", "s", "", "Source path")
 	getFileCmd.Flags().StringVarP(&util.getFileParams.Dest, "dest", "d", "", "Desctination path")
-	getFileCmd.Flags().Uint64VarP(&util.getFileParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	getFileCmd.MarkFlagsRequiredTogether("src", "dest")
-	getFileCmd.MarkFlagsRequiredTogether("user", "pass")
 
 	subCmd.AddCommand(getFileCmd)
 
@@ -65,53 +67,30 @@ func (util *FileUtil) CreateFileCmds() *cobra.Command {
 		Short: "Show file information",
 		Run:   util.FileInfo,
 	}
-	fileInfoCmd.Flags().StringVarP(&util.fileInfoParams.Username, "user", "u", "", "Username")
-	fileInfoCmd.Flags().StringVarP(&util.fileInfoParams.Password, "pass", "p", "", "Password")
 	fileInfoCmd.Flags().StringVarP(&util.fileInfoParams.Filepath, "path", "d", "", "File path")
-	fileInfoCmd.Flags().Uint64VarP(&util.fileInfoParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	fileInfoCmd.MarkFlagRequired("path")
-	fileInfoCmd.MarkFlagsRequiredTogether("user", "pass")
 
 	subCmd.AddCommand(fileInfoCmd)
 
 	// DeleteFile
 	var deleteFileCmd = &cobra.Command{
-		Use:   "delete",
-		Short: "Delete file in storage",
-		Run:   util.DeleteFile,
+		Use:     "delete",
+		Aliases: []string{"remove"},
+		Short:   "Delete file in storage",
+		Run:     util.DeleteFile,
 	}
-	deleteFileCmd.Flags().StringVarP(&util.deleteFileParams.Username, "user", "u", "", "Username")
-	deleteFileCmd.Flags().StringVarP(&util.deleteFileParams.Password, "pass", "p", "", "Password")
 	deleteFileCmd.Flags().StringVarP(&util.deleteFileParams.Filepath, "path", "d", "", "File path")
-	deleteFileCmd.Flags().Uint64VarP(&util.deleteFileParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	deleteFileCmd.MarkFlagRequired("path")
-	deleteFileCmd.MarkFlagsRequiredTogether("user", "pass")
-
 	subCmd.AddCommand(deleteFileCmd)
 
-	return subCmd
-}
-
-func (util *FileUtil) CreateFilesCmds() *cobra.Command {
-	var subCmd = &cobra.Command{
-		Use:   "files",
-		Short: "Files operation",
-	}
-	const defaultTimeout uint64 = 10
-
 	// ListFiles
 	var listFilesCmd = &cobra.Command{
 		Use:   "list",
 		Short: "List file in storage",
 		Run:   util.ListFiles,
 	}
-	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Username, "user", "u", "", "Username")
-	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Password, "pass", "p", "", "Password")
 	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Filepath, "catalog", "c", "", "Catalog path")
-	listFilesCmd.Flags().Uint64VarP(&util.listFilesParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	listFilesCmd.MarkFlagRequired("catalog")
-	listFilesCmd.MarkFlagsRequiredTogether("user", "pass")
-
 	subCmd.AddCommand(listFilesCmd)
 
 	return subCmd
@@ -123,32 +102,36 @@ type FileUtil struct {
 	getFileParams    GetFileParams
 	deleteFileParams DeleteFileParams
 	listFilesParams  ListFilesParams
+	commonFileParams CommonFileParams
+}
+
+type CommonFileParams struct {
+	Username string
+	Password string
+	Timeout  uint64
 }
 
 // FileInfo
 type FileInfoParams struct {
 	Filepath string
-	Username string
-	Password string
-	Timeout  uint64
 }
 type FileInfoResult struct {
 	File *descr.File `json:"file,omitempty"`
 }
 
 func (util *FileUtil) FileInfo(cmd *cobra.Command, args []string) {
-	res, err := util.fileInfo(&util.fileInfoParams)
+	res, err := util.fileInfo(&util.commonFileParams, &util.fileInfoParams)
 	printResponse(res, err)
 }
 
-func (util *FileUtil) fileInfo(params *FileInfoParams) (*FileInfoResult, error) {
+func (util *FileUtil) fileInfo(common *CommonFileParams, params *FileInfoParams) (*FileInfoResult, error) {
 	var err error
 	res := &FileInfoResult{}
-	params.Filepath, err = packUserinfo(params.Filepath, params.Username, params.Password)
+	params.Filepath, err = packUserinfo(params.Filepath, common.Username, common.Password)
 	if err != nil {
 		return res, err
 	}
-	timeout := time.Duration(params.Timeout) * time.Second
+	timeout := time.Duration(common.Timeout) * time.Second
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	exists, opres, err := client.NewClient().FileInfo(ctx, params.Filepath)
 	if err != nil {
@@ -164,27 +147,24 @@ func (util *FileUtil) fileInfo(params *FileInfoParams) (*FileInfoResult, error)
 
 // PutFile
 type PutFileParams struct {
-	Source   string
-	Dest     string
-	Username string
-	Password string
-	Timeout  uint64
+	Source string
+	Dest   string
 }
 type PutFileResult struct{}
 
 func (util *FileUtil) PutFile(cmd *cobra.Command, args []string) {
-	res, err := util.putFile(&util.putFileParams)
+	res, err := util.putFile(&util.commonFileParams, &util.putFileParams)
 	printResponse(res, err)
 }
 
-func (util *FileUtil) putFile(params *PutFileParams) (*PutFileResult, error) {
+func (util *FileUtil) putFile(common *CommonFileParams, params *PutFileParams) (*PutFileResult, error) {
 	var err error
 	res := &PutFileResult{}
-	params.Dest, err = packUserinfo(params.Dest, params.Username, params.Password)
+	params.Dest, err = packUserinfo(params.Dest, common.Username, common.Password)
 	if err != nil {
 		return res, err
 	}
-	timeout := time.Duration(params.Timeout) * time.Second
+	timeout := time.Duration(common.Timeout) * time.Second
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	err = client.NewClient().PutFile(ctx, params.Source, params.Dest)
 	if err != nil {
@@ -195,28 +175,25 @@ func (util *FileUtil) putFile(params *PutFileParams) (*PutFileResult, error) {
 
 // Get file
 type GetFileParams struct {
-	Source   string
-	Dest     string
-	Username string
-	Password string
-	Timeout  uint64
+	Source string
+	Dest   string
 }
 
 func (util *FileUtil) GetFile(cmd *cobra.Command, args []string) {
-	res, err := util.getFile(&util.getFileParams)
+	res, err := util.getFile(&util.commonFileParams, &util.getFileParams)
 	printResponse(res, err)
 }
 
 type GetFileResult struct{}
 
-func (util *FileUtil) getFile(params *GetFileParams) (*GetFileResult, error) {
+func (util *FileUtil) getFile(common *CommonFileParams, params *GetFileParams) (*GetFileResult, error) {
 	var err error
 	res := &GetFileResult{}
-	params.Dest, err = packUserinfo(params.Source, params.Username, params.Password)
+	params.Dest, err = packUserinfo(params.Source, common.Username, common.Password)
 	if err != nil {
 		return res, err
 	}
-	timeout := time.Duration(params.Timeout) * time.Second
+	timeout := time.Duration(common.Timeout) * time.Second
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	_, err = client.NewClient().GetFile(ctx, params.Dest, params.Source)
 	if err != nil {
@@ -228,25 +205,22 @@ func (util *FileUtil) getFile(params *GetFileParams) (*GetFileResult, error) {
 // DeleteFile
 type DeleteFileParams struct {
 	Filepath string
-	Username string
-	Password string
-	Timeout  uint64
 }
 
 type DeleteFileResult struct{}
 
 func (util *FileUtil) DeleteFile(cmd *cobra.Command, args []string) {
-	res, err := util.deleteFile(&util.deleteFileParams)
+	res, err := util.deleteFile(&util.commonFileParams, &util.deleteFileParams)
 	printResponse(res, err)
 }
-func (util *FileUtil) deleteFile(params *DeleteFileParams) (*DeleteFileResult, error) {
+func (util *FileUtil) deleteFile(common *CommonFileParams, params *DeleteFileParams) (*DeleteFileResult, error) {
 	var err error
 	res := &DeleteFileResult{}
-	params.Filepath, err = packUserinfo(params.Filepath, params.Username, params.Password)
+	params.Filepath, err = packUserinfo(params.Filepath, common.Username, common.Password)
 	if err != nil {
 		return res, err
 	}
-	timeout := time.Duration(params.Timeout) * time.Second
+	timeout := time.Duration(common.Timeout) * time.Second
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	err = client.NewClient().DeleteFile(ctx, params.Filepath)
 	if err != nil {
@@ -258,9 +232,6 @@ func (util *FileUtil) deleteFile(params *DeleteFileParams) (*DeleteFileResult, e
 // ListFiles
 type ListFilesParams struct {
 	Filepath string
-	Username string
-	Password string
-	Timeout  uint64
 }
 
 type ListFilesResult struct {
@@ -268,17 +239,17 @@ type ListFilesResult struct {
 }
 
 func (util *FileUtil) ListFiles(cmd *cobra.Command, args []string) {
-	res, err := util.listFiles(&util.listFilesParams)
+	res, err := util.listFiles(&util.commonFileParams, &util.listFilesParams)
 	printResponse(res, err)
 }
-func (util *FileUtil) listFiles(params *ListFilesParams) (*ListFilesResult, error) {
+func (util *FileUtil) listFiles(common *CommonFileParams, params *ListFilesParams) (*ListFilesResult, error) {
 	var err error
 	res := &ListFilesResult{}
-	params.Filepath, err = packUserinfo(params.Filepath, params.Username, params.Password)
+	params.Filepath, err = packUserinfo(params.Filepath, common.Username, common.Password)
 	if err != nil {
 		return res, err
 	}
-	timeout := time.Duration(params.Timeout) * time.Second
+	timeout := time.Duration(common.Timeout) * time.Second
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	files, err := client.NewClient().ListFiles(ctx, params.Filepath)
 	if err != nil {