hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: downgrade urfave/cli to v1 to enable more flexible parsing (#154)

Browse Source
This commit is contained in:
Daniel Moran
2021-06-28 14:49:26 -04:00
committed by GitHub
parent 72d1ad8361
commit ead44e4e83
29 changed files with 534 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
cmd/influx/user.go
View File

@ -4,14 +4,14 @@ import (
"github.com/influxdata/influx-cli/v2/clients/user"
"github.com/influxdata/influx-cli/v2/pkg/cli/middleware"
"github.com/influxdata/influx-cli/v2/pkg/influxid"
"github.com/urfave/cli/v2"
"github.com/urfave/cli"
)
func newUserCmd() *cli.Command {
return &cli.Command{
func newUserCmd() cli.Command {
return cli.Command{
Name: "user",
Usage: "User management commands",
Subcommands: []*cli.Command{
Subcommands: []cli.Command{
newUserCreateCmd(),
newUserDeleteCmd(),
newUserListCmd(),
@ -21,38 +21,35 @@ func newUserCmd() *cli.Command {
}
}
func newUserCreateCmd() *cli.Command {
func newUserCreateCmd() cli.Command {
var params user.CreateParams
return &cli.Command{
return cli.Command{
Name: "create",
Usage: "Create user",
Flags: append(
commonFlags(),
&cli.GenericFlag{
Name: "org-id",
Usage: "The ID of the organization",
EnvVars: []string{"INFLUX_ORG_ID"},
Value: &params.OrgID,
Name: "org-id",
Usage: "The ID of the organization",
EnvVar: "INFLUX_ORG_ID",
Value: &params.OrgID,
},
&cli.StringFlag{
Name: "org",
Name: "org, o",
Usage: "The name of the organization",
Aliases: []string{"o"},
EnvVars: []string{"INFLUX_ORG"},
EnvVar: "INFLUX_ORG",
Destination: &params.OrgName,
},
&cli.StringFlag{
Name: "name",
Name: "name, n",
Usage: "The user name",
Aliases: []string{"n"},
EnvVars: []string{"INFLUX_NAME"},
EnvVar: "INFLUX_NAME",
Required: true,
Destination: &params.Name,
},
&cli.StringFlag{
Name: "password",
Name: "password, p",
Usage: "The user password",
Aliases: []string{"p"},
Destination: &params.Password,
},
),
@ -64,22 +61,21 @@ func newUserCreateCmd() *cli.Command {
UsersApi: api.UsersApi,
OrganizationsApi: api.OrganizationsApi,
}
return client.Create(ctx.Context, &params)
return client.Create(getContext(ctx), &params)
},
}
}
func newUserDeleteCmd() *cli.Command {
func newUserDeleteCmd() cli.Command {
var id influxid.ID
return &cli.Command{
return cli.Command{
Name: "delete",
Usage: "Delete user",
Flags: append(
commonFlags(),
&cli.GenericFlag{
Name: "id",
Name: "id, i",
Usage: "The user ID",
Aliases: []string{"i"},
Required: true,
Value: &id,
},
@ -87,91 +83,85 @@ func newUserDeleteCmd() *cli.Command {
Before: middleware.WithBeforeFns(withCli(), withApi(true)),
Action: func(ctx *cli.Context) error {
client := user.Client{CLI: getCLI(ctx), UsersApi: getAPI(ctx).UsersApi}
return client.Delete(ctx.Context, id)
return client.Delete(getContext(ctx), id)
},
}
}
func newUserListCmd() *cli.Command {
func newUserListCmd() cli.Command {
var params user.ListParams
return &cli.Command{
return cli.Command{
Name: "list",
Aliases: []string{"find", "ls"},
Usage: "List users",
Flags: append(
commonFlags(),
&cli.GenericFlag{
Name: "id",
Usage: "The user ID",
Aliases: []string{"i"},
Value: &params.Id,
Name: "id, i",
Usage: "The user ID",
Value: &params.Id,
},
&cli.StringFlag{
Name: "name",
Name: "name, n",
Usage: "The user name",
Aliases: []string{"n"},
Destination: &params.Name,
},
),
Before: middleware.WithBeforeFns(withCli(), withApi(true)),
Action: func(ctx *cli.Context) error {
client := user.Client{CLI: getCLI(ctx), UsersApi: getAPI(ctx).UsersApi}
return client.List(ctx.Context, &params)
return client.List(getContext(ctx), &params)
},
}
}
func newUserUpdateCmd() *cli.Command {
func newUserUpdateCmd() cli.Command {
var params user.UpdateParmas
return &cli.Command{
return cli.Command{
Name: "update",
Flags: append(
commonFlags(),
&cli.GenericFlag{
Name: "id",
Name: "id, i",
Usage: "The user ID",
Aliases: []string{"i"},
Required: true,
Value: &params.Id,
},
&cli.StringFlag{
Name: "name",
Name: "name, n",
Usage: "The user name",
Aliases: []string{"n"},
Destination: &params.Name,
},
),
Before: middleware.WithBeforeFns(withCli(), withApi(true)),
Action: func(ctx *cli.Context) error {
client := user.Client{CLI: getCLI(ctx), UsersApi: getAPI(ctx).UsersApi}
return client.Update(ctx.Context, &params)
return client.Update(getContext(ctx), &params)
},
}
}
func newUserSetPasswordCmd() *cli.Command {
func newUserSetPasswordCmd() cli.Command {
var params user.SetPasswordParams
return &cli.Command{
return cli.Command{
Name: "password",
Flags: append(
commonFlagsNoPrint(),
&cli.GenericFlag{
Name: "id",
Usage: "The user ID",
Aliases: []string{"i"},
Value: &params.Id,
Name: "id, i",
Usage: "The user ID",
Value: &params.Id,
},
&cli.StringFlag{
Name: "name",
Name: "name, n",
Usage: "The user name",
Aliases: []string{"n"},
Destination: &params.Name,
},
),
Before: middleware.WithBeforeFns(withCli(), withApi(true)),
Action: func(ctx *cli.Context) error {
client := user.Client{CLI: getCLI(ctx), UsersApi: getAPI(ctx).UsersApi}
return client.SetPassword(ctx.Context, &params)
return client.SetPassword(getContext(ctx), &params)
},
}
}