ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-02-14 13:14:47 +02:00
parent 7790b70372
commit 4a779007b5
8 changed files with 100 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mstorectl/accountcmd.go
+14 -4
View File
@@ -47,6 +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")
subCmd.AddCommand(createAccountCmd)
@@ -60,8 +61,12 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
getAccountCmd.Flags().StringVarP(&util.getAccountParams.Username, "username", "u", "", "Username")
getAccountCmd.Flags().StringVarP(&util.getAccountParams.Password, "password", "p", "", "Password")
getAccountCmd.Flags().Uint64VarP(&util.getAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
getAccountCmd.Flags().StringVarP(&util.getAccountParams.AccountID, "id", "I", "", "Account ID")
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")
subCmd.AddCommand(getAccountCmd)
@@ -75,11 +80,13 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Password, "password", "p", "", "Password")
updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.Hostname, "host", "x", "", "File path")
updateAccountCmd.Flags().Uint64VarP(&util.updateAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
updateAccountCmd.MarkFlagRequired("host")
updateAccountCmd.Flags().StringVarP(&util.updateAccountParams.AccountID, "id", "I", "", "Account ID")
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.NewPassword, "pass", "P", "", "New password")
updateAccountCmd.MarkFlagRequired("host")
updateAccountCmd.MarkFlagsOneRequired("id", "name")
subCmd.AddCommand(updateAccountCmd)
@@ -93,9 +100,12 @@ func (util *AccountUtil) CreateAccountCmds() *cobra.Command {
deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Password, "password", "p", "", "Password")
deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.Hostname, "host", "x", defaultHostname, "Hostname")
deleteAccountCmd.Flags().Uint64VarP(&util.deleteAccountParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
deleteAccountCmd.MarkFlagRequired("host")
deleteAccountCmd.Flags().StringVarP(&util.deleteAccountParams.AccountID, "id", "I", "", "Account ID")
deleteAccountCmd.Flags().StringVarP(&util.updateAccountParams.AccountID, "name", "n", "", "Account ID or username")
deleteAccountCmd.MarkFlagRequired("host")
deleteAccountCmd.MarkFlagsOneRequired("id", "name")
deleteAccountCmd.MarkFlagsRequiredTogether("username", "password")
subCmd.AddCommand(deleteAccountCmd)
cmd/mstorectl/filecmd.go
+18 -8
View File
@@ -32,11 +32,14 @@ func (util *FileUtil) CreateFileCmds() *cobra.Command {
Short: "Put file to storage",
Run: util.PutFile,
}
putFileCmd.Flags().StringVarP(&util.putFileParams.Username, "username", "u", "", "Username")
putFileCmd.Flags().StringVarP(&util.putFileParams.Password, "password", "p", "", "Password")
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)
@@ -46,11 +49,13 @@ func (util *FileUtil) CreateFileCmds() *cobra.Command {
Short: "Get file from storage",
Run: util.GetFile,
}
getFileCmd.Flags().StringVarP(&util.getFileParams.Username, "username", "u", "", "Username")
getFileCmd.Flags().StringVarP(&util.getFileParams.Password, "password", "p", "", "Password")
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)
@@ -60,10 +65,12 @@ func (util *FileUtil) CreateFileCmds() *cobra.Command {
Short: "Show file information",
Run: util.FileInfo,
}
fileInfoCmd.Flags().StringVarP(&util.fileInfoParams.Username, "username", "u", "", "Username")
fileInfoCmd.Flags().StringVarP(&util.fileInfoParams.Password, "password", "p", "", "Password")
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)
@@ -73,10 +80,12 @@ func (util *FileUtil) CreateFileCmds() *cobra.Command {
Short: "Delete file in storage",
Run: util.DeleteFile,
}
deleteFileCmd.Flags().StringVarP(&util.deleteFileParams.Username, "username", "u", "", "Username")
deleteFileCmd.Flags().StringVarP(&util.deleteFileParams.Password, "password", "p", "", "Password")
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)
@@ -101,6 +110,7 @@ func (util *FileUtil) CreateFilesCmds() *cobra.Command {
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)
cmd/mstorectl/imagecmd.go
+11 -6
View File
@@ -53,11 +53,12 @@ func (util *ImageUtil) CreateImageCmds() *cobra.Command {
Short: "Show container image info",
Run: util.ImageInfo,
}
imageInfoCmd.Flags().StringVarP(&util.imageInfoParams.Username, "username", "u", "", "Username")
imageInfoCmd.Flags().StringVarP(&util.imageInfoParams.Password, "password", "p", "", "Password")
imageInfoCmd.Flags().StringVarP(&util.imageInfoParams.Username, "user", "u", "", "Username")
imageInfoCmd.Flags().StringVarP(&util.imageInfoParams.Password, "pass", "p", "", "Password")
imageInfoCmd.Flags().StringVarP(&util.imageInfoParams.Imagepath, "image", "i", "", "Remote image path")
imageInfoCmd.Flags().Uint64VarP(&util.imageInfoParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
imageInfoCmd.MarkFlagRequired("image")
imageInfoCmd.MarkFlagsRequiredTogether("user", "pass")
subCmd.AddCommand(imageInfoCmd)
@@ -67,13 +68,15 @@ func (util *ImageUtil) CreateImageCmds() *cobra.Command {
Short: "Pull container image into local file",
Run: util.PullImage,
}
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Username, "username", "u", "", "Username")
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Password, "password", "p", "", "Password")
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Username, "user", "u", "", "Username")
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Password, "pass", "p", "", "Password")
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Imagepath, "image", "i", "", "Remote image path")
pullImageCmd.Flags().StringVarP(&util.pullImageParams.Filepath, "file", "f", "", "Local file path")
pullImageCmd.Flags().Uint64VarP(&util.pullImageParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
pullImageCmd.MarkFlagRequired("image")
pullImageCmd.MarkFlagRequired("file")
pullImageCmd.MarkFlagsRequiredTogether("user", "pass")
subCmd.AddCommand(pullImageCmd)
// PushImage
@@ -82,13 +85,15 @@ func (util *ImageUtil) CreateImageCmds() *cobra.Command {
Short: "Pull container image into local file",
Run: util.PushImage,
}
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Username, "username", "u", "", "Username")
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Password, "password", "p", "", "Password")
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Username, "user", "u", "", "Username")
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Password, "pass", "p", "", "Password")
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Imagepath, "image", "i", "", "Remote image path")
pushImageCmd.Flags().StringVarP(&util.pushImageParams.Filepath, "file", "f", "", "Local file path")
pushImageCmd.Flags().Uint64VarP(&util.pushImageParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
pushImageCmd.MarkFlagRequired("image")
pushImageCmd.MarkFlagRequired("file")
pushImageCmd.MarkFlagsRequiredTogether("user", "pass")
subCmd.AddCommand(pushImageCmd)
return subCmd