Show machine selection menu automatically (#2795)

This obsoletes the `--select` flag.

Author: matttpt

internal/command/machine/clone.go

@@ -28,7 +28,7 @@ func newClone() *cobra.Command {
 		short = "Clone a Fly machine"
 		long  = short + "\n"
 
-		usage = "clone <machine_id>"
+		usage = "clone [machine_id]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineClone,

internal/command/machine/cordon.go

@@ -15,7 +15,7 @@ func newMachineCordon() *cobra.Command {
 	const (
 		short = "Deactivate all services on a machine"
 		long  = short + "\n"
-		usage = "cordon <id> [<id>...]"
+		usage = "cordon [<id>...]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineCordon,

internal/command/machine/destroy.go

@@ -20,7 +20,7 @@ func newDestroy() *cobra.Command {
 		long  = `Destroy a Fly machine.
 This command requires a machine to be in a stopped state unless the force flag is used.
 `
-		usage = "destroy <id>"
+		usage = "destroy [id]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineDestroy,

internal/command/machine/exec.go

@@ -19,7 +19,7 @@ func newMachineExec() *cobra.Command {
 	const (
 		short = "Execute a command on a machine"
 		long  = short + "\n"
-		usage = "exec <machine-id> <command>"
+		usage = "exec [machine-id] <command>"
 	)
 
 	cmd := command.New(usage, short, long, runMachineExec,

internal/command/machine/kill.go

@@ -16,7 +16,7 @@ func newKill() *cobra.Command {
 		short = "Kill (SIGKILL) a Fly machine"
 		long  = short + "\n"
 
-		usage = "kill <id>"
+		usage = "kill [id]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineKill,

internal/command/machine/leases.go

@@ -41,7 +41,7 @@ func newLeaseView() *cobra.Command {
 	const (
 		short = "View machine leases"
 		long  = short + "\n"
-		usage = "view <machine-id>"
+		usage = "view [machine-id]"
 	)
 
 	cmd := command.New(usage, short, long, runLeaseView,
@@ -66,7 +66,7 @@ func newLeaseClear() *cobra.Command {
 	const (
 		short = "Clear machine leases"
 		long  = short + "\n"
-		usage = "clear <machine-id>"
+		usage = "clear [machine-id]"
 	)
 
 	cmd := command.New(usage, short, long, runLeaseClear,

internal/command/machine/restart.go

@@ -18,7 +18,7 @@ func newRestart() *cobra.Command {
 		short = "Restart one or more Fly machines"
 		long  = short + "\n"
 
-		usage = "restart <id> [<id>...]"
+		usage = "restart [<id>...]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineRestart,

internal/command/machine/select.go

@@ -13,15 +13,19 @@ import (
 	"github.com/superfly/flyctl/internal/appconfig"
 	"github.com/superfly/flyctl/internal/flag"
 	"github.com/superfly/flyctl/internal/prompt"
+	"github.com/superfly/flyctl/iostreams"
 )
 
+// We now prompt for a machine automatically when no machine IDs are
+// provided. This flag is retained for backward compatability.
 var selectFlag = flag.Bool{
 	Name:        "select",
 	Description: "Select from a list of machines",
+	Hidden:      true,
 }
 
 func selectOneMachine(ctx context.Context, app *api.AppCompact, machineID string, haveMachineID bool) (*api.Machine, context.Context, error) {
-	if err := checkSelectCmdline(ctx, haveMachineID); err != nil {
+	if err := checkSelectConditions(ctx, haveMachineID); err != nil {
 		return nil, nil, err
 	}
 
@@ -36,7 +40,7 @@ func selectOneMachine(ctx context.Context, app *api.AppCompact, machineID string
 	}
 
 	var machine *api.Machine
-	if flag.GetBool(ctx, "select") {
+	if shouldPrompt(ctx, haveMachineID) {
 		machine, err = promptForOneMachine(ctx)
 		if err != nil {
 			return nil, nil, err
@@ -55,7 +59,7 @@ func selectOneMachine(ctx context.Context, app *api.AppCompact, machineID string
 
 func selectManyMachines(ctx context.Context, machineIDs []string) ([]*api.Machine, context.Context, error) {
 	haveMachineIDs := len(machineIDs) > 0
-	if err := checkSelectCmdline(ctx, haveMachineIDs); err != nil {
+	if err := checkSelectConditions(ctx, haveMachineIDs); err != nil {
 		return nil, nil, err
 	}
 
@@ -65,7 +69,7 @@ func selectManyMachines(ctx context.Context, machineIDs []string) ([]*api.Machin
 	}
 
 	var machines []*api.Machine
-	if flag.GetBool(ctx, "select") {
+	if shouldPrompt(ctx, haveMachineIDs) {
 		machines, err = promptForManyMachines(ctx)
 		if err != nil {
 			return nil, nil, err
@@ -88,7 +92,7 @@ func selectManyMachines(ctx context.Context, machineIDs []string) ([]*api.Machin
 
 func selectManyMachineIDs(ctx context.Context, machineIDs []string) ([]string, context.Context, error) {
 	haveMachineIDs := len(machineIDs) > 0
-	if err := checkSelectCmdline(ctx, haveMachineIDs); err != nil {
+	if err := checkSelectConditions(ctx, haveMachineIDs); err != nil {
 		return nil, nil, err
 	}
 
@@ -97,7 +101,7 @@ func selectManyMachineIDs(ctx context.Context, machineIDs []string) ([]string, c
 		return nil, nil, err
 	}
 
-	if flag.GetBool(ctx, "select") {
+	if shouldPrompt(ctx, haveMachineIDs) {
 		// NOTE: machineIDs must be empty in this case.
 		machines, err := promptForManyMachines(ctx)
 		if err != nil {
@@ -235,17 +239,23 @@ func rewriteMachineNotFoundErrors(ctx context.Context, err error, machineID stri
 	}
 }
 
-func checkSelectCmdline(ctx context.Context, haveMachineIDs bool) error {
+func checkSelectConditions(ctx context.Context, haveMachineIDs bool) error {
 	haveSelectFlag := flag.GetBool(ctx, "select")
 	appName := appconfig.NameFromContext(ctx)
 	switch {
 	case haveSelectFlag && haveMachineIDs:
 		return errors.New("machine IDs can't be used with --select")
-	case !haveSelectFlag && !haveMachineIDs:
-		return errors.New("a machine ID must be provided unless --select is used")
 	case haveSelectFlag && appName == "":
 		return errors.New("an app name must be specified to use --select")
+	case !haveMachineIDs && appName == "":
+		return errors.New("a machine ID or an app name is required")
+	case shouldPrompt(ctx, haveMachineIDs) && !iostreams.FromContext(ctx).IsInteractive():
+		return errors.New("a machine ID must be specified when not running interactively")
 	default:
 		return nil
 	}
 }
+
+func shouldPrompt(ctx context.Context, haveMachineIDs bool) bool {
+	return flag.GetBool(ctx, "select") || !haveMachineIDs
+}

internal/command/machine/start.go

@@ -16,7 +16,7 @@ func newStart() *cobra.Command {
 		short = "Start one or more Fly machines"
 		long  = short + "\n"
 
-		usage = "start <id> [<id>...]"
+		usage = "start [<id>...]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineStart,

internal/command/machine/status.go

@@ -18,7 +18,7 @@ func newStatus() *cobra.Command {
 		short = "Show current status of a running machine"
 		long  = short + "\n"
 
-		usage = "status <id>"
+		usage = "status [id]"
 	)
 
 	cmd := command.New(usage, short, long, runMachineStatus,