-
Notifications
You must be signed in to change notification settings - Fork 55
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.
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 arguments in apps and apis commands [CLI-78] #177
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b0c57ea
Refactor arguments in apps and apis commands
Widcket a48c2dc
Add missing return statement
Widcket adb48b6
Rename method
Widcket 0e509a0
Merge branch 'main' into refactor-arguments
Widcket 170d9e5
Make commandInput private
Widcket File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type Argument struct { | ||
| Name string | ||
| Help string | ||
| IsRequired bool | ||
| } | ||
|
|
||
| func (a Argument) GetName() string { | ||
| return a.Name | ||
| } | ||
|
|
||
| func (a Argument) GetLabel() string { | ||
| return inputLabel(a.Name) | ||
| } | ||
|
|
||
| func (a Argument) GetHelp() string { | ||
| return a.Help | ||
| } | ||
|
|
||
| func (a Argument) GetIsRequired() bool { | ||
| return a.IsRequired | ||
| } | ||
|
|
||
| func (a *Argument) Ask(cmd *cobra.Command, value interface{}) error { | ||
| return askArgument(cmd, a, value) | ||
| } | ||
|
|
||
| func askArgument(cmd *cobra.Command, i CommandInput, value interface{}) error { | ||
| if canPrompt(cmd) { | ||
| return ask(cmd, i, value, true) | ||
| } else { | ||
| return fmt.Errorf("Missing a required argument: %s", i.GetName()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/auth0/auth0-cli/internal/prompt" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type CommandInput interface { | ||
| GetName() string | ||
| GetLabel() string | ||
| GetHelp() string | ||
| GetIsRequired() bool | ||
| } | ||
|
|
||
| func ask(cmd *cobra.Command, i CommandInput, value interface{}, isUpdate bool) error { | ||
| isRequired := !isUpdate && i.GetIsRequired() | ||
| input := prompt.TextInput("", i.GetLabel(), i.GetHelp(), isRequired) | ||
|
|
||
| if err := prompt.AskOne(input, value); err != nil { | ||
| return unexpectedError(err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func _select(cmd *cobra.Command, i CommandInput, value interface{}, options []string, isUpdate bool) error { | ||
| isRequired := !isUpdate && i.GetIsRequired() | ||
| input := prompt.SelectInput("", i.GetLabel(), i.GetHelp(), options, isRequired) | ||
|
|
||
| if err := prompt.AskOne(input, value); err != nil { | ||
| return unexpectedError(err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func inputLabel(name string) string { | ||
| return fmt.Sprintf("%s:", name) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nit: this can be made private since we don't expect to use it outside the cli package.