Allow interrupting reading strings from stdin

Author: graveland

internal/tiger/cmd/auth.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"os"
 	"strings"
@@ -103,7 +104,7 @@ Examples:
 				}
 			} else if creds.publicKey == "" || creds.secretKey == "" || creds.projectID == "" {
 				// If some credentials were provided, prompt for missing ones
-				creds, err = promptForCredentials(cfg.ConsoleURL, creds)
+				creds, err = promptForCredentials(cmd.Context(), cfg.ConsoleURL, creds)
 				if err != nil {
 					return fmt.Errorf("failed to get credentials: %w", err)
 				}
@@ -209,7 +210,7 @@ func flagOrEnvVar(flagVal, envVarName string) string {
 }
 
 // promptForCredentials prompts the user to enter any missing credentials
-func promptForCredentials(consoleURL string, creds credentials) (credentials, error) {
+func promptForCredentials(ctx context.Context, consoleURL string, creds credentials) (credentials, error) {
 	// Check if we're in a terminal for interactive input
 	if !util.IsTerminal(os.Stdin) {
 		return credentials{}, fmt.Errorf("TTY not detected - credentials required. Use flags (--public-key, --secret-key, --project-id) or environment variables (TIGER_PUBLIC_KEY, TIGER_SECRET_KEY, TIGER_PROJECT_ID)")
@@ -222,17 +223,20 @@ func promptForCredentials(consoleURL string, creds credentials) (credentials, er
 	// Prompt for public key if missing
 	if creds.publicKey == "" {
 		fmt.Print("Enter your public key: ")
-		publicKey, err := reader.ReadString('\n')
+		publicKey, err := readString(ctx, func() (string, error) { return reader.ReadString('\n') })
 		if err != nil {
 			return credentials{}, err
 		}
-		creds.publicKey = strings.TrimSpace(publicKey)
+		creds.publicKey = publicKey
 	}
 
 	// Prompt for secret key if missing
 	if creds.secretKey == "" {
 		fmt.Print("Enter your secret key: ")
-		bytePassword, err := term.ReadPassword(int(os.Stdin.Fd()))
+		bytePassword, err := readString(ctx, func() (string, error) {
+			val, err := term.ReadPassword(int(os.Stdin.Fd()))
+			return string(val), err
+		})
 		if err != nil {
 			return credentials{}, err
 		}
@@ -243,12 +247,40 @@ func promptForCredentials(consoleURL string, creds credentials) (credentials, er
 	// Prompt for project ID if missing
 	if creds.projectID == "" {
 		fmt.Print("Enter your project ID: ")
-		projectID, err := reader.ReadString('\n')
+		projectID, err := readString(ctx, func() (string, error) { return reader.ReadString('\n') })
 		if err != nil {
 			return credentials{}, err
 		}
-		creds.projectID = strings.TrimSpace(projectID)
+		creds.projectID = projectID
 	}
 
 	return creds, nil
 }
+
+func readString(ctx context.Context, readFn func() (string, error)) (string, error) {
+	valCh := make(chan string)
+	errCh := make(chan error)
+	defer func() { close(valCh); close(errCh) }()
+	go func() {
+		val, err := readFn()
+		if err != nil {
+			errCh <- err
+			return
+		}
+		select {
+		case <-ctx.Done(): // don't return an empty value if the context is already canceled
+			return
+		default:
+		}
+		valCh <- val
+	}()
+
+	select {
+	case <-ctx.Done():
+		return "", ctx.Err()
+	case err := <-errCh:
+		return "", err
+	case val := <-valCh:
+		return val, nil
+	}
+}