apps, apis, rules: first stab at generalizing picker options [CLI-82] (…

…#182)
auth0 · Mar 24, 2021 · e613117 · e613117
1 parent 7146381
commit e613117
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 83 deletions.
diff --git a/internal/cli/apis.go b/internal/cli/apis.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/auth0/auth0-cli/internal/ansi"
@@ -113,7 +114,8 @@ auth0 apis show <id>
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				if err := apiID.Ask(cmd, &inputs.ID); err != nil {
+				err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -217,7 +219,8 @@ auth0 apis update <id> --name myapi
 			var current *management.ResourceServer
 
 			if len(args) == 0 {
-				if err := apiID.Ask(cmd, &inputs.ID); err != nil {
+				err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -289,7 +292,8 @@ auth0 apis delete <id>
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				if err := apiID.Ask(cmd, &inputs.ID); err != nil {
+				err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -333,7 +337,8 @@ auth0 apis scopes list <id>
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				if err := apiID.Ask(cmd, &inputs.ID); err != nil {
+				err := apiID.Pick(cmd, &inputs.ID, cli.apiPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -368,3 +373,25 @@ func apiScopesFor(scopes []string) []*management.ResourceServerScope {
 
 	return models
 }
+
+func (c *cli) apiPickerOptions() (pickerOptions, error) {
+	list, err := c.api.ResourceServer.List()
+	if err != nil {
+		return nil, err
+	}
+
+	// NOTE: because client names are not unique, we'll just number these
+	// labels.
+	var opts pickerOptions
+	for _, r := range list.ResourceServers {
+		label := fmt.Sprintf("%s %s", r.GetName(), ansi.Faint("("+r.GetIdentifier()+")"))
+
+		opts = append(opts, pickerOption{value: r.GetID(), label: label})
+	}
+
+	if len(opts) == 0 {
+		return nil, errors.New("There are currently no applications.")
+	}
+
+	return opts, nil
+}
diff --git a/internal/cli/apps.go b/internal/cli/apps.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -165,7 +166,8 @@ auth0 apps show <id>
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				if err := appID.Ask(cmd, &inputs.ID); err != nil {
+				err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -209,7 +211,8 @@ auth0 apps delete <id>
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
-				if err := appID.Ask(cmd, &inputs.ID); err != nil {
+				err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -389,9 +392,9 @@ auth0 apps update <id> --name myapp --type [native|spa|regular|m2m]
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var current *management.Client
 
-			// Get app id
 			if len(args) == 0 {
-				if err := appID.Ask(cmd, &inputs.ID); err != nil {
+				err := appID.Pick(cmd, &inputs.ID, cli.appPickerOptions)
+				if err != nil {
 					return err
 				}
 			} else {
@@ -680,3 +683,26 @@ func interfaceToStringSlice(s []interface{}) []string {
 	}
 	return result
 }
+
+func (c *cli) appPickerOptions() (pickerOptions, error) {
+	list, err := c.api.Client.List()
+	if err != nil {
+		return nil, err
+	}
+
+	// NOTE: because client names are not unique, we'll just number these
+	// labels.
+	var opts pickerOptions
+	for _, c := range list.Clients {
+		value := c.GetClientID()
+		label := fmt.Sprintf("%s %s", c.GetName(), ansi.Faint("("+value+")"))
+
+		opts = append(opts, pickerOption{value: value, label: label})
+	}
+
+	if len(opts) == 0 {
+		return nil, errors.New("There are currently no applications.")
+	}
+
+	return opts, nil
+}
diff --git a/internal/cli/arguments.go b/internal/cli/arguments.go
@@ -3,6 +3,7 @@ package cli
 import (
 	"fmt"
 
+	"github.com/auth0/auth0-cli/internal/ansi"
 	"github.com/spf13/cobra"
 )
 
@@ -31,10 +32,42 @@ func (a *Argument) Ask(cmd *cobra.Command, value interface{}) error {
 	return askArgument(cmd, a, value)
 }
 
+type pickerOptionsFunc func() (pickerOptions, error)
+
+func (a *Argument) Pick(cmd *cobra.Command, result *string, fn pickerOptionsFunc) error {
+	var opts pickerOptions
+	err := ansi.Waiting(func() error {
+		var err error
+		opts, err = fn()
+		return err
+	})
+
+	if err != nil {
+		return err
+	}
+
+	defaultLabel := opts.defaultLabel()
+	var val string
+	if err := selectArgument(cmd, a, &val, opts.labels(), &defaultLabel); err != nil {
+		return err
+	}
+
+	*result = opts.getValue(val)
+	return nil
+}
+
+func selectArgument(cmd *cobra.Command, a *Argument, value interface{}, options []string, defaultValue *string) error {
+	if canPrompt(cmd) {
+		return _select(cmd, a, value, options, defaultValue, false)
+	}
+
+	return fmt.Errorf("Missing a required argument: %s", a.GetName())
+}
+
 func askArgument(cmd *cobra.Command, i commandInput, value interface{}) error {
 	if canPrompt(cmd) {
 		return ask(cmd, i, value, nil, true)
-	} else {
-		return fmt.Errorf("Missing a required argument: %s", i.GetName())
 	}
+
+	return fmt.Errorf("Missing a required argument: %s", i.GetName())
 }
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -381,11 +381,3 @@ func prepareInteractivity(cmd *cobra.Command) {
 		})
 	}
 }
-
-func flagOptionsFromMapping(mapping map[string]string) []string {
-	result := make([]string, 0, len(mapping))
-	for k := range mapping {
-		result = append(result, k)
-	}
-	return result
-}
diff --git a/internal/cli/picker_options.go b/internal/cli/picker_options.go
@@ -0,0 +1,32 @@
+package cli
+
+type pickerOptions []pickerOption
+
+func (p pickerOptions) labels() []string {
+	result := make([]string, 0, len(p))
+	for _, o := range p {
+		result = append(result, o.label)
+	}
+	return result
+}
+
+func (p pickerOptions) defaultLabel() string {
+	if len(p) > 0 {
+		return p[0].label
+	}
+	return ""
+}
+
+func (p pickerOptions) getValue(label string) string {
+	for _, o := range p {
+		if o.label == label {
+			return o.value
+		}
+	}
+	return ""
+}
+
+type pickerOption struct {
+	label string
+	value string
+}