-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor arguments in apps and apis commands [CLI-78] (#177)
* Refactor arguments in apps and apis commands * Add missing return statement * Rename method * Make commandInput private
- Loading branch information
Showing
5 changed files
with
141 additions
and
98 deletions.
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) | ||
| } |