working commit
This commit is contained in:
+39
-35
@@ -31,69 +31,53 @@ func (util *GrantUtil) CreateGrantCmds() *cobra.Command {
|
||||
|
||||
subCmd.PersistentFlags().StringVarP(&util.commonGrantParams.Username, "user", "u", "", "Username")
|
||||
subCmd.PersistentFlags().StringVarP(&util.commonGrantParams.Password, "pass", "p", "", "Password")
|
||||
subCmd.PersistentFlags().StringVarP(&util.commonGrantParams.Hostname, "host", "x", defaultHostname, "Hostname")
|
||||
subCmd.PersistentFlags().Uint64VarP(&util.commonGrantParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
subCmd.MarkPersistentFlagRequired("host")
|
||||
subCmd.MarkFlagsRequiredTogether("user", "pass")
|
||||
|
||||
// CreateGrant
|
||||
var createGrantCmd = &cobra.Command{
|
||||
Use: "create",
|
||||
Use: "create hostname[:port] username|accountId rigth pattern",
|
||||
Short: "Create grant",
|
||||
Args: cobra.ExactArgs(4),
|
||||
Run: util.CreateGrant,
|
||||
}
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Right, "newuser", "U", "", "New account username")
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Pattern, "newpass", "P", "", "New account password")
|
||||
createGrantCmd.MarkFlagsRequiredTogether("newuser", "newpass")
|
||||
subCmd.AddCommand(createGrantCmd)
|
||||
|
||||
// GetGrant
|
||||
var getGrantCmd = &cobra.Command{
|
||||
Use: "get",
|
||||
Use: "get hostname[:port] grantId",
|
||||
Short: "Get detail grant info",
|
||||
Args: cobra.ExactArgs(2),
|
||||
Run: util.GetGrant,
|
||||
}
|
||||
getGrantCmd.Flags().StringVarP(&util.getGrantParams.GrantID, "id", "I", "", "Grant ID or name")
|
||||
getGrantCmd.Flags().StringVarP(&util.getGrantParams.GrantID, "name", "n", "", "Grant ID or name")
|
||||
getGrantCmd.MarkFlagsOneRequired("id", "name")
|
||||
subCmd.AddCommand(getGrantCmd)
|
||||
|
||||
// UpdateGrant
|
||||
var updateGrantCmd = &cobra.Command{
|
||||
Use: "update",
|
||||
Use: "update hostname[:port] gruntId newPattern",
|
||||
Short: "Update grant parameters",
|
||||
Run: util.UpdateGrant,
|
||||
Args: cobra.ExactArgs(3),
|
||||
Run: util.UpdateGrant,
|
||||
}
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.GrantID, "id", "I", "", "Grant ID or username")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.GrantID, "name", "n", "", "Grant ID or username")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Right, "rigth", "U", "", "Rigth")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Pattern, "pattern", "P", "", "New pattern")
|
||||
updateGrantCmd.MarkFlagsOneRequired("id", "name")
|
||||
updateGrantCmd.MarkFlagRequired("rigth")
|
||||
updateGrantCmd.MarkFlagRequired("pattern")
|
||||
subCmd.AddCommand(updateGrantCmd)
|
||||
|
||||
// DeleteGrant
|
||||
var deleteGrantCmd = &cobra.Command{
|
||||
Use: "delete",
|
||||
Use: "delete hostname[:port] gruntId ",
|
||||
Short: "Delete grant",
|
||||
Run: util.DeleteGrant,
|
||||
Args: cobra.ExactArgs(2),
|
||||
|
||||
Run: util.DeleteGrant,
|
||||
}
|
||||
deleteGrantCmd.Flags().StringVarP(&util.deleteGrantParams.GrantID, "id", "I", "", "Grant ID")
|
||||
deleteGrantCmd.MarkFlagRequired("id")
|
||||
subCmd.AddCommand(deleteGrantCmd)
|
||||
|
||||
// ListGrants
|
||||
var listGrantsCmd = &cobra.Command{
|
||||
Use: "list",
|
||||
Use: "list hostname[:port] accountId|username",
|
||||
Short: "list user grants",
|
||||
Args: cobra.ExactArgs(2),
|
||||
Run: util.ListGrants,
|
||||
}
|
||||
listGrantsCmd.Flags().BoolVarP(&util.listGrantsParams.Detail, "detail", "d", false, "Show detail information")
|
||||
listGrantsCmd.Flags().StringVarP(&util.listGrantsParams.AccountID, "id", "I", "", "User account ID")
|
||||
listGrantsCmd.Flags().StringVarP(&util.listGrantsParams.AccountID, "name", "n", "", "User account ID")
|
||||
listGrantsCmd.MarkFlagRequired("host")
|
||||
listGrantsCmd.MarkFlagsOneRequired("id", "name")
|
||||
|
||||
subCmd.AddCommand(listGrantsCmd)
|
||||
|
||||
@@ -127,6 +111,10 @@ type CreateGrantResult struct {
|
||||
}
|
||||
|
||||
func (util *GrantUtil) CreateGrant(cmd *cobra.Command, args []string) {
|
||||
util.commonGrantParams.Hostname = args[0]
|
||||
util.createGrantParams.AccountID = args[1]
|
||||
util.createGrantParams.Right = args[2]
|
||||
util.createGrantParams.Pattern = args[3]
|
||||
res, err := util.createGrant(&util.commonGrantParams, &util.createGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
@@ -140,23 +128,32 @@ func (util *GrantUtil) createGrant(common *CommonGrantParams, params *CreateGran
|
||||
}
|
||||
timeout := time.Duration(common.Timeout) * time.Second
|
||||
ctx, _ := context.WithTimeout(context.Background(), timeout)
|
||||
accountID, err := client.NewClient().CreateGrant(ctx, hostname, params.AccountID, params.Right, params.Pattern)
|
||||
re := regexp.MustCompile(uuidRegex)
|
||||
id := strings.ToLower(params.AccountID)
|
||||
var operRes string
|
||||
if re.MatchString(id) {
|
||||
operRes, err = client.NewClient().CreateGrantByAccountID(ctx, hostname, params.AccountID, params.Right, params.Pattern)
|
||||
} else {
|
||||
operRes, err = client.NewClient().CreateGrantByUsername(ctx, hostname, params.AccountID, params.Right, params.Pattern)
|
||||
}
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
res.GrantID = accountID
|
||||
res.GrantID = operRes
|
||||
return res, err
|
||||
}
|
||||
|
||||
// UpdateGrant
|
||||
type UpdateGrantParams struct {
|
||||
GrantID string
|
||||
Right string
|
||||
Pattern string
|
||||
}
|
||||
type UpdateGrantResult struct{}
|
||||
|
||||
func (util *GrantUtil) UpdateGrant(cmd *cobra.Command, args []string) {
|
||||
util.commonGrantParams.Hostname = args[0]
|
||||
util.updateGrantParams.GrantID = args[1]
|
||||
util.updateGrantParams.Pattern = args[2]
|
||||
res, err := util.updateGrant(&util.commonGrantParams, &util.updateGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
@@ -188,6 +185,9 @@ type GetGrantResult struct {
|
||||
}
|
||||
|
||||
func (util *GrantUtil) GetGrant(cmd *cobra.Command, args []string) {
|
||||
util.commonGrantParams.Hostname = args[0]
|
||||
util.getGrantParams.GrantID = args[1]
|
||||
|
||||
res, err := util.getGrant(&util.commonGrantParams, &util.getGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
@@ -220,6 +220,8 @@ type DeleteGrantParams struct {
|
||||
type DeleteGrantResult struct{}
|
||||
|
||||
func (util *GrantUtil) DeleteGrant(cmd *cobra.Command, args []string) {
|
||||
util.commonGrantParams.Hostname = args[0]
|
||||
util.deleteGrantParams.GrantID = args[1]
|
||||
res, err := util.deleteGrant(&util.commonGrantParams, &util.deleteGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
@@ -248,10 +250,12 @@ type ListGrantsParams struct {
|
||||
|
||||
type ListGrantsResult struct {
|
||||
Grants []descr.Grant `yaml:"grants,omitempty"`
|
||||
Rights []string `yaml:"rights,omitempty"`
|
||||
Rights map[string]string `yaml:"rights,omitempty"`
|
||||
}
|
||||
|
||||
func (util *GrantUtil) ListGrants(cmd *cobra.Command, args []string) {
|
||||
util.commonGrantParams.Hostname = args[0]
|
||||
util.listGrantsParams.AccountID = args[1]
|
||||
res, err := util.listGrants(&util.commonGrantParams, &util.listGrantsParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
@@ -278,9 +282,9 @@ func (util *GrantUtil) listGrants(common *CommonGrantParams, params *ListGrantsP
|
||||
if params.Detail {
|
||||
res.Grants = grants
|
||||
} else {
|
||||
res.Rights = make([]string, 0)
|
||||
res.Rights = make(map[string]string, 0)
|
||||
for _, item := range grants {
|
||||
res.Rights = append(res.Rights, item.Right)
|
||||
res.Rights[item.ID] = item.Right
|
||||
}
|
||||
}
|
||||
return res, err
|
||||
|
||||
Reference in New Issue
Block a user