fix: address review follow-ups

- guard kubectl exec terminal sizing against nil queues and add adapter tests
- make runtime error handler overrides resettable and add handler/formatter coverage
- make devspacehelper e2e pod checks explicit after the wait loop
- document CustomNavLink leaf-route matching and clean up webpack/postcss/sass config
- update assets

Signed-off-by: Ryan Swanson <ryan.swanson@loft.sh>

Author: zerbitx

assets/assets.go

@@ -4,14 +4,13 @@ import (
 	"bytes"
 	"context"
 	"io"
-	
+
 	"github.com/loft-sh/devspace/pkg/util/terminal"
-	"k8s.io/kubectl/pkg/util/term"
-	
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/remotecommand"
 	kubectlExec "k8s.io/client-go/util/exec"
 	"k8s.io/kubectl/pkg/scheme"
+	"k8s.io/kubectl/pkg/util/term"
 )
 
 // termSizeQueueAdapter adapts k8s.io/kubectl/pkg/util/term.TerminalSizeQueue to
@@ -20,7 +19,13 @@ type termSizeQueueAdapter struct {
 	q term.TerminalSizeQueue
 }
 
+var _ remotecommand.TerminalSizeQueue = (*termSizeQueueAdapter)(nil)
+
 func (a *termSizeQueueAdapter) Next() *remotecommand.TerminalSize {
+	if a == nil || a.q == nil {
+		return nil
+	}
+
 	size := a.q.Next()
 	if size == nil {
 		return nil
@@ -34,7 +39,7 @@ type SubResource string
 const (
 	// SubResourceExec creates a new process in the container and attaches to that
 	SubResourceExec SubResource = "exec"
-	
+
 	// SubResourceAttach attaches to the top process of the container
 	SubResourceAttach SubResource = "attach"
 )
@@ -47,34 +52,36 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 		streamOptions remotecommand.StreamOptions
 		tty           = options.TTY
 	)
-	
+
 	if options.SubResource == "" {
 		options.SubResource = SubResourceExec
 	}
-	
+
 	wrapper, upgradeRoundTripper, err := GetUpgraderWrapper(client)
 	if err != nil {
 		return err
 	}
-	
+
 	execRequest := client.KubeClient().CoreV1().RESTClient().Post().
 		Resource("pods").
 		Name(options.Pod.Name).
 		Namespace(options.Pod.Namespace).
 		SubResource(string(options.SubResource))
-	
+
 	if tty {
 		tty, t = terminal.SetupTTY(options.Stdin, options.Stdout)
 		if options.ForceTTY || tty {
 			tty = true
 			if t.Raw && options.TerminalSizeQueue == nil {
 				// this call spawns a goroutine to monitor/update the terminal size
-				sizeQueue = &termSizeQueueAdapter{q: t.MonitorSize(t.GetSize())}
+				if q := t.MonitorSize(t.GetSize()); q != nil {
+					sizeQueue = &termSizeQueueAdapter{q: q}
+				}
 			} else if options.TerminalSizeQueue != nil {
 				sizeQueue = options.TerminalSizeQueue
 				t.Raw = true
 			}
-			
+
 			// unset options.Stderr if it was previously set because both stdout and stderr
 			// go over t.Out when tty is true
 			options.Stderr = nil
@@ -93,7 +100,7 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 			Stderr: options.Stderr,
 		}
 	}
-	
+
 	switch options.SubResource {
 	case SubResourceExec:
 		execRequest.VersionedParams(&corev1.PodExecOptions{
@@ -113,21 +120,23 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 			TTY:       tty,
 		}, scheme.ParameterCodec)
 	}
-	
+
 	exec, err := remotecommand.NewSPDYExecutorForTransports(wrapper, upgradeRoundTripper, "POST", execRequest.URL())
 	if err != nil {
 		return err
 	}
-	
+
 	errChan := make(chan error)
 	go func() {
 		errChan <- t.Safe(func() error {
 			return exec.StreamWithContext(ctx, streamOptions)
 		})
 	}()
-	
+
 	select {
 	case <-ctx.Done():
+		// Nothing actionable can be done with a close error during shutdown, and the stream goroutine
+		// will still surface any real streaming error via errChan.
 		_ = upgradeRoundTripper.Close()
 		<-errChan
 		return nil
@@ -139,18 +148,18 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 // ExecStreamOptions are the options for ExecStream
 type ExecStreamOptions struct {
 	Pod *corev1.Pod
-	
+
 	Container string
 	Command   []string
-	
+
 	ForceTTY          bool
 	TTY               bool
 	TerminalSizeQueue remotecommand.TerminalSizeQueue
-	
+
 	Stdin  io.Reader
 	Stdout io.Writer
 	Stderr io.Writer
-	
+
 	SubResource SubResource
 }
 
@@ -163,7 +172,7 @@ func (client *client) ExecStream(ctx context.Context, options *ExecStreamOptions
 func (client *client) ExecBuffered(ctx context.Context, pod *corev1.Pod, container string, command []string, stdin io.Reader) ([]byte, []byte, error) {
 	stdoutBuffer := &bytes.Buffer{}
 	stderrBuffer := &bytes.Buffer{}
-	
+
 	kubeExecError := client.ExecStream(ctx, &ExecStreamOptions{
 		Pod:       pod,
 		Container: container,
@@ -177,7 +186,7 @@ func (client *client) ExecBuffered(ctx context.Context, pod *corev1.Pod, contain
 			return nil, nil, kubeExecError
 		}
 	}
-	
+
 	return stdoutBuffer.Bytes(), stderrBuffer.Bytes(), kubeExecError
 }
 
@@ -197,6 +206,6 @@ func (client *client) ExecBufferedCombined(ctx context.Context, pod *corev1.Pod,
 			return nil, kubeExecError
 		}
 	}
-	
+
 	return stdoutBuffer.Bytes(), kubeExecError
 }

pkg/devspace/kubectl/exec.go

@@ -0,0 +1,55 @@
+package kubectl
+
+import (
+	"testing"
+
+	"k8s.io/kubectl/pkg/util/term"
+)
+
+type fakeTerminalSizeQueue struct {
+	sizes []*term.TerminalSize
+}
+
+func (f *fakeTerminalSizeQueue) Next() *term.TerminalSize {
+	if len(f.sizes) == 0 {
+		return nil
+	}
+
+	size := f.sizes[0]
+	f.sizes = f.sizes[1:]
+	return size
+}
+
+func TestTermSizeQueueAdapterNext(t *testing.T) {
+	t.Run("nil adapter", func(t *testing.T) {
+		var adapter *termSizeQueueAdapter
+		if size := adapter.Next(); size != nil {
+			t.Fatalf("expected nil size, got %#v", size)
+		}
+	})
+
+	t.Run("nil queue", func(t *testing.T) {
+		adapter := &termSizeQueueAdapter{}
+		if size := adapter.Next(); size != nil {
+			t.Fatalf("expected nil size, got %#v", size)
+		}
+	})
+
+	t.Run("convert terminal size", func(t *testing.T) {
+		adapter := &termSizeQueueAdapter{
+			q: &fakeTerminalSizeQueue{
+				sizes: []*term.TerminalSize{
+					{Width: 80, Height: 24},
+				},
+			},
+		}
+
+		size := adapter.Next()
+		if size == nil {
+			t.Fatal("expected terminal size, got nil")
+		}
+		if size.Width != 80 || size.Height != 24 {
+			t.Fatalf("expected 80x24 terminal size, got %#v", size)
+		}
+	})
+}