fix TestIntegrationWithBadProxy test

There was an update to how environment variables are used in DD. Make
sure proxy environment variables are used.

Author: slimslenderslacks

pkg/desktop/raw_client.go

@@ -9,6 +9,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"sync"
 	"time"
 )
@@ -20,11 +21,22 @@ var (
 	desktopProxyTransportInst http.RoundTripper
 )
 
-// ProxyTransport returns an HTTP transport configured to use Docker Desktop's HTTP proxy socket
-// when Docker Desktop is running. If Docker Desktop is not running, it returns http.DefaultTransport.
+// ProxyTransport returns an HTTP transport configured to proxy HTTP requests.
+// If HTTP_PROXY/HTTPS_PROXY environment variables are set, they take precedence and
+// are respected via http.ProxyFromEnvironment. Otherwise, when Docker Desktop is running,
+// traffic is routed through Docker Desktop's HTTP proxy socket. If neither applies,
+// http.DefaultTransport is returned.
 // The transport is initialized once using sync.Once and cached for subsequent calls.
 func ProxyTransport() http.RoundTripper {
 	desktopProxyTransportOnce.Do(func() {
+		// Env proxy vars take precedence over Docker Desktop's proxy socket.
+		if hasEnvProxyVars() {
+			desktopProxyTransportInst = &http.Transport{
+				Proxy: http.ProxyFromEnvironment,
+			}
+			return
+		}
+
 		ctx := context.Background()
 		if !IsRunningInDockerDesktop(ctx) {
 			desktopProxyTransportInst = http.DefaultTransport
@@ -44,6 +56,16 @@ func ProxyTransport() http.RoundTripper {
 	return desktopProxyTransportInst
 }
 
+// hasEnvProxyVars returns true if any HTTP proxy environment variables are set.
+func hasEnvProxyVars() bool {
+	for _, name := range []string{"HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy"} {
+		if os.Getenv(name) != "" {
+			return true
+		}
+	}
+	return false
+}
+
 func AvoidResourceSaverMode(ctx context.Context) {
 	_ = ClientBackend.Post(ctx, "/idle/make-busy", nil, nil)
 }

pkg/proxy_integration_test.go

@@ -61,10 +61,10 @@ func TestIntegrationWithBadProxy(t *testing.T) {
 	)
 
 	// Test catalog show command with bad proxy - should fail
-	ctx, cancel := context.WithTimeout(t.Context(), 15*time.Second)
+	ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
 	defer cancel()
 
-	cmd := exec.CommandContext(ctx, "docker", "mcp", "catalog", "show", "mcp/docker-mcp-catalog:latest", "--format=json")
+	cmd := exec.CommandContext(ctx, "docker", "mcp", "catalog", "show", "mcp/docker-mcp-catalog:latest", "--pull=always", "--format=json")
 	cmd.Env = env
 
 	err := cmd.Run()