fix: avoid premature up timeout

Author: acmore

internal/cli/up.go

@@ -98,7 +98,7 @@ func newUpCmd(opts *Options) *cobra.Command {
 			if warnErr := warnIfConfigNewerThanSession(opts, k, ns, sn, pod, ui.warnWriter()); warnErr != nil {
 				slog.Debug("skip config drift warning", "error", warnErr)
 			}
-			ctx, cancel := defaultContext()
+			ctx, cancel := upCommandContext(waitTimeout)
 			defer cancel()
 			if createMissingPVC {
 				createdPVCs, err := reconcileMissingPVCs(ctx, k, ns, volumes, missingPVCSize, missingPVCStorageClass, labels, annotations)
@@ -277,6 +277,15 @@ func newUpCmd(opts *Options) *cobra.Command {
 	return cmd
 }
 
+func upCommandContext(waitTimeout time.Duration) (context.Context, context.CancelFunc) {
+	timeout := 5 * time.Minute
+	needed := (2 * waitTimeout) + (2 * time.Minute)
+	if needed > timeout {
+		timeout = needed
+	}
+	return context.WithTimeout(context.Background(), timeout)
+}
+
 func reconcileMissingPVCs(ctx context.Context, k interface {
 	PersistentVolumeClaimExists(context.Context, string, string) (bool, error)
 	Apply(context.Context, string, []byte) error

internal/cli/up_context_test.go

@@ -0,0 +1,50 @@
+package cli
+
+import (
+	"context"
+	"testing"
+	"time"
+)
+
+func TestUpCommandContextUsesDefaultFloor(t *testing.T) {
+	ctx, cancel := upCommandContext(30 * time.Second)
+	defer cancel()
+
+	deadline, ok := ctx.Deadline()
+	if !ok {
+		t.Fatal("expected context deadline")
+	}
+	remaining := time.Until(deadline)
+	if remaining < 4*time.Minute || remaining > 5*time.Minute+5*time.Second {
+		t.Fatalf("expected default timeout near 5m, got %s", remaining)
+	}
+}
+
+func TestUpCommandContextExpandsForLargeWaitTimeout(t *testing.T) {
+	ctx, cancel := upCommandContext(10 * time.Minute)
+	defer cancel()
+
+	deadline, ok := ctx.Deadline()
+	if !ok {
+		t.Fatal("expected context deadline")
+	}
+	remaining := time.Until(deadline)
+	expected := (2 * 10 * time.Minute) + (2 * time.Minute)
+	if remaining < expected-5*time.Second || remaining > expected+5*time.Second {
+		t.Fatalf("expected timeout near %s, got %s", expected, remaining)
+	}
+}
+
+func TestUpCommandContextIsCancellable(t *testing.T) {
+	ctx, cancel := upCommandContext(time.Minute)
+	cancel()
+
+	select {
+	case <-ctx.Done():
+	default:
+		t.Fatal("expected cancelled context to be done")
+	}
+	if ctx.Err() != context.Canceled {
+		t.Fatalf("expected context canceled, got %v", ctx.Err())
+	}
+}