From efb586787b502b6848173fc315b0bb6c583a0725 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 8 Nov 2026 00:48:48 -0600 Subject: [PATCH] fix(workspace): close idle client connections during update test server cleanup --- pkg/http/http.go | 14 ++++++++++ pkg/http/http_test.go | 27 +++++++++++++++++++ pkg/http/retry.go | 6 +++++ pkg/http/stall.go | 6 +++++ pkg/http/useragent.go | 6 +++++ .../provider_update_extended_test.go | 2 ++ 6 files changed, 61 insertions(+) diff --git a/pkg/http/http.go b/pkg/http/http.go index c665501fa8..a8d00d8daf 100644 --- a/pkg/http/http.go +++ b/pkg/http/http.go @@ -13,6 +13,7 @@ import ( ) var ( + baseTransportMu sync.Mutex baseTransportOnce sync.Once baseTransportInst *http.Transport @@ -29,8 +30,12 @@ func baseRoundTripper() *http.Transport { t.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} log.Warnf("TLS certificate verification is disabled (%s)", config.EnvInsecureTLS) } + baseTransportMu.Lock() baseTransportInst = t + baseTransportMu.Unlock() }) + baseTransportMu.Lock() + defer baseTransportMu.Unlock() return baseTransportInst } @@ -47,6 +52,15 @@ func GetHTTPClient() *http.Client { return httpClientInst } +func CloseIdleConnections() { + baseTransportMu.Lock() + tr := baseTransportInst + baseTransportMu.Unlock() + if tr != nil { + tr.CloseIdleConnections() + } +} + // UserAgent is the value sent on requests made through the package's clients. func UserAgent() string { return config.BinaryName + "/" + version.GetVersion() diff --git a/pkg/http/http_test.go b/pkg/http/http_test.go index 54d17ca202..395e41dd98 100644 --- a/pkg/http/http_test.go +++ b/pkg/http/http_test.go @@ -1,7 +1,9 @@ package http import ( + nethttp "net/http" "testing" + "time" "github.com/devsy-org/devsy/pkg/config" ) @@ -28,3 +30,28 @@ func TestInsecureTLSEnabled(t *testing.T) { }) } } + +type idleClosingTransport struct { + closed bool +} + +func (t *idleClosingTransport) RoundTrip(req *nethttp.Request) (*nethttp.Response, error) { + return nil, nil +} + +func (t *idleClosingTransport) CloseIdleConnections() { + t.closed = true +} + +func TestCloseIdleConnections(t *testing.T) { + mock := &idleClosingTransport{} + rt := NewStallTransport(mock, time.Second) + rt = WithUserAgent(rt, "test") + rt = NewRetryTransport(rt, DefaultRetry) + client := &nethttp.Client{Transport: rt} + client.CloseIdleConnections() + if !mock.closed { + t.Fatalf("expected CloseIdleConnections forwarded to base transport") + } + CloseIdleConnections() +} diff --git a/pkg/http/retry.go b/pkg/http/retry.go index 1e13f6e638..d1a4e23fcd 100644 --- a/pkg/http/retry.go +++ b/pkg/http/retry.go @@ -38,6 +38,12 @@ func NewRetryTransport(base http.RoundTripper, cfg RetryConfig) http.RoundTrippe return &RetryTransport{base: base, cfg: cfg} } +func (t *RetryTransport) CloseIdleConnections() { + if c, ok := t.base.(interface{ CloseIdleConnections() }); ok { + c.CloseIdleConnections() + } +} + func (t *RetryTransport) RoundTrip(req *http.Request) (*http.Response, error) { if !retriableRequest(req) { return t.base.RoundTrip(req) diff --git a/pkg/http/stall.go b/pkg/http/stall.go index 0ec9f1df3f..7000a24050 100644 --- a/pkg/http/stall.go +++ b/pkg/http/stall.go @@ -28,6 +28,12 @@ func NewStallTransport(base http.RoundTripper, timeout time.Duration) http.Round return &StallTransport{base: base, timeout: timeout} } +func (t *StallTransport) CloseIdleConnections() { + if c, ok := t.base.(interface{ CloseIdleConnections() }); ok { + c.CloseIdleConnections() + } +} + func (t *StallTransport) RoundTrip(req *http.Request) (*http.Response, error) { ctx, cancel := context.WithCancel(req.Context()) wd := newStallWatchdog(t.timeout, cancel) diff --git a/pkg/http/useragent.go b/pkg/http/useragent.go index c552c47055..827ddafcdf 100644 --- a/pkg/http/useragent.go +++ b/pkg/http/useragent.go @@ -26,3 +26,9 @@ func (t *userAgentTransport) RoundTrip(req *http.Request) (*http.Response, error } return t.base.RoundTrip(req) } + +func (t *userAgentTransport) CloseIdleConnections() { + if c, ok := t.base.(interface{ CloseIdleConnections() }); ok { + c.CloseIdleConnections() + } +} diff --git a/pkg/workspace/provider_update_extended_test.go b/pkg/workspace/provider_update_extended_test.go index 64c2b3ba5a..7e512641fe 100644 --- a/pkg/workspace/provider_update_extended_test.go +++ b/pkg/workspace/provider_update_extended_test.go @@ -17,6 +17,7 @@ import ( "time" "github.com/devsy-org/devsy/pkg/config" + devsyhttp "github.com/devsy-org/devsy/pkg/http" "github.com/devsy-org/devsy/pkg/provider" "github.com/devsy-org/devsy/pkg/types" "github.com/stretchr/testify/assert" @@ -236,6 +237,7 @@ func ownedProviderUpdateServer(t *testing.T, handler http.HandlerFunc) *httptest server.Config.SetKeepAlivesEnabled(false) server.Start() t.Cleanup(func() { + devsyhttp.CloseIdleConnections() server.Close() t.Log("owned HTTP server closed and joined") })