Merge 45ef7c9 into ee2134f

internal/command/tokens/revoke.go

@@ -3,6 +3,7 @@ package tokens
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/superfly/flyctl/internal/command"
@@ -13,8 +14,8 @@ import (
 func newRevoke() *cobra.Command {
 	const (
 		short = "Revoke tokens"
-		long  = "used like: 'fly tokens revoke [ids]'"
-		usage = "revoke"
+		long  = "Revoke one or more tokens."
+		usage = "revoke [flags] TOKEN TOKEN ..."
 	)
 
 	cmd := command.New(usage, short, long, runRevoke,
@@ -27,15 +28,28 @@ func newRevoke() *cobra.Command {
 func runRevoke(ctx context.Context) (err error) {
 	apiClient := flyutil.ClientFromContext(ctx)
 
+	numRevoked := 0
+
 	args := flag.Args(ctx)
+	if len(args) == 0 {
+		if flag.GetString(ctx, "access-token") != "" {
+			return fmt.Errorf("no tokens provided; you passed a token via --access-token, did you mean to pass it as a positional argument?")
+		} else {
+			return fmt.Errorf("no tokens provided")
+		}
+	}
+
 	for _, id := range args {
 		err := apiClient.RevokeLimitedAccessToken(ctx, id)
 		if err != nil {
-			fmt.Printf("Failed to revoke token %s: %s\n", id, err)
+			fmt.Fprintf(os.Stderr, "failed to revoke token %s: %s\n", id, err)
 			continue
 		}
 		fmt.Printf("Revoked %s\n", id)
+		numRevoked += 1
 	}
 
+	fmt.Printf("%d tokens revoked\n", numRevoked)
+
 	return nil
 }