working commit
This commit is contained in:
+55
-100
@@ -23,28 +23,28 @@ import (
|
||||
|
||||
func (util *GrantUtil) CreateGrantCmds() *cobra.Command {
|
||||
var subCmd = &cobra.Command{
|
||||
Use: "account",
|
||||
Short: "Grant operation",
|
||||
Use: "grants",
|
||||
Short: "Grant operation",
|
||||
Aliases: []string{"grant"},
|
||||
}
|
||||
const defaultTimeout uint64 = 10
|
||||
|
||||
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",
|
||||
Short: "Create grant",
|
||||
Run: util.CreateGrant,
|
||||
}
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Username, "username", "u", "", "Username")
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Password, "password", "p", "", "Password")
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Hostname, "host", "x", defaultHostname, "Hostname")
|
||||
createGrantCmd.Flags().Uint64VarP(&util.createGrantParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Right, "newuser", "U", "", "New account username")
|
||||
createGrantCmd.Flags().StringVarP(&util.createGrantParams.Pattern, "newpass", "P", "", "New account password")
|
||||
createGrantCmd.MarkFlagRequired("host")
|
||||
createGrantCmd.MarkFlagsRequiredTogether("newuser", "newpass")
|
||||
createGrantCmd.MarkFlagsRequiredTogether("username", "password")
|
||||
|
||||
subCmd.AddCommand(createGrantCmd)
|
||||
|
||||
// GetGrant
|
||||
@@ -53,17 +53,9 @@ func (util *GrantUtil) CreateGrantCmds() *cobra.Command {
|
||||
Short: "Get detail grant info",
|
||||
Run: util.GetGrant,
|
||||
}
|
||||
getGrantCmd.Flags().StringVarP(&util.getGrantParams.Hostname, "host", "x", defaultHostname, "Hostname")
|
||||
getGrantCmd.Flags().StringVarP(&util.getGrantParams.Username, "username", "u", "", "Username")
|
||||
getGrantCmd.Flags().StringVarP(&util.getGrantParams.Password, "password", "p", "", "Password")
|
||||
getGrantCmd.Flags().Uint64VarP(&util.getGrantParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
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.MarkFlagRequired("host")
|
||||
getGrantCmd.MarkFlagsOneRequired("id", "name")
|
||||
getGrantCmd.MarkFlagsRequiredTogether("username", "password")
|
||||
|
||||
subCmd.AddCommand(getGrantCmd)
|
||||
|
||||
// UpdateGrant
|
||||
@@ -72,18 +64,13 @@ func (util *GrantUtil) CreateGrantCmds() *cobra.Command {
|
||||
Short: "Update grant parameters",
|
||||
Run: util.UpdateGrant,
|
||||
}
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Username, "username", "u", "", "Username")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Password, "password", "p", "", "Password")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Hostname, "host", "x", "", "File path")
|
||||
updateGrantCmd.Flags().Uint64VarP(&util.updateGrantParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
|
||||
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, "newuser", "U", "", "New username")
|
||||
updateGrantCmd.Flags().StringVarP(&util.updateGrantParams.Pattern, "pass", "P", "", "New password")
|
||||
updateGrantCmd.MarkFlagRequired("host")
|
||||
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
|
||||
@@ -92,44 +79,24 @@ func (util *GrantUtil) CreateGrantCmds() *cobra.Command {
|
||||
Short: "Delete grant",
|
||||
Run: util.DeleteGrant,
|
||||
}
|
||||
deleteGrantCmd.Flags().StringVarP(&util.deleteGrantParams.Username, "username", "u", "", "Username")
|
||||
deleteGrantCmd.Flags().StringVarP(&util.deleteGrantParams.Password, "password", "p", "", "Password")
|
||||
deleteGrantCmd.Flags().StringVarP(&util.deleteGrantParams.Hostname, "host", "x", defaultHostname, "Hostname")
|
||||
deleteGrantCmd.Flags().Uint64VarP(&util.deleteGrantParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
|
||||
deleteGrantCmd.Flags().StringVarP(&util.deleteGrantParams.GrantID, "id", "I", "", "Grant ID")
|
||||
deleteGrantCmd.MarkFlagRequired("host")
|
||||
deleteGrantCmd.MarkFlagsRequiredTogether("username", "password")
|
||||
|
||||
deleteGrantCmd.MarkFlagRequired("id")
|
||||
subCmd.AddCommand(deleteGrantCmd)
|
||||
|
||||
return subCmd
|
||||
}
|
||||
|
||||
func (util *GrantUtil) CreateGrantsCmds() *cobra.Command {
|
||||
var subCmd = &cobra.Command{
|
||||
Use: "grans",
|
||||
Short: "Grants operation",
|
||||
}
|
||||
const defaultTimeout uint64 = 10
|
||||
// ListGrants
|
||||
var listGrantsCmd = &cobra.Command{
|
||||
Use: "list",
|
||||
Short: "list user grants",
|
||||
Run: util.ListGrants,
|
||||
}
|
||||
listGrantsCmd.Flags().StringVarP(&util.listGrantsParams.Username, "username", "u", "", "Username")
|
||||
listGrantsCmd.Flags().StringVarP(&util.listGrantsParams.Password, "password", "p", "", "Password")
|
||||
listGrantsCmd.Flags().StringVarP(&util.listGrantsParams.Hostname, "host", "x", defaultHostname, "Hostname")
|
||||
listGrantsCmd.Flags().Uint64VarP(&util.listGrantsParams.Timeout, "timeout", "t", defaultTimeout, "Operation timeout")
|
||||
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)
|
||||
|
||||
return subCmd
|
||||
}
|
||||
|
||||
@@ -139,37 +106,41 @@ type GrantUtil struct {
|
||||
getGrantParams GetGrantParams
|
||||
deleteGrantParams DeleteGrantParams
|
||||
listGrantsParams ListGrantsParams
|
||||
commonGrantParams CommonGrantParams
|
||||
}
|
||||
|
||||
type CommonGrantParams struct {
|
||||
Username string
|
||||
Password string
|
||||
Hostname string
|
||||
Timeout uint64
|
||||
}
|
||||
|
||||
// CreateGrant
|
||||
type CreateGrantParams struct {
|
||||
Username string
|
||||
Password string
|
||||
Hostname string
|
||||
AccountID string
|
||||
Right string
|
||||
Pattern string
|
||||
Timeout uint64
|
||||
}
|
||||
type CreateGrantResult struct {
|
||||
GrantID string `json:"grantId"`
|
||||
}
|
||||
|
||||
func (util *GrantUtil) CreateGrant(cmd *cobra.Command, args []string) {
|
||||
res, err := util.createGrant(&util.createGrantParams)
|
||||
res, err := util.createGrant(&util.commonGrantParams, &util.createGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
|
||||
func (util *GrantUtil) createGrant(params *CreateGrantParams) (*CreateGrantResult, error) {
|
||||
func (util *GrantUtil) createGrant(common *CommonGrantParams, params *CreateGrantParams) (*CreateGrantResult, error) {
|
||||
var err error
|
||||
res := &CreateGrantResult{}
|
||||
params.Hostname, err = packUserinfo(params.Hostname, params.Right, params.Pattern)
|
||||
hostname, err := packUserinfo(common.Hostname, 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)
|
||||
accountID, err := client.NewClient().CreateGrant(ctx, params.Hostname, params.AccountID, params.Right, params.Pattern)
|
||||
accountID, err := client.NewClient().CreateGrant(ctx, hostname, params.AccountID, params.Right, params.Pattern)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
@@ -179,32 +150,28 @@ func (util *GrantUtil) createGrant(params *CreateGrantParams) (*CreateGrantResul
|
||||
|
||||
// UpdateGrant
|
||||
type UpdateGrantParams struct {
|
||||
Hostname string
|
||||
Username string
|
||||
Password string
|
||||
Timeout uint64
|
||||
GrantID string
|
||||
Right string
|
||||
Pattern string
|
||||
GrantID string
|
||||
Right string
|
||||
Pattern string
|
||||
}
|
||||
type UpdateGrantResult struct{}
|
||||
|
||||
func (util *GrantUtil) UpdateGrant(cmd *cobra.Command, args []string) {
|
||||
res, err := util.updateGrant(&util.updateGrantParams)
|
||||
res, err := util.updateGrant(&util.commonGrantParams, &util.updateGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
|
||||
func (util *GrantUtil) updateGrant(params *UpdateGrantParams) (*UpdateGrantResult, error) {
|
||||
func (util *GrantUtil) updateGrant(common *CommonGrantParams, params *UpdateGrantParams) (*UpdateGrantResult, error) {
|
||||
var err error
|
||||
res := &UpdateGrantResult{}
|
||||
params.Hostname, err = packUserinfo(params.Hostname, params.Username, params.Password)
|
||||
hostname, err := packUserinfo(common.Hostname, 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)
|
||||
id := strings.ToLower(params.GrantID)
|
||||
err = client.NewClient().UpdateGrant(ctx, params.Hostname, id, params.Pattern)
|
||||
err = client.NewClient().UpdateGrant(ctx, hostname, id, params.Pattern)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
@@ -213,11 +180,7 @@ func (util *GrantUtil) updateGrant(params *UpdateGrantParams) (*UpdateGrantResul
|
||||
|
||||
// GetGrant
|
||||
type GetGrantParams struct {
|
||||
Hostname string
|
||||
Username string
|
||||
Password string
|
||||
Timeout uint64
|
||||
GrantID string
|
||||
GrantID string
|
||||
}
|
||||
|
||||
type GetGrantResult struct {
|
||||
@@ -225,23 +188,23 @@ type GetGrantResult struct {
|
||||
}
|
||||
|
||||
func (util *GrantUtil) GetGrant(cmd *cobra.Command, args []string) {
|
||||
res, err := util.getGrant(&util.getGrantParams)
|
||||
res, err := util.getGrant(&util.commonGrantParams, &util.getGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
|
||||
func (util *GrantUtil) getGrant(params *GetGrantParams) (*GetGrantResult, error) {
|
||||
func (util *GrantUtil) getGrant(common *CommonGrantParams, params *GetGrantParams) (*GetGrantResult, error) {
|
||||
var err error
|
||||
res := &GetGrantResult{}
|
||||
params.Hostname, err = packUserinfo(params.Hostname, params.Username, params.Password)
|
||||
hostname, err := packUserinfo(common.Hostname, 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)
|
||||
opRes := &descr.Grant{}
|
||||
|
||||
id := strings.ToLower(params.GrantID)
|
||||
opRes, err = client.NewClient().GetGrant(ctx, params.Hostname, id)
|
||||
opRes, err = client.NewClient().GetGrant(ctx, hostname, id)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
@@ -251,30 +214,26 @@ func (util *GrantUtil) getGrant(params *GetGrantParams) (*GetGrantResult, error)
|
||||
|
||||
// DeleteGrant
|
||||
type DeleteGrantParams struct {
|
||||
Hostname string
|
||||
Username string
|
||||
Password string
|
||||
GrantID string
|
||||
Timeout uint64
|
||||
GrantID string
|
||||
}
|
||||
|
||||
type DeleteGrantResult struct{}
|
||||
|
||||
func (util *GrantUtil) DeleteGrant(cmd *cobra.Command, args []string) {
|
||||
res, err := util.deleteGrant(&util.deleteGrantParams)
|
||||
res, err := util.deleteGrant(&util.commonGrantParams, &util.deleteGrantParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
func (util *GrantUtil) deleteGrant(params *DeleteGrantParams) (*DeleteGrantResult, error) {
|
||||
func (util *GrantUtil) deleteGrant(common *CommonGrantParams, params *DeleteGrantParams) (*DeleteGrantResult, error) {
|
||||
var err error
|
||||
res := &DeleteGrantResult{}
|
||||
params.Hostname, err = packUserinfo(params.Hostname, params.Username, params.Password)
|
||||
hostname, err := packUserinfo(common.Hostname, 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)
|
||||
id := strings.ToLower(params.GrantID)
|
||||
err = client.NewClient().DeleteGrant(ctx, params.Hostname, id)
|
||||
err = client.NewClient().DeleteGrant(ctx, hostname, id)
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
@@ -283,10 +242,6 @@ func (util *GrantUtil) deleteGrant(params *DeleteGrantParams) (*DeleteGrantResul
|
||||
|
||||
// ListGrants
|
||||
type ListGrantsParams struct {
|
||||
Hostname string
|
||||
Username string
|
||||
Password string
|
||||
Timeout uint64
|
||||
Detail bool
|
||||
AccountID string
|
||||
}
|
||||
@@ -297,25 +252,25 @@ type ListGrantsResult struct {
|
||||
}
|
||||
|
||||
func (util *GrantUtil) ListGrants(cmd *cobra.Command, args []string) {
|
||||
res, err := util.listGrants(&util.listGrantsParams)
|
||||
res, err := util.listGrants(&util.commonGrantParams, &util.listGrantsParams)
|
||||
printResponse(res, err)
|
||||
}
|
||||
func (util *GrantUtil) listGrants(params *ListGrantsParams) (*ListGrantsResult, error) {
|
||||
func (util *GrantUtil) listGrants(common *CommonGrantParams, params *ListGrantsParams) (*ListGrantsResult, error) {
|
||||
var err error
|
||||
res := &ListGrantsResult{}
|
||||
params.Hostname, err = packUserinfo(params.Hostname, params.Username, params.Password)
|
||||
hostname, err := packUserinfo(common.Hostname, 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)
|
||||
grants := make([]descr.Grant, 0)
|
||||
re := regexp.MustCompile(uuidRegex)
|
||||
id := strings.ToLower(params.AccountID)
|
||||
if re.MatchString(id) {
|
||||
grants, err = client.NewClient().ListGrantsByAccountID(ctx, params.Hostname, params.AccountID)
|
||||
grants, err = client.NewClient().ListGrantsByAccountID(ctx, hostname, params.AccountID)
|
||||
} else {
|
||||
grants, err = client.NewClient().ListGrantsByUsername(ctx, params.Hostname, params.AccountID)
|
||||
grants, err = client.NewClient().ListGrantsByUsername(ctx, hostname, params.AccountID)
|
||||
}
|
||||
if err != nil {
|
||||
return res, err
|
||||
|
||||
Reference in New Issue
Block a user