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

Change update commands to only prompt when flagless [CLI-56] #136

Merged
merged 5 commits into from
Mar 6, 2021
Merged

Change update commands to only prompt when flagless [CLI-56] #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aebb126
Change apps update command to prompt when flagless
Widcket Mar 5, 2021
b4ed593
Update actions update to only prompt when flagless
Widcket Mar 5, 2021
4a12e1b
Update api update to only prompt when flagless
Widcket Mar 5, 2021
f1ffecd
Use local flags
Widcket Mar 5, 2021
ce9fc3b
Remove unused const
Widcket Mar 6, 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
48 changes: 27 additions & 21 deletions internal/cli/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ auth0 actions test <id> --file payload.json`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Action Id to test.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down Expand Up @@ -201,14 +201,14 @@ auth0 actions deploy <id> --version version-id`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Action Id to deploy.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down Expand Up @@ -298,14 +298,14 @@ auth0 actions download <id> --version <version-id | draft>`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Action Id to download.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down Expand Up @@ -391,14 +391,14 @@ auth0 actions versions <id>`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Action Id to show versions.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down Expand Up @@ -567,22 +567,25 @@ func updateActionCmd(cli *cli) *cobra.Command {

$ auth0 actions update <id> --file action.js --dependency [email protected]
`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Id of the action.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
}

if shouldPrompt(cmd, actionFile) && shouldPrompt(cmd, actionScript) {
if shouldPromptWhenFlagless(cmd, actionFile) && shouldPrompt(cmd, actionScript) {
input := prompt.TextInput(actionFile, "Action File:", "File containing the action source code.", false)

if err := prompt.AskOne(input, &inputs); err != nil {
Expand Down Expand Up @@ -633,7 +636,7 @@ $ auth0 actions update <id> --file action.js --dependency [email protected]
cmd.Flags().BoolVarP(&inputs.CreateVersion, actionVersion, "v", false, "Create an explicit action version from the source code instead of a draft.")

if err := cmd.MarkFlagFilename(actionFile); err != nil {
panic(err)
fmt.Println(fmt.Errorf("An unexpected error occurred: %w", err))
}

return cmd
Expand All @@ -651,16 +654,19 @@ func deleteActionCmd(cli *cli) *cobra.Command {
Long: `Delete an action:

$ auth0 actions delete <id>`,
PreRun: func(cmd *cobra.Command, args []string) {
prepareInteractivity(cmd)
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Id:", "Id of the action.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down Expand Up @@ -704,7 +710,7 @@ auth0 actions flows show <trigger>`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionTrigger) {
if canPrompt(cmd) {
input := prompt.SelectInput(
actionTrigger,
"Trigger:",
Expand All @@ -716,7 +722,7 @@ auth0 actions flows show <trigger>`,
return err
}
} else {
return errors.New("missing action trigger")
return errors.New("Please provide an action trigger")
}
} else {
inputs.Trigger = args[0]
Expand Down Expand Up @@ -764,7 +770,7 @@ auth0 actions flows update <trigger> --file bindings.json`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionTrigger) {
if canPrompt(cmd) {
input := prompt.SelectInput(
actionTrigger,
"Trigger:",
Expand All @@ -776,13 +782,13 @@ auth0 actions flows update <trigger> --file bindings.json`,
return err
}
} else {
return errors.New("missing action trigger")
return errors.New("Please provide an action trigger")
}
} else {
inputs.Trigger = args[0]
}

if shouldPrompt(cmd, actionFile) {
if shouldPromptWhenFlagless(cmd, actionFile) {
input := prompt.TextInput(actionFile, "File:", "File containing the bindings.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
Expand Down Expand Up @@ -845,14 +851,14 @@ auth0 actions bind <id> --trigger post-login`,
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, actionID) {
if canPrompt(cmd) {
input := prompt.TextInput(actionID, "Action Id:", "Action Id to bind.", false)

if err := prompt.AskOne(input, &inputs); err != nil {
return err
}
} else {
return errors.New("missing action id")
return errors.New("Please provide an action Id")
}
} else {
inputs.ID = args[0]
Expand Down
56 changes: 35 additions & 21 deletions internal/cli/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ auth0 apis show <id>
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, apiID) {
if canPrompt(cmd) {
input := prompt.TextInput(apiID, "Id:", "Id of the API.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
} else {
return errors.New("Please include an API id")
return errors.New("Please include an API Id")
}
} else {
inputs.ID = args[0]
Expand All @@ -118,7 +118,7 @@ auth0 apis show <id>
})

if err != nil {
return fmt.Errorf("Unable to get an API with id %s: %w", inputs.ID, err)
return fmt.Errorf("Unable to get an API with Id %s: %w", inputs.ID, err)
}

cli.renderer.ApiShow(api)
Expand Down Expand Up @@ -183,7 +183,7 @@ auth0 apis create --name myapi --identifier http://my-api
}

if flags.Scopes != "" {
api.Scopes = getScopes(flags.Scopes)
api.Scopes = apiScopesFor(flags.Scopes)
}

err := ansi.Spinner("Creating API", func() error {
Expand Down Expand Up @@ -227,47 +227,61 @@ auth0 apis update <id> --name myapi
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, apiID) {
if canPrompt(cmd) {
input := prompt.TextInput(apiID, "Id:", "Id of the API.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
} else {
return errors.New("Please include an API id")
return errors.New("Please include an API Id")
}
} else {
inputs.ID = args[0]
}

if shouldPrompt(cmd, apiName) {
if shouldPromptWhenFlagless(cmd, apiName) {
input := prompt.TextInput(apiName, "Name:", "Name of the API.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
}

if shouldPrompt(cmd, apiScopes) {
if shouldPromptWhenFlagless(cmd, apiScopes) {
input := prompt.TextInput(apiScopes, "Scopes:", "Space-separated list of scopes.", false)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
}

api := &management.ResourceServer{Name: &inputs.Name}

if inputs.Scopes != "" {
api.Scopes = getScopes(inputs.Scopes)
}
api := &management.ResourceServer{}

err := ansi.Spinner("Updating API", func() error {
current, err := cli.api.ResourceServer.Read(inputs.ID)

if err != nil {
return fmt.Errorf("Unable to load API. The Id %v specified doesn't exist", inputs.ID)
}

if len(inputs.Name) == 0 {
api.Name = current.Name
} else {
api.Name = &inputs.Name
}

if len(inputs.Scopes) == 0 {
api.Scopes = current.Scopes
} else {
api.Scopes = apiScopesFor(inputs.Scopes)
}

return cli.api.ResourceServer.Update(inputs.ID, api)
})

if err != nil {
return fmt.Errorf("An unexpected error occurred while trying to update an API with id %s: %w", inputs.ID, err)
return fmt.Errorf("An unexpected error occurred while trying to update an API with Id %s: %w", inputs.ID, err)
}

cli.renderer.ApiUpdate(api)
Expand Down Expand Up @@ -299,14 +313,14 @@ auth0 apis delete <id>
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, apiID) {
if canPrompt(cmd) {
input := prompt.TextInput(apiID, "Id:", "Id of the API.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
} else {
return errors.New("Please include an API id")
return errors.New("Please include an API Id")
}
} else {
inputs.ID = args[0]
Expand All @@ -321,7 +335,7 @@ auth0 apis delete <id>
return ansi.Spinner("Deleting API", func() error {
err := cli.api.ResourceServer.Delete(inputs.ID)
if err != nil {
return fmt.Errorf("An unexpected error occurred while attempting to delete an API with id %s: %w", inputs.ID, err)
return fmt.Errorf("An unexpected error occurred while attempting to delete an API with Id %s: %w", inputs.ID, err)
}
return nil
})
Expand Down Expand Up @@ -349,14 +363,14 @@ auth0 apis scopes list <id>
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
if shouldPrompt(cmd, apiID) {
if canPrompt(cmd) {
input := prompt.TextInput(apiID, "Id:", "Id of the API.", true)

if err := prompt.AskOne(input, &inputs); err != nil {
return fmt.Errorf("An unexpected error occurred: %w", err)
}
} else {
return errors.New("Please include an API id")
return errors.New("Please include an API Id")
}
} else {
inputs.ID = args[0]
Expand All @@ -371,7 +385,7 @@ auth0 apis scopes list <id>
})

if err != nil {
return fmt.Errorf("An unexpected error occurred while getting scopes for an API with id %s: %w", inputs.ID, err)
return fmt.Errorf("An unexpected error occurred while getting scopes for an API with Id %s: %w", inputs.ID, err)
}

cli.renderer.ScopesList(api.GetName(), api.Scopes)
Expand All @@ -382,7 +396,7 @@ auth0 apis scopes list <id>
return cmd
}

func getScopes(scopes string) []*management.ResourceServerScope {
func apiScopesFor(scopes string) []*management.ResourceServerScope {
list := strings.Fields(scopes)
models := []*management.ResourceServerScope{}

Expand Down
Loading