Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/account multi refactor #240

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Dev/account multi refactor #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b7220c
feat: Batch block accounts.
huerni Nov 25, 2024
ab85364
feat: Batch block user in account
huerni Nov 25, 2024
ca6bbc6
feat: Batch add user/account partition
huerni Nov 25, 2024
06e1a34
feat: Batch add user/account qos
huerni Nov 25, 2024
35bd7a6
feat: Batch delete user/account partition/qos
huerni Nov 25, 2024
a361acf
feat: Add input validation
huerni Dec 3, 2024
c42c5d6
feat: Refactor to split the list on the frontend.
huerni Dec 4, 2024
d3e4ec9
feat: batch delete qos, query qos
huerni Dec 4, 2024
001b916
refactor
huerni Dec 6, 2024
843a222
refactor
huerni Dec 9, 2024
a58b619
fix
huerni Jan 22, 2025
1b6e989
feat: Multiple errcodes returned.
huerni Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions internal/cacctmgr/CmdArgParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,21 +396,33 @@ var (
Use: "account [flags] name",
Short: "Block an account",
Long: "",
Args: cobra.ExactArgs(1),
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := BlockAccountOrUser(args[0], protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
if len(args) == 0 {
if err := BlockAccountOrUser("", protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
}
} else {
if err := BlockAccountOrUser(args[0], protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
}
}
},
}
blockUserCmd = &cobra.Command{
Use: "user [flags] name",
Short: "Block a user under an account",
Long: "",
Args: cobra.ExactArgs(1),
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := BlockAccountOrUser(args[0], protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
if len(args) == 0 {
if err := BlockAccountOrUser("", protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
}
} else {
if err := BlockAccountOrUser(args[0], protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
}
}
},
}
Expand All @@ -425,21 +437,33 @@ var (
Use: "account [flags] name",
Short: "Unblock an account",
Long: "",
Args: cobra.ExactArgs(1),
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := UnblockAccountOrUser(args[0], protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
if len(args) == 0 {
if err := UnblockAccountOrUser("", protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
}
} else {
if err := UnblockAccountOrUser(args[0], protos.EntityType_Account, ""); err != util.ErrorSuccess {
os.Exit(err)
}
}
},
}
unblockUserCmd = &cobra.Command{
Use: "user [flags] name",
Short: "Unblock a user under an account",
Long: "",
Args: cobra.ExactArgs(1),
Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := UnblockAccountOrUser(args[0], protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
if len(args) == 0 {
if err := UnblockAccountOrUser("", protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
}
} else {
if err := UnblockAccountOrUser(args[0], protos.EntityType_User, FlagUser.Account); err != util.ErrorSuccess {
os.Exit(err)
}
}
},
}
Expand Down Expand Up @@ -546,12 +570,12 @@ func init() {
modifyAccountCmd.Flags().StringVarP(&FlagAccount.DefaultQos, "default-qos", "Q", "", "Set default QoS of the account")

modifyAccountCmd.Flags().StringSliceVar(&FlagAccount.AllowedPartitions, "set-allowed-partition", nil, "Overwrite allowed partitions of the account (comma seperated list)")
modifyAccountCmd.Flags().StringVar(&FlagSetPartition, "add-allowed-partition", "", "Add a single partition to allowed partition list")
modifyAccountCmd.Flags().StringVar(&FlagSetPartition, "delete-allowed-partition", "", "Delete a single partition from allowed partition list")
modifyAccountCmd.Flags().StringVar(&FlagSetPartition, "add-allowed-partition", "", "Add partition to allowed partition list")
modifyAccountCmd.Flags().StringVar(&FlagSetPartition, "delete-allowed-partition", "", "Delete partition from allowed partition list")

modifyAccountCmd.Flags().StringSliceVar(&FlagAccount.AllowedQosList, "set-allowed-qos-list", nil, "Overwrite allowed QoS list of the user (comma seperated list)")
modifyAccountCmd.Flags().StringVar(&FlagQos.Name, "add-allowed-qos-list", "", "Add a single QoS to allowed QoS list")
modifyAccountCmd.Flags().StringVar(&FlagQos.Name, "delete-allowed-qos-list", "", "Delete a single QoS from allowed QoS list")
modifyAccountCmd.Flags().StringVar(&FlagQos.Name, "add-allowed-qos-list", "", "Add QoS to allowed QoS list")
modifyAccountCmd.Flags().StringVar(&FlagQos.Name, "delete-allowed-qos-list", "", "Delete QoS from allowed QoS list")

// Other flags
modifyAccountCmd.Flags().BoolVarP(&FlagForce, "force", "F", false, "Forced to operate")
Expand Down Expand Up @@ -579,12 +603,12 @@ func init() {
modifyUserCmd.Flags().StringVarP(&FlagSetDefaultAccount, "default-account", "D", "", "Modify default account of the user")

modifyUserCmd.Flags().StringSliceVar(&FlagUserPartitions, "set-allowed-partition", nil, "Overwrite allowed partitions of the user (comma seperated list)")
modifyUserCmd.Flags().StringVar(&FlagSetPartition, "add-allowed-partition", "", "Add a single partition to allowed partition list")
modifyUserCmd.Flags().StringVar(&FlagSetPartition, "delete-allowed-partition", "", "Delete a single partition to allowed partition list")
modifyUserCmd.Flags().StringVar(&FlagSetPartition, "add-allowed-partition", "", "Add partition to allowed partition list")
modifyUserCmd.Flags().StringVar(&FlagSetPartition, "delete-allowed-partition", "", "Delete partition to allowed partition list")

modifyUserCmd.Flags().StringSliceVar(&FlagUserQosList, "set-allowed-qos-list", nil, "Overwrite allowed QoS list of the user (comma seperated list)")
modifyUserCmd.Flags().StringVar(&FlagQos.Name, "add-allowed-qos-list", "", "Add a single QoS to allowed QoS list")
modifyUserCmd.Flags().StringVar(&FlagQos.Name, "delete-allowed-qos-list", "", "Delete a single QoS from allowed QoS list")
modifyUserCmd.Flags().StringVar(&FlagQos.Name, "add-allowed-qos-list", "", "Add QoS to allowed QoS list")
modifyUserCmd.Flags().StringVar(&FlagQos.Name, "delete-allowed-qos-list", "", "Delete QoS from allowed QoS list")

// Other flags
modifyUserCmd.Flags().BoolVarP(&FlagForce, "force", "F", false, "Forced operation")
Expand Down
Loading