sync(cmd/access): pull from indent core (#6)

* sync(cmd/access): pull from indent core

GitOrigin-RevId: e777d23c52da3b8d77432be71d5917d3c1ce8548

* update indent-go to v1.0.2

---------

Co-authored-by: Dan Gillespie <dan@indent.com>

Author: indent-bot

cmd/access/cmd/auth/login.go

@@ -21,9 +21,9 @@ func NewCmdLogin(f cliutil.Factory) *cobra.Command {
 			opts.OAuth = f.Config().Environment.OAuth
 
 			store := f.Store()
-			if err := store.Login(cmd.Context(), opts); err != nil {
+			if err := store.Login(opts); err != nil {
 				logger.Fatal("Failed to login", zap.Error(err))
-			} else if err = store.UpdateUserInfo(cmd.Context()); err != nil {
+			} else if err = store.UpdateUserInfo(); err != nil {
 				logger.Fatal("Failed to get userinfo", zap.Error(err))
 			}
 			logger.Info("Login successful")

cmd/access/cmd/new.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"go.uber.org/zap"
+
+	petitionscmd "go.indent.com/access/cmd/access/cmd/petitions"
+	"go.indent.com/indent-go/pkg/cliutil"
+)
+
+// NewCmdNew returns a command that interactively creates a Petition.
+func NewCmdNew(f cliutil.Factory) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "new",
+		Short: "Request access",
+		Long:  "Interactively create a Petition to request access to a Resource",
+		Run: func(cmd *cobra.Command, args []string) {
+			logger := f.Logger()
+			createCmd := petitionscmd.NewCmdCreate(f)
+			createCmd.SetContext(cmd.Context())
+			if err := createCmd.Flags().Set("interactive", "true"); err != nil {
+				logger.Fatal("failed to set interactive flag", zap.Error(err))
+			}
+			createCmd.Run(createCmd, nil)
+		},
+	}
+	return cmd
+}

cmd/access/cmd/petitions/create.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
@@ -26,13 +27,15 @@ func NewCreateOptions() *CreateOptions {
 				},
 			},
 		},
+		Output: cliutil.OutputJSON,
 	}
 }
 
 // CreateOptions specify the Petition being created.
 type CreateOptions struct {
 	*indentv1.CreatePetitionRequest
 	ResourceNames []string
+	Interactive   bool
 	Output        string
 }
 
@@ -56,9 +59,12 @@ func NewCmdCreate(f cliutil.Factory) *cobra.Command {
 				},
 			}
 
-			// set petitioner
+			// set petitioner and prompt for missing fields
 			petitioner := f.CurrentUser(cmd.Context())
 			opts.Petition.Petitioners[0] = petitioner
+			if len(opts.Petition.Reason) < common.MinLenReason {
+				opts.Petition.Reason = promptForReason(logger, opts)
+			}
 
 			// create petition
 			petition, err := client.CreatePetition(cmd.Context(), opts.CreatePetitionRequest)
@@ -70,28 +76,63 @@ func NewCmdCreate(f cliutil.Factory) *cobra.Command {
 			// print output
 			if opts.Output == "name" {
 				fmt.Println(petition.Name)
+			} else if opts.Output == cliutil.OutputJSON {
+				f.OutputJSON(petition)
 			}
 		},
 	}
 
 	flags := cmd.Flags()
 	flags.StringArrayVar(&opts.ResourceNames, "resources", opts.ResourceNames, "names of resources being requested")
-	flags.StringVar(&opts.Output, "output", opts.Output, "format that should be output")
+	flags.BoolVar(&opts.Interactive, "interactive", opts.Interactive, "whether to prompt for missing fields")
+	flags.StringVar(&opts.Output, "output", opts.Output, "format that should be output (can be 'name' or 'json')")
 	flags.StringVar(&opts.Petition.Reason, "reason", opts.Output, "reason Petition is being created")
 	return cmd
 }
 
-func resolveResources(ctx context.Context, f cliutil.Factory, options *CreateOptions) (resources []*auditv1.Resource) {
+func resolveResources(ctx context.Context, f cliutil.Factory, opts *CreateOptions) (resources []*auditv1.Resource) {
+	logger := f.Logger()
+
+	// prompt for resource if interactive`
+	if len(opts.ResourceNames) == 0 {
+		if !opts.Interactive {
+			logger.Fatal("No resources specified and not interactive")
+		}
+		resource := f.SelectResource(ctx, common.ViewRequestable)
+		return []*auditv1.Resource{resource}
+	}
+
 	client := f.API(ctx).Resources()
-	for _, resourceName := range options.ResourceNames {
+	for _, resourceName := range opts.ResourceNames {
 		resource, err := client.GetResource(ctx, &indentv1.GetResourceRequest{
 			SpaceName:    f.Config().Space,
 			ResourceName: resourceName,
 		})
 		if err != nil {
-			f.Logger().Fatal("Failed to resolve resource", zap.Error(err), zap.String("resourceName", resourceName))
+			logger.Fatal("Failed to resolve resource", zap.Error(err), zap.String("resourceName", resourceName))
 		}
 		resources = append(resources, resource)
 	}
 	return
 }
+
+func promptForReason(logger *zap.Logger, opts *CreateOptions) string {
+	if !opts.Interactive {
+		logger.Fatal("Invalid reason specified and not interactive", zap.String("reason", opts.Petition.Reason))
+	}
+	prompt := &promptui.Prompt{
+		Label: "Reason",
+		Validate: func(s string) error {
+			if len(s) < common.MinLenReason {
+				return fmt.Errorf("reason must be at least %d characters", common.MinLenReason)
+			}
+			return nil
+		},
+	}
+
+	reason, err := prompt.Run()
+	if err != nil {
+		logger.Fatal("Failed to prompt for reason", zap.Error(err))
+	}
+	return reason
+}

cmd/access/cmd/petitions/list.go

@@ -8,12 +8,19 @@ import (
 	"go.indent.com/indent-go/pkg/cliutil"
 )
 
-const (
-	numPetitionsList = 20
-)
+// NewListOptions returns a new ListOptions.
+func NewListOptions() *ListOptions {
+	return &ListOptions{}
+}
+
+// ListOptions are the options for listing Petitions.
+type ListOptions struct {
+	Output string
+}
 
 // NewCmdList returns a command allowing users to list Petitions.
 func NewCmdList(f cliutil.Factory) *cobra.Command {
+	opts := NewListOptions()
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List Petitions",
@@ -29,15 +36,23 @@ func NewCmdList(f cliutil.Factory) *cobra.Command {
 				logger.Fatal("Failed to list Petitions", zap.Error(err))
 			}
 
-			for i, pet := range petitions.GetPetitions() {
-				logger.Info("Petition", zap.Any("petition", pet))
+			if opts.Output == cliutil.OutputJSON {
+				f.OutputJSON(petitions)
+				return
+			}
 
-				if i > numPetitionsList {
-					break
-				}
+			s, err := cliutil.NewSelect(petitions.GetPetitions())
+			if err != nil {
+				logger.Fatal("Failed to create select", zap.Error(err))
+			} else if result, err := s.Run(); err != nil {
+				logger.Fatal("Failed to run select", zap.Error(err))
+			} else {
+				f.OutputJSON(result)
 			}
 		},
 	}
 
+	flags := cmd.Flags()
+	flags.StringVar(&opts.Output, "output", opts.Output, "Output format (can be 'json')")
 	return cmd
 }

cmd/access/cmd/resources/list.go

@@ -0,0 +1,44 @@
+package resources
+
+import (
+	"github.com/spf13/cobra"
+
+	"go.indent.com/indent-go/pkg/cliutil"
+)
+
+// NewListOptions returns a new ListOptions.
+func NewListOptions() *ListOptions {
+	return &ListOptions{}
+}
+
+// ListOptions are the options for listing Resources.
+type ListOptions struct {
+	View   string
+	Output string
+}
+
+// NewCmdList returns a command allowing users to list Resources.
+func NewCmdList(f cliutil.Factory) *cobra.Command {
+	opts := NewListOptions()
+	cmd := &cobra.Command{
+		Use:   "list",
+		Short: "List Resources",
+		Long:  `List and filter Resources`,
+		Run: func(cmd *cobra.Command, args []string) {
+			if opts.Output == "json" {
+				resources := f.Resources(cmd.Context(), opts.View)
+				f.OutputJSON(resources)
+				return
+			}
+
+			// show prompt to select resource
+			resource := f.SelectResource(cmd.Context(), "")
+			f.OutputJSON(resource)
+		},
+	}
+
+	flags := cmd.Flags()
+	flags.StringVar(&opts.View, "view", opts.View, "View to show")
+	flags.StringVar(&opts.Output, "output", opts.Output, "Output format (can be 'json')")
+	return cmd
+}

cmd/access/cmd/resources/resources.go

@@ -16,6 +16,7 @@ func NewCmdResources(f cliutil.Factory) *cobra.Command {
 such as pulling.`,
 	}
 	cmd.AddCommand(NewCmdCreate(f))
+	cmd.AddCommand(NewCmdList(f))
 	cmd.AddCommand(NewCmdPull(f))
 	return cmd
 }

cmd/access/cmd/root.go

@@ -19,6 +19,7 @@ func NewRoot() *cobra.Command {
 	}
 	f, config := cliutil.New(rootCmd)
 	rootCmd.AddCommand(NewCmdInit(f))
+	rootCmd.AddCommand(NewCmdNew(f))
 	rootCmd.AddCommand(auth.NewCmdAuth(f))
 	rootCmd.AddCommand(configcmd.NewCmdConfig(f))
 	rootCmd.AddCommand(petitions.NewCmdPetitions(f))
@@ -27,6 +28,7 @@ func NewRoot() *cobra.Command {
 	flags := rootCmd.PersistentFlags()
 	flags.StringVar(&config.Space, "space", config.Space, "Space to perform operations in")
 	flags.BoolVar(&config.Staging, "staging", config.Staging, "Use staging environment for request")
+	flags.BoolVar(&config.Headless, "headless", config.Headless, "Run in headless mode (no browser login prompt)")
 	f.Setup()
 	return rootCmd
 }

go.mod

@@ -3,15 +3,17 @@ module go.indent.com/access
 go 1.20
 
 require (
+	github.com/manifoldco/promptui v0.9.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.15.0
-	go.indent.com/indent-go v1.0.1
+	go.indent.com/indent-go v1.0.2
 	go.uber.org/zap v1.24.0
 )
 
 require (
 	cloud.google.com/go/compute v1.14.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
@@ -27,9 +29,11 @@ require (
 	github.com/subosito/gotenv v1.4.2 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/net v0.4.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
 	golang.org/x/text v0.5.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect