working commit

cmd/mstorectl/accountcmd.go

@@ -38,8 +38,8 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 		Short: "Create user account",
 		Run:   util.CreateAccount,
 	}
-	createAccountCmd.Flags().StringVarP(&util.createAccountParams.Username, "username", "u", "", "Username")
+	createAccountCmd.Flags().StringVarP(&util.createAccountParams.Username, "user", "u", "", "Username")
-	createAccountCmd.Flags().StringVarP(&util.createAccountParams.Password, "password", "p", "", "Password")
+	createAccountCmd.Flags().StringVarP(&util.createAccountParams.Password, "pass", "p", "", "Password")
 	createAccountCmd.Flags().StringVarP(&util.createAccountParams.Hostname, "host", "x", defaultHostname, "Hostname")
 	createAccountCmd.Flags().Uint64VarP(&util.createAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 
@@ -47,7 +47,7 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 	createAccountCmd.Flags().StringVarP(&util.createAccountParams.NewPassword, "newpass", "P", "", "New account password")
 	createAccountCmd.MarkFlagRequired("host")
 	createAccountCmd.MarkFlagsRequiredTogether("newuser", "newpass")
-	createAccountCmd.MarkFlagsRequiredTogether("username", "password")
+	createAccountCmd.MarkFlagsRequiredTogether("user", "pass")
 
 	subCmd.AddCommand(createAccountCmd)
 
@@ -58,15 +58,15 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 		Run:   util.GetAccount,
 	}
 	getAccountCmd.Flags().StringVarP(&util.getAccountParams.Hostname, "host", "x", defaultHostname, "Hostname")
-	getAccountCmd.Flags().StringVarP(&util.getAccountParams.Username, "username", "u", "", "Username")
+	getAccountCmd.Flags().StringVarP(&util.getAccountParams.Username, "user", "u", "", "Username")
-	getAccountCmd.Flags().StringVarP(&util.getAccountParams.Password, "password", "p", "", "Password")
+	getAccountCmd.Flags().StringVarP(&util.getAccountParams.Password, "pass", "p", "", "Password")
 	getAccountCmd.Flags().Uint64VarP(&util.getAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	getAccountCmd.Flags().StringVarP(&util.getAccountParams.AccountID, "id", "I", "", "Account ID or name")
 	getAccountCmd.Flags().StringVarP(&util.getAccountParams.AccountID, "name", "n", "", "Account ID or name")
 
 	getAccountCmd.MarkFlagRequired("host")
 	getAccountCmd.MarkFlagsOneRequired("id", "name")
-	getAccountCmd.MarkFlagsRequiredTogether("username", "password")
+	getAccountCmd.MarkFlagsRequiredTogether("user", "pass")
 
 	subCmd.AddCommand(getAccountCmd)
 
@@ -76,17 +76,18 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 		Short: "Update account parameters",
 		Run:   util.UpdateAccount,
 	}
-	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Username, "username", "u", "", "Username")
+	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Username, "user", "u", "", "Username")
-	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Password, "password", "p", "", "Password")
+	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Password, "pass", "p", "", "Password")
 	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Hostname, "host", "x", "", "File path")
 	updateAccountCmd.Flags().Uint64VarP(&util.updateAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 
 	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.AccountID, "id", "I", "", "Account ID or username")
 	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.AccountID, "name", "n", "", "Account ID or username")
-	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.NewUsername, "newuser", "U", "", "New username")
+	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.NewUsername, "newname", "N", "", "New username")
-	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.NewPassword, "pass", "P", "", "New password")
+	updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.NewPassword, "newpass", "P", "", "New password")
 	updateAccountCmd.MarkFlagRequired("host")
 	updateAccountCmd.MarkFlagsOneRequired("id", "name")
+	updateAccountCmd.MarkFlagsOneRequired("newname", "newpass")
 
 	subCmd.AddCommand(updateAccountCmd)
 
@@ -96,8 +97,8 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 		Short: "Delete account",
 		Run:   util.DeleteAccount,
 	}
-	deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Username, "username", "u", "", "Username")
+	deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Username, "user", "u", "", "Username")
-	deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Password, "password", "p", "", "Password")
+	deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Password, "pass", "p", "", "Password")
 	deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Hostname, "host", "x", defaultHostname, "Hostname")
 	deleteAccountCmd.Flags().Uint64VarP(&util.deleteAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 
@@ -105,7 +106,7 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
 	deleteAccountCmd.Flags().StringVarP(&util.updateAccountParams.AccountID, "name", "n", "", "Account ID or username")
 	deleteAccountCmd.MarkFlagRequired("host")
 	deleteAccountCmd.MarkFlagsOneRequired("id", "name")
-	deleteAccountCmd.MarkFlagsRequiredTogether("username", "password")
+	deleteAccountCmd.MarkFlagsRequiredTogether("user", "pass")
 
 	subCmd.AddCommand(deleteAccountCmd)
 
@@ -124,8 +125,8 @@ func (util *AccountUtil) CreateAccountsCmds() *cobra.Command {
 		Short: "list accounts",
 		Run:   util.ListAccounts,
 	}
-	listAccountsCmd.Flags().StringVarP(&util.listAccountsParams.Username, "username", "u", "", "Username")
+	listAccountsCmd.Flags().StringVarP(&util.listAccountsParams.Username, "user", "u", "", "Username")
-	listAccountsCmd.Flags().StringVarP(&util.listAccountsParams.Password, "password", "p", "", "Password")
+	listAccountsCmd.Flags().StringVarP(&util.listAccountsParams.Password, "pass", "p", "", "Password")
 	listAccountsCmd.Flags().StringVarP(&util.listAccountsParams.Hostname, "host", "x", defaultHostname, "Hostname")
 	listAccountsCmd.Flags().Uint64VarP(&util.listAccountsParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
 	listAccountsCmd.Flags().BoolVarP(&util.listAccountsParams.Detail, "detail", "d", false, "Show detail information")

cmd/mstorectl/filecmd.go

@@ -105,8 +105,8 @@ func (util *FileUtil) CreateFilesCmds() *cobra.Command {
 		Short: "List file in storage",
 		Run:   util.ListFiles,
 	}
-	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Username, "username", "u", "", "Username")
+	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Username, "user", "u", "", "Username")
-	listFilesCmd.Flags().StringVarP(&util.listFilesParams.Password, "password", "p", "", "Password")
+	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")