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

Refactor prepare interactivity [CLI-79] #277

Merged
merged 4 commits into from
May 1, 2021
Merged

Refactor prepare interactivity [CLI-79] #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de914d6
Move prepareInteractivity to the root command
Widcket Apr 30, 2021
e9608ca
Merge branch 'main' into refactor-prepare-interactivity
Widcket Apr 30, 2021
7e4210b
Add period to long help text
Widcket Apr 30, 2021
d7f70eb
Adjust help text
Widcket Apr 30, 2021
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
18 changes: 0 additions & 18 deletions internal/cli/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ func showApiCmd(cli *cli) *cobra.Command {
Long: "Show an API.",
Example: `auth0 apis show
auth0 apis show <id|audience>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
Expand Down Expand Up @@ -179,9 +176,6 @@ auth0 apis create --name myapi
auth0 apis create -n myapi --identifier http://my-api
auth0 apis create -n myapi --token-expiration 6100
auth0 apis create -n myapi -e 6100 --offline-access=true`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if err := apiName.Ask(cmd, &inputs.Name, nil); err != nil {
return err
Expand Down Expand Up @@ -253,9 +247,6 @@ auth0 apis update <id|audience>
auth0 apis update <id|audience> --name myapi
auth0 apis update -n myapi --token-expiration 6100
auth0 apis update -n myapi -e 6100 --offline-access=true`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
var current *management.ResourceServer

Expand Down Expand Up @@ -350,9 +341,6 @@ func deleteApiCmd(cli *cli) *cobra.Command {
Long: "Delete an API.",
Example: `auth0 apis delete
auth0 apis delete <id|audience>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
Expand Down Expand Up @@ -396,9 +384,6 @@ func openApiCmd(cli *cli) *cobra.Command {
Long: "Open API settings page in Auth0 Manage.",
Example: `auth0 apis open
auth0 apis open <id|audience>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
Expand Down Expand Up @@ -449,9 +434,6 @@ func listScopesCmd(cli *cli) *cobra.Command {
Long: "List the scopes of an API.",
Example: `auth0 apis scopes list
auth0 apis scopes ls <id|audience>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
Expand Down
19 changes: 0 additions & 19 deletions internal/cli/apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ func useAppCmd(cli *cli) *cobra.Command {
Short: "Choose a default application for the Auth0 CLI",
Long: "Specify your preferred application for interaction with the Auth0 CLI.",
Example: "auth0 apps use <client-id>",
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},

RunE: func(cmd *cobra.Command, args []string) error {
if inputs.None {
inputs.ID = ""
Expand Down Expand Up @@ -229,9 +225,6 @@ func showAppCmd(cli *cli) *cobra.Command {
Long: "Show an application.",
Example: `auth0 apps show
auth0 apps show <id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
Expand Down Expand Up @@ -273,9 +266,6 @@ func deleteAppCmd(cli *cli) *cobra.Command {
Long: "Delete an application.",
Example: `auth0 apps delete
auth0 apps delete <id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
Expand Down Expand Up @@ -331,9 +321,6 @@ func createAppCmd(cli *cli) *cobra.Command {
auth0 apps create --name myapp
auth0 apps create -n myapp --type [native|spa|regular|m2m]
auth0 apps create -n myapp -t [native|spa|regular|m2m] -- description <description>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
// Prompt for app name
if err := appName.Ask(cmd, &inputs.Name, nil); err != nil {
Expand Down Expand Up @@ -480,9 +467,6 @@ func updateAppCmd(cli *cli) *cobra.Command {
Example: `auth0 apps update <id>
auth0 apps update <id> --name myapp
auth0 apps update <id> -n myapp --type [native|spa|regular|m2m]`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
var current *management.Client

Expand Down Expand Up @@ -674,9 +658,6 @@ func openAppCmd(cli *cli) *cobra.Command {
Short: "Open application settings page in Auth0 Manage",
Long: "Open application settings page in Auth0 Manage.",
Example: "auth0 apps open <id>",
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
Expand Down
6 changes: 0 additions & 6 deletions internal/cli/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ func listLogsCmd(cli *cli) *cobra.Command {
Example: `auth0 logs list
auth0 logs list --client-id <id>
auth0 logs ls -n 100`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
list, err := getLatestLogs(cli, inputs.Num, inputs.ClientID)
if err != nil {
Expand Down Expand Up @@ -105,9 +102,6 @@ func tailLogsCmd(cli *cli) *cobra.Command {
Example: `auth0 logs tail
auth0 logs tail --client-id <id>
auth0 logs tail -n 100`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
lastLogID := ""
list, err := getLatestLogs(cli, inputs.Num, inputs.ClientID)
Expand Down
3 changes: 0 additions & 3 deletions internal/cli/quickstarts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ func downloadQuickstartCmd(cli *cli) *cobra.Command {
Long: "Download a Quickstart sample app for a specific tech stack.",
Example: `auth0 quickstarts download --stack <stack>
auth0 qs download --stack <stack>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if !canPrompt(cmd) {
return errors.New("This command can only be run on interactive mode")
Expand Down
2 changes: 2 additions & 0 deletions internal/cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ func Execute() {

ansi.DisableColors = cli.noColor

prepareInteractivity(cmd)

// Initialize everything once. Later callers can then
// freely assume that config is fully primed and ready
// to go.
Expand Down
18 changes: 0 additions & 18 deletions internal/cli/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ func createRuleCmd(cli *cli) *cobra.Command {
auth0 rules create --name "My Rule"
auth0 rules create -n "My Rule" --template "Empty rule"
auth0 rules create -n "My Rule" -t "Empty rule" --enabled=false`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if err := ruleName.Ask(cmd, &inputs.Name, nil); err != nil {
return err
Expand Down Expand Up @@ -191,9 +188,6 @@ func showRuleCmd(cli *cli) *cobra.Command {
Long: "Show a rule.",
Example: `auth0 rules show
auth0 rules show <id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.ID = args[0]
Expand Down Expand Up @@ -236,9 +230,6 @@ func deleteRuleCmd(cli *cli) *cobra.Command {
Long: "Delete a rule.",
Example: `auth0 rules delete
auth0 rules delete <rule-id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.ID = args[0]
Expand Down Expand Up @@ -286,9 +277,6 @@ func updateRuleCmd(cli *cli) *cobra.Command {
Example: `auth0 rules update <rule-id>
auth0 rules update <rule-id> --name "My Updated Rule"
auth0 rules update <rule-id> -n "My Updated Rule" --enabled=false`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.ID = args[0]
Expand Down Expand Up @@ -380,9 +368,6 @@ func enableRuleCmd(cli *cli) *cobra.Command {
Short: "Enable a rule",
Long: "Enable a rule.",
Example: `auth0 rules enable <rule-id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.ID = args[0]
Expand Down Expand Up @@ -435,9 +420,6 @@ func disableRuleCmd(cli *cli) *cobra.Command {
Short: "Disable a rule",
Long: "Disable a rule.",
Example: `auth0 rules disable <rule-id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
inputs.ID = args[0]
Expand Down
3 changes: 0 additions & 3 deletions internal/cli/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ func updateBrandingTemplateCmd(cli *cli) *cobra.Command {
Short: "Update the custom template for Universal Login",
Long: "Update the custom template for Universal Login.",
Example: "auth0 branding templates update",
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
var templateData *branding.TemplateData
err := ansi.Waiting(func() error {
Expand Down
6 changes: 0 additions & 6 deletions internal/cli/tenants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ func useTenantCmd(cli *cli) *cobra.Command {
Short: "Set the active tenant",
Long: "Set the active tenant.",
Example: "auth0 tenants use <tenant>",
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
var selectedTenant string
if len(args) == 0 {
Expand Down Expand Up @@ -113,9 +110,6 @@ func openTenantCmd(cli *cli) *cobra.Command {
Short: "Open tenant settings page in Auth0 Manage",
Long: "Open tenant settings page in Auth0 Manage.",
Example: "auth0 tenants open <tenant>",
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
err := tenantDomain.Pick(cmd, &inputs.Domain, cli.tenantPickerOptions)
Expand Down
30 changes: 10 additions & 20 deletions internal/cli/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,11 @@ func listUserBlocksCmd(cli *cli) *cobra.Command {
}

cmd := &cobra.Command{
Use: "list",
Args: cobra.MaximumNArgs(1),
Short: "List brute-force protection blocks for a given user",
Long: `List brute-force protection blocks for a given user:

auth0 users blocks list <user-id>
`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
Use: "list",
Args: cobra.MaximumNArgs(1),
Short: "List brute-force protection blocks for a given user",
Long: "List brute-force protection blocks for a given user.",
Example: "auth0 users blocks list <user-id>",
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if err := userID.Ask(cmd, &inputs.userID); err != nil {
Expand Down Expand Up @@ -89,16 +84,11 @@ func deleteUserBlocksCmd(cli *cli) *cobra.Command {
}

cmd := &cobra.Command{
Use: "unblock",
Args: cobra.MaximumNArgs(1),
Short: "Delete brute-force protection blocks for a given user",
Long: `Delete brute-force protection blocks for a given user:

auth0 users unblock <user-id>
`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
Use: "unblock",
Args: cobra.MaximumNArgs(1),
Short: "Remove brute-force protection blocks for a given user",
Long: "Remove brute-force protection blocks for a given user.",
Example: "auth0 users unblock <user-id>",
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if err := userID.Ask(cmd, &inputs.userID); err != nil {
Expand Down