Consolidate IsTerminal functions

Author: nathanjcochran

go.mod

@@ -3,7 +3,10 @@ module github.com/timescale/tiger-cli
 go 1.25.1
 
 require (
+	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/charmbracelet/bubbletea v1.3.10
+	github.com/cli/safeexec v1.0.1
+	github.com/fatih/color v1.18.0
 	github.com/google/jsonschema-go v0.2.3
 	github.com/jackc/pgx/v5 v5.7.5
 	github.com/modelcontextprotocol/go-sdk v0.5.0
@@ -28,7 +31,6 @@ require (
 	al.essio.dev/pkg/shellescape v1.6.0 // indirect
 	github.com/1password/onepassword-sdk-go v0.3.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/adrg/xdg v0.5.3 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
@@ -39,7 +41,6 @@ require (
 	github.com/charmbracelet/x/ansi v0.10.1 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cli/safeexec v1.0.1 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
@@ -57,7 +58,6 @@ require (
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/extism/go-sdk v1.7.0 // indirect
-	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect

internal/tiger/cmd/auth.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"syscall"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 
 	"github.com/timescale/tiger-cli/internal/tiger/api"
 	"github.com/timescale/tiger-cli/internal/tiger/config"
+	"github.com/timescale/tiger-cli/internal/tiger/util"
 )
 
 // validateAPIKeyForLogin can be overridden for testing
@@ -215,7 +215,7 @@ func flagOrEnvVar(flagVal, envVarName string) string {
 // promptForCredentials prompts the user to enter any missing credentials
 func promptForCredentials(consoleURL string, creds credentials) (credentials, error) {
 	// Check if we're in a terminal for interactive input
-	if !term.IsTerminal(int(syscall.Stdin)) {
+	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)")
 	}
 
@@ -236,7 +236,7 @@ func promptForCredentials(consoleURL string, creds credentials) (credentials, er
 	// Prompt for secret key if missing
 	if creds.secretKey == "" {
 		fmt.Print("Enter your secret key: ")
-		bytePassword, err := term.ReadPassword(int(syscall.Stdin))
+		bytePassword, err := term.ReadPassword(os.Stdin.Fd())
 		if err != nil {
 			return credentials{}, err
 		}

internal/tiger/cmd/spinner.go

@@ -3,11 +3,10 @@ package cmd
 import (
 	"fmt"
 	"io"
-	"os"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
-	"golang.org/x/term"
+	"github.com/timescale/tiger-cli/internal/tiger/util"
 )
 
 // spinnerFrames defines the animation frames for the spinner
@@ -28,21 +27,12 @@ type Spinner struct {
 // message on a new line without animation. The message parameter supports
 // fmt.Sprintf-style formatting with optional args.
 func NewSpinner(output io.Writer, message string, args ...any) *Spinner {
-	if isTerminal(output) {
+	if util.IsTerminal(output) {
 		return newAnimatedSpinner(output, message, args...)
 	}
 	return newManualSpinner(output, message, args...)
 }
 
-// isTerminal is a helper method for detecting whether an [io.Writer] is a
-// terminal.
-func isTerminal(w io.Writer) bool {
-	if f, ok := w.(*os.File); ok {
-		return term.IsTerminal(int(f.Fd()))
-	}
-	return false
-}
-
 func newAnimatedSpinner(output io.Writer, message string, args ...any) *Spinner {
 	program := tea.NewProgram(
 		spinnerModel{

internal/tiger/util/environment.go

@@ -1,14 +1,19 @@
 package util
 
 import (
+	"io"
 	"os"
 
-	"github.com/mattn/go-isatty"
+	"golang.org/x/term"
 )
 
-// IsTerminal determines if a file descriptor is an interactive terminal / TTY.
-func IsTerminal(f *os.File) bool {
-	return isatty.IsTerminal(f.Fd()) || isatty.IsCygwinTerminal(f.Fd())
+// IsTerminal is a helper method for detecting whether an [io.Writer] is a
+// interactive terminal / TTY.
+func IsTerminal(w io.Writer) bool {
+	if f, ok := w.(*os.File); ok {
+		return term.IsTerminal(int(f.Fd()))
+	}
+	return false
 }
 
 // IsCI determines if the current execution context is within a known CI/CD system.