From 627cf6f7a97a935ea2f471e81c21a7e4e62ac5d5 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 27 Jan 2021 13:17:15 -0300 Subject: [PATCH 1/4] feat: prompts for actions --- internal/cli/actions.go | 385 ++++++++++++++++++++++++++-------- internal/cli/apis.go | 10 +- internal/cli/rules.go | 9 +- internal/cli/try_login.go | 2 +- internal/prompt/prompt.go | 19 +- internal/validators/action.go | 18 +- 6 files changed, 334 insertions(+), 109 deletions(-) diff --git a/internal/cli/actions.go b/internal/cli/actions.go index 5b1330d26..77d9633c5 100644 --- a/internal/cli/actions.go +++ b/internal/cli/actions.go @@ -15,6 +15,17 @@ import ( "gopkg.in/auth0.v5/management" ) +const ( + actionID = "id" + actionName = "name" + actionVersion = "version" + actionFile = "file" + actionScript = "script" + actionDependency = "dependencies" + actionPath = "path" + actionTrigger = "trigger" +) + func actionsCmd(cli *cli) *cobra.Command { cmd := &cobra.Command{ Use: "actions", @@ -93,24 +104,54 @@ func readJsonFile(filePath string, out interface{}) error { } func testActionCmd(cli *cli) *cobra.Command { - var actionId string - var versionId string - var payloadFile string + var flags struct { + ID string + File string + Version string + } + var payload = make(management.Object) cmd := &cobra.Command{ Use: "test", Short: "Test an action draft against a payload", - Long: `$ auth0 actions test --name --file `, + Long: `$ auth0 actions test --id --file `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - err := readJsonFile(payloadFile, &payload) + if shouldPrompt(cmd, actionID) { + input := prompt.TextInput(actionID, "Id:", "Action Id to test.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionFile) { + input := prompt.TextInput(actionFile, "File:", "File containing the payload for the test.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionVersion) { + input := prompt.TextInputDefault(actionVersion, "Version Id:", "Version ID of the action to test. Default: draft", "draft", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + err := readJsonFile(flags.File, &payload) if err != nil { return err } var result management.Object - err = ansi.Spinner(fmt.Sprintf("Testing action: %s, version: %s", actionId, versionId), func() error { - result, err = cli.api.ActionVersion.Test(actionId, versionId, payload) + err = ansi.Spinner(fmt.Sprintf("Testing action: %s, version: %s", flags.ID, flags.Version), func() error { + result, err = cli.api.ActionVersion.Test(flags.ID, flags.Version, payload) return err }) @@ -123,27 +164,47 @@ func testActionCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVar(&actionId, "name", "", "Action ID to to test") - cmd.Flags().StringVarP(&payloadFile, "file", "f", "", "File containing the payload for the test") - cmd.Flags().StringVarP(&versionId, "version", "v", "draft", "Version ID of the action to test") - - mustRequireFlags(cmd, "name", "file") + cmd.Flags().StringVarP(&flags.ID, actionID, "i", "", "Action Id to test.") + cmd.Flags().StringVarP(&flags.File, actionFile, "f", "", "File containing the payload for the test.") + cmd.Flags().StringVarP(&flags.Version, actionVersion, "v", "draft", "Version Id of the action to test.") + mustRequireFlags(cmd, actionID, actionFile) return cmd } func deployActionCmd(cli *cli) *cobra.Command { - var actionId string - var versionId string + var flags struct { + ID string + Version string + } cmd := &cobra.Command{ Use: "deploy", Short: "Deploys the action version", - Long: `$ auth0 actions deploy --name --version `, + Long: `$ auth0 actions deploy --id --version `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { + if shouldPrompt(cmd, actionID) { + input := prompt.TextInput(actionID, "Id:", "Action Id to deploy.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionVersion) { + input := prompt.TextInputDefault(actionVersion, "Version Id:", "Version ID of the action to deploy. Default: draft", "draft", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + var version *management.ActionVersion - err := ansi.Spinner(fmt.Sprintf("Deploying action: %s, version: %s", actionId, versionId), func() (err error) { - version, err = cli.api.ActionVersion.Deploy(actionId, versionId) + err := ansi.Spinner(fmt.Sprintf("Deploying action: %s, version: %s", flags.ID, flags.Version), func() (err error) { + version, err = cli.api.ActionVersion.Deploy(flags.ID, flags.Version) return err }) @@ -157,32 +218,60 @@ func deployActionCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVar(&actionId, "name", "", "Action ID to deploy") - cmd.Flags().StringVarP(&versionId, "version", "v", "draft", "Version ID of the action to deploy") - - mustRequireFlags(cmd, "name") + cmd.Flags().StringVarP(&flags.ID, actionID, "i", "", "Action Id to deploy.") + cmd.Flags().StringVarP(&flags.Version, actionVersion, "v", "draft", "Version Id of the action to deploy.") + mustRequireFlags(cmd, actionID) return cmd } func downloadActionCmd(cli *cli) *cobra.Command { - var actionId string - var versionId string - var path string + var flags struct { + ID string + Version string + Path string + } cmd := &cobra.Command{ Use: "download", Short: "Download the action version", - Long: `$ auth0 actions download --name --version `, + Long: `$ auth0 actions download --id --version `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - cli.renderer.Infof("It will overwrite files in %s", path) + if shouldPrompt(cmd, actionID) { + input := prompt.TextInput(actionID, "Id:", "Action Id to download.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionVersion) { + input := prompt.TextInputDefault(actionVersion, "Version Id:", "Version ID of the action to deploy or draft. Default: draft", "draft", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionPath) { + input := prompt.TextInputDefault(actionPath, "Path:", "Path to save the action content.", "./", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + cli.renderer.Infof("It will overwrite files in %s", flags.Path) if confirmed := prompt.Confirm("Do you wish to proceed?"); !confirmed { return nil } var version *management.ActionVersion - err := ansi.Spinner(fmt.Sprintf("Downloading action: %s, version: %s", actionId, versionId), func() (err error) { - if version, err = cli.api.ActionVersion.Read(actionId, versionId); err != nil { + err := ansi.Spinner(fmt.Sprintf("Downloading action: %s, version: %s", flags.ID, flags.Version), func() (err error) { + if version, err = cli.api.ActionVersion.Read(flags.ID, flags.Version); err != nil { return err } @@ -196,9 +285,9 @@ func downloadActionCmd(cli *cli) *cobra.Command { return err } - cli.renderer.Infof("Code downloaded to %s/code.js", path) + cli.renderer.Infof("Code downloaded to %s/code.js", flags.Path) - if err := ioutil.WriteFile(path+"/code.js", []byte(version.Code), 0644); err != nil { + if err := ioutil.WriteFile(flags.Path+"/code.js", []byte(version.Code), 0644); err != nil { return err } @@ -208,7 +297,7 @@ func downloadActionCmd(cli *cli) *cobra.Command { return err } - if err := ioutil.WriteFile(path+"/metadata.json", metadata, 0644); err != nil { + if err := ioutil.WriteFile(flags.Path+"/metadata.json", metadata, 0644); err != nil { return err } @@ -216,26 +305,38 @@ func downloadActionCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVar(&actionId, "name", "", "Action ID to deploy") - cmd.Flags().StringVarP(&versionId, "version", "v", "draft", "Version ID of the action to deploy or draft, default: draft") - cmd.Flags().StringVarP(&path, "path", "p", "./", "Path to save the action content") - - mustRequireFlags(cmd, "name") + cmd.Flags().StringVarP(&flags.ID, actionID, "i", "", "Action ID to download.") + cmd.Flags().StringVarP(&flags.Version, actionVersion, "v", "draft", "Version ID of the action to deploy or draft. Default: draft") + cmd.Flags().StringVarP(&flags.Path, actionPath, "p", "./", "Path to save the action content.") + mustRequireFlags(cmd, actionID) return cmd } func listActionVersionsCmd(cli *cli) *cobra.Command { - var actionId string + var flags struct { + ID string + } cmd := &cobra.Command{ Use: "versions", Short: "Lists the action versions", - Long: `$ auth0 actions versions --name `, + Long: `$ auth0 actions versions --id `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { + if shouldPrompt(cmd, actionID) { + input := prompt.TextInput(actionID, "Id:", "Action Id to show versions.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + var list *management.ActionVersionList - err := ansi.Spinner(fmt.Sprintf("Loading versions for action: %s", actionId), func() (err error) { - list, err = cli.api.ActionVersion.List(actionId) + err := ansi.Spinner(fmt.Sprintf("Loading versions for action: %s", flags.ID), func() (err error) { + list, err = cli.api.ActionVersion.List(flags.ID) return err }) @@ -249,22 +350,21 @@ func listActionVersionsCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVar(&actionId, "name", "", "Action ID to show versions") - - mustRequireFlags(cmd, "name") + cmd.Flags().StringVarP(&flags.ID, actionID, "i", "", "Action Id to show versions.") + mustRequireFlags(cmd, actionID) return cmd } func createActionCmd(cli *cli) *cobra.Command { - var ( - name string - trigger string - file string - script string - dependency []string - createVersion bool - ) + var flags struct { + Name string + Trigger string + File string + Script string + Dependency []string + CreateVersion bool + } cmd := &cobra.Command{ Use: "create", @@ -272,24 +372,66 @@ func createActionCmd(cli *cli) *cobra.Command { Long: `$ auth0 actions create Creates a new action: - $ auth0 actions create --name my-action --trigger post-login --file action.js --dependency lodash@4.17.19 + $ auth0 actions create --name my-action --trigger post-login --file action.js --dependency lodash@4.17.19 `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - if err := validators.TriggerID(trigger); err != nil { + if shouldPrompt(cmd, actionName) { + input := prompt.TextInput(actionName, "Name:", "Action name to create.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionTrigger) { + input := prompt.SelectInput( + actionTrigger, + "Trigger:", + "Trigger type for action.", + validators.ValidTriggerIDs, + false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionFile) { + input := prompt.TextInput(actionFile, "File:", "File containing the action source code.", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionScript) { + input := prompt.TextInput(actionScript, "Script:", "Raw source code for the action.", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + // TODO: Add prompt for dependency and version + + if err := validators.TriggerID(flags.Trigger); err != nil { return err } - source, err := sourceFromFileOrScript(file, script) + source, err := sourceFromFileOrScript(flags.File, flags.Script) if err != nil { return err } - dependencies, err := validators.Dependencies(dependency) + dependencies, err := validators.Dependencies(flags.Dependency) if err != nil { return err } - triggerID := management.TriggerID(trigger) + triggerID := management.TriggerID(flags.Trigger) triggers := []management.Trigger{ { ID: &triggerID, @@ -298,7 +440,7 @@ Creates a new action: } action := &management.Action{ - Name: auth0.String(name), + Name: auth0.String(flags.Name), SupportedTriggers: &triggers, } @@ -313,7 +455,7 @@ Creates a new action: return err } - if createVersion { + if flags.CreateVersion { if err := cli.api.ActionVersion.Create(auth0.StringValue(action.ID), version); err != nil { return err } @@ -353,16 +495,16 @@ Creates a new action: }, } - cmd.Flags().StringVarP(&name, "name", "n", "", "Unique name for the action.") - cmd.Flags().StringVarP(&trigger, "trigger", "t", string(management.PostLogin), "Trigger type for action.") - cmd.Flags().StringVarP(&file, "file", "f", "", "File containing the action source code.") - cmd.Flags().StringVarP(&script, "script", "s", "", "Raw source code for the action.") - cmd.Flags().StringSliceVarP(&dependency, "dependency", "d", nil, "Dependency for the source code (@).") + cmd.Flags().StringVarP(&flags.Name, actionName, "n", "", "Action name to create.") + cmd.Flags().StringVarP(&flags.Trigger, actionTrigger, "t", string(management.PostLogin), "Trigger type for action.") + cmd.Flags().StringVarP(&flags.File, actionFile, "f", "", "File containing the action source code.") + cmd.Flags().StringVarP(&flags.Script, actionScript, "s", "", "Raw source code for the action.") + cmd.Flags().StringSliceVarP(&flags.Dependency, actionDependency, "d", nil, "Dependency for the source code (@).") // TODO: This name is kind of overloaded since it could also refer to the version of the trigger (though there's only v1's at this time) - cmd.Flags().BoolVarP(&createVersion, "version", "v", false, "Create an explicit action version from the source code instead of a draft.") + cmd.Flags().BoolVarP(&flags.CreateVersion, actionVersion, "v", false, "Create an explicit action version from the source code instead of a draft.") - mustRequireFlags(cmd, "name") - if err := cmd.MarkFlagFilename("file"); err != nil { + mustRequireFlags(cmd, actionName) + if err := cmd.MarkFlagFilename(actionFile); err != nil { panic(err) } @@ -370,18 +512,36 @@ Creates a new action: } func showTriggerCmd(cli *cli) *cobra.Command { - var trigger string + var flags struct { + Trigger string + } cmd := &cobra.Command{ Use: "show", Short: "Show actions by trigger", Long: `$ auth0 actions triggers show --trigger post-login`, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - if err := validators.TriggerID(trigger); err != nil { + if shouldPrompt(cmd, actionTrigger) { + input := prompt.SelectInput( + actionTrigger, + "Trigger:", + "Trigger type for action.", + validators.ValidTriggerIDs, + false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if err := validators.TriggerID(flags.Trigger); err != nil { return err } - triggerID := management.TriggerID(trigger) + triggerID := management.TriggerID(flags.Trigger) var list *management.ActionBindingList err := ansi.Spinner("Loading actions", func() (err error) { @@ -398,33 +558,59 @@ func showTriggerCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVarP(&trigger, "trigger", "t", string(management.PostLogin), "Trigger type for action.") + cmd.Flags().StringVarP(&flags.Trigger, actionTrigger, "t", string(management.PostLogin), "Trigger type for action.") return cmd } func reorderTriggerCmd(cli *cli) *cobra.Command { - var trigger string - var bindingsFile string + var flags struct { + File string + Trigger string + } cmd := &cobra.Command{ Use: "reorder", Short: "Reorders actions by trigger", Long: `$ auth0 actions triggers reorder --trigger --file `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - if err := validators.TriggerID(trigger); err != nil { + if shouldPrompt(cmd, actionFile) { + input := prompt.TextInput(actionFile, "File:", "File containing the bindings.", true) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, actionTrigger) { + input := prompt.SelectInput( + actionTrigger, + "Trigger:", + "Trigger type for action.", + validators.ValidTriggerIDs, + false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if err := validators.TriggerID(flags.Trigger); err != nil { return err } - triggerID := management.TriggerID(trigger) + triggerID := management.TriggerID(flags.Trigger) var list *management.ActionBindingList - err := readJsonFile(bindingsFile, &list) + err := readJsonFile(flags.File, &list) if err != nil { return err } - err = ansi.Spinner("Reordoring actions", func() (err error) { + err = ansi.Spinner("Reordering actions", func() (err error) { if _, err = cli.api.ActionBinding.Update(triggerID, list.Bindings); err != nil { return err } @@ -443,33 +629,60 @@ func reorderTriggerCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVarP(&trigger, "trigger", "t", string(management.PostLogin), "Trigger type for action.") - cmd.Flags().StringVarP(&bindingsFile, "file", "f", "", "File containing the bindings") + cmd.Flags().StringVarP(&flags.File, actionFile, "f", "", "File containing the bindings.") + cmd.Flags().StringVarP(&flags.Trigger, actionTrigger, "t", string(management.PostLogin), "Trigger type for action.") + mustRequireFlags(cmd, actionFile) return cmd } func createTriggerCmd(cli *cli) *cobra.Command { - var trigger string - var actionId string + var flags struct { + Action string + Trigger string + } cmd := &cobra.Command{ Use: "create", Short: "Bind an action to a trigger", - Long: `$ auth0 actions triggers create --trigger --name `, + Long: `$ auth0 actions triggers create --trigger --action `, + PreRun: func(cmd *cobra.Command, args []string) { + prepareInteractivity(cmd) + }, RunE: func(cmd *cobra.Command, args []string) error { - if err := validators.TriggerID(trigger); err != nil { + if shouldPrompt(cmd, actionTrigger) { + input := prompt.SelectInput( + actionTrigger, + "Trigger:", + "Trigger type for action.", + validators.ValidTriggerIDs, + false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if shouldPrompt(cmd, "action") { + input := prompt.TextInput("action", "Action Id:", "Action Id to bind.", false) + + if err := prompt.AskOne(input, &flags); err != nil { + return err + } + } + + if err := validators.TriggerID(flags.Trigger); err != nil { return err } - triggerID := management.TriggerID(trigger) + triggerID := management.TriggerID(flags.Trigger) var binding *management.ActionBinding var list *management.ActionBindingList err := ansi.Spinner("Adding action", func() (err error) { var action *management.Action - if action, err = cli.api.Action.Read(actionId); err != nil { + if action, err = cli.api.Action.Read(flags.Action); err != nil { return err } @@ -501,8 +714,8 @@ func createTriggerCmd(cli *cli) *cobra.Command { }, } - cmd.Flags().StringVarP(&trigger, "trigger", "t", string(management.PostLogin), "Trigger type for action.") - cmd.Flags().StringVar(&actionId, "name", "", "Action ID to to test") + cmd.Flags().StringVarP(&flags.Trigger, actionTrigger, "t", string(management.PostLogin), "Trigger type for action.") + cmd.Flags().StringVarP(&flags.Action, "action", "a", "", "Action Id to bind.") return cmd } diff --git a/internal/cli/apis.go b/internal/cli/apis.go index c190051e5..919623cdf 100644 --- a/internal/cli/apis.go +++ b/internal/cli/apis.go @@ -77,7 +77,7 @@ auth0 apis show --id id }, RunE: func(cmd *cobra.Command, args []string) error { if shouldPrompt(cmd, apiID) { - input := prompt.TextInput(apiID, "Id:", "Id of the API.", "", true) + input := prompt.TextInput(apiID, "Id:", "Id of the API.", true) if err := prompt.AskOne(input, &flags); err != nil { return err @@ -128,7 +128,6 @@ auth0 apis create --name myapi --identifier http://my-api input := prompt.TextInput( apiName, "Name:", "Name of the API. You can change the API name later in the API settings.", - "", true) if err := prompt.AskOne(input, &flags); err != nil { @@ -140,7 +139,6 @@ auth0 apis create --name myapi --identifier http://my-api input := prompt.TextInput( apiIdentifier, "Identifier:", "Identifier of the API. Cannot be changed once set.", - "", true) if err := prompt.AskOne(input, &flags); err != nil { @@ -191,7 +189,7 @@ auth0 apis update --id id --name myapi }, RunE: func(cmd *cobra.Command, args []string) error { if shouldPrompt(cmd, apiID) { - input := prompt.TextInput(apiID, "Id:", "Id of the API.", "", true) + input := prompt.TextInput(apiID, "Id:", "Id of the API.", true) if err := prompt.AskOne(input, &flags); err != nil { return err @@ -199,7 +197,7 @@ auth0 apis update --id id --name myapi } if shouldPrompt(cmd, apiName) { - input := prompt.TextInput(apiName, "Name:", "Name of the API.", "", true) + input := prompt.TextInput(apiName, "Name:", "Name of the API.", true) if err := prompt.AskOne(input, &flags); err != nil { return err @@ -245,7 +243,7 @@ auth0 apis delete --id id }, RunE: func(cmd *cobra.Command, args []string) error { if shouldPrompt(cmd, apiID) { - input := prompt.TextInput(apiID, "Id:", "Id of the API.", "", true) + input := prompt.TextInput(apiID, "Id:", "Id of the API.", true) if err := prompt.AskOne(input, &flags); err != nil { return err diff --git a/internal/cli/rules.go b/internal/cli/rules.go index 43c909367..bdf762a65 100644 --- a/internal/cli/rules.go +++ b/internal/cli/rules.go @@ -76,7 +76,6 @@ func enableRuleCmd(cli *cli) *cobra.Command { input := prompt.TextInput( ruleName, "Name:", "Name of the rule.", - "", true) if err := prompt.AskOne(input, &flags); err != nil { @@ -142,7 +141,6 @@ func disableRuleCmd(cli *cli) *cobra.Command { input := prompt.TextInput( ruleName, "Name:", "Name of the rule.", - "", true) if err := prompt.AskOne(input, &flags); err != nil { @@ -214,7 +212,6 @@ func createRulesCmd(cli *cli) *cobra.Command { input := prompt.TextInput( "name", "Name:", "Name of the rule. You can change the rule name later in the rule settings.", - "", true) if err := prompt.AskOne(input, &flags); err != nil { @@ -223,7 +220,7 @@ func createRulesCmd(cli *cli) *cobra.Command { } if shouldPrompt(cmd, ruleScript) { - input := prompt.TextInput(ruleScript, "Script:", "Script of the rule.", "", true) + input := prompt.TextInput(ruleScript, "Script:", "Script of the rule.", true) if err := prompt.AskOne(input, &flags); err != nil { return err @@ -231,7 +228,7 @@ func createRulesCmd(cli *cli) *cobra.Command { } if shouldPrompt(cmd, ruleOrder) { - input := prompt.TextInput(ruleOrder, "Order:", "Order of the rule.", "0", false) + input := prompt.TextInputDefault(ruleOrder, "Order:", "Order of the rule.", "0", false) if err := prompt.AskOne(input, &flags); err != nil { return err @@ -297,7 +294,7 @@ func deleteRulesCmd(cli *cli) *cobra.Command { }, RunE: func(cmd *cobra.Command, args []string) error { if shouldPrompt(cmd, ruleID) { - input := prompt.TextInput(ruleID, "Id:", "Id of the rule.", "", true) + input := prompt.TextInput(ruleID, "Id:", "Id of the rule.", true) if err := prompt.AskOne(input, &flags); err != nil { return err diff --git a/internal/cli/try_login.go b/internal/cli/try_login.go index 8a2629d72..e6dc2e543 100644 --- a/internal/cli/try_login.go +++ b/internal/cli/try_login.go @@ -99,7 +99,7 @@ Launch a browser to try out your universal login box for the given client. } cmd.SetUsageTemplate(resourceUsageTemplate()) - cmd.Flags().StringVarP(&clientID, "client-id", "c", "", "Client ID for which to test login.") + cmd.Flags().StringVarP(&clientID, "client-id", "c", "", "Client Id for which to test login.") cmd.Flags().StringVarP(&connectionName, "connection", "", "", "Connection to test during login.") return cmd } diff --git a/internal/prompt/prompt.go b/internal/prompt/prompt.go index 1f0b09684..53dd84590 100644 --- a/internal/prompt/prompt.go +++ b/internal/prompt/prompt.go @@ -24,7 +24,7 @@ func askOne(prompt survey.Prompt, response interface{}) error { return survey.AskOne(prompt, response, stdErrWriter, icons) } -func TextInput(name string, message string, help string, value string, required bool) *survey.Question { +func TextInputDefault(name string, message string, help string, value string, required bool) *survey.Question { input := &survey.Question{ Name: name, Prompt: &survey.Input{Message: message, Help: help, Default: value}, @@ -37,6 +37,10 @@ func TextInput(name string, message string, help string, value string, required return input } +func TextInput(name string, message string, help string, required bool) *survey.Question { + return TextInputDefault(name, message, help, "", required) +} + func BoolInput(name string, message string, help string, required bool) *survey.Question { input := &survey.Question{ Name: name, @@ -51,6 +55,19 @@ func BoolInput(name string, message string, help string, required bool) *survey. return input } +func SelectInput(name string, message string, help string, options []string, required bool) *survey.Question { + input := &survey.Question{ + Name: name, + Prompt: &survey.Select{Message: message, Help: help, Options: options}, + } + + if required { + input.Validate = survey.Required + } + + return input +} + func Confirm(message string) bool { result := false prompt := &survey.Confirm{ diff --git a/internal/validators/action.go b/internal/validators/action.go index 528b43f69..9e81cef13 100644 --- a/internal/validators/action.go +++ b/internal/validators/action.go @@ -8,22 +8,22 @@ import ( "gopkg.in/auth0.v5/management" ) +var ValidTriggerIDs = []string{ + string(management.PostLogin), + string(management.ClientCredentials), + string(management.PreUserRegistration), + string(management.PostUserRegistration), +} + // TriggerID checks that the provided trigger is valid. func TriggerID(trigger string) error { - allTriggerIDs := []string{ - string(management.PostLogin), - string(management.ClientCredentials), - string(management.PreUserRegistration), - string(management.PostUserRegistration), - } - - for _, id := range allTriggerIDs { + for _, id := range ValidTriggerIDs { if trigger == id { return nil } } - return fmt.Errorf("%s is not a valid trigger type (%s)", trigger, strings.Join(allTriggerIDs, ", ")) + return fmt.Errorf("%s is not a valid trigger type (%s)", trigger, strings.Join(ValidTriggerIDs, ", ")) } var semverRe = regexp.MustCompile(`^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`) From e05ab654a08b4a3809cb06a336f49662c1a9a44b Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 27 Jan 2021 13:36:35 -0300 Subject: [PATCH 2/4] Address feedback --- internal/cli/actions.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/internal/cli/actions.go b/internal/cli/actions.go index 77d9633c5..e3d7c2058 100644 --- a/internal/cli/actions.go +++ b/internal/cli/actions.go @@ -400,22 +400,14 @@ Creates a new action: } if shouldPrompt(cmd, actionFile) { - input := prompt.TextInput(actionFile, "File:", "File containing the action source code.", false) + input := prompt.TextInput(actionFile, "Action File:", "File containing the action source code.", false) if err := prompt.AskOne(input, &flags); err != nil { return err } } - if shouldPrompt(cmd, actionScript) { - input := prompt.TextInput(actionScript, "Script:", "Raw source code for the action.", false) - - if err := prompt.AskOne(input, &flags); err != nil { - return err - } - } - - // TODO: Add prompt for dependency and version + // TODO: Add prompt for script, dependency and version if err := validators.TriggerID(flags.Trigger); err != nil { return err From 5f521df1d504674d25a9763ce4847a38c2c4ef62 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 27 Jan 2021 13:58:22 -0300 Subject: [PATCH 3/4] Use latest version of goreleaser/goreleaser-action --- .github/workflows/goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 0f9dded95..b216cc85b 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -20,7 +20,7 @@ jobs: go-version: 1.14 - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v1.3.1 + uses: goreleaser/goreleaser-action@v2.4.1 with: version: latest args: release --rm-dist From ad181447e02f22c2c6af7fd2b90f8ba0815dc1a3 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 27 Jan 2021 14:02:04 -0300 Subject: [PATCH 4/4] Use golang 1.15 --- .github/workflows/go.yml | 4 ++-- .github/workflows/goreleaser.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7d466c5a1..ae475136a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -6,10 +6,10 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index b216cc85b..4ba810003 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -14,10 +14,10 @@ jobs: - name: Unshallow run: git fetch --prune --unshallow - - name: Set up Go 1.14 + - name: Set up Go 1.15 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.15 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2.4.1