shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-03 04:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: isolate test HTTP clients (#25038)

Browse Source
This commit is contained in:
Thomas Kosiewski
2026-05-11 11:03:38 +02:00
committed by GitHub
parent febabfb8b2
commit 4a6756a3e8
8 changed files with 148 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/coderdtest/coderdtest.go
+46 -5
View File
@@ -669,7 +669,7 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
if options.IncludeProvisionerDaemon {
provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, defaultTestDaemonName, options.ProvisionerDaemonTags, coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))
}
client := codersdk.New(serverURL)
client := codersdk.New(serverURL, codersdk.WithHTTPClient(NewIsolatedHTTPClient(serverURL)))
t.Cleanup(func() {
cancelFunc()
_ = provisionerCloser.Close()
@@ -679,6 +679,46 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
return client, provisionerCloser, coderAPI
}
// NewIsolatedHTTPClient returns a test client with its own transport.
// Closing idle connections at test cleanup must not close http.DefaultTransport
// while another parallel test is using it.
func NewIsolatedHTTPClient(serverURL *url.URL) *http.Client {
transport := &http.Transport{Proxy: http.ProxyFromEnvironment}
if defaultTransport, ok := http.DefaultTransport.(*http.Transport); ok {
transport = defaultTransport.Clone()
}
if serverURL == nil || serverURL.Scheme != "https" {
transport.TLSClientConfig = nil
return &http.Client{Transport: transport}
}
if transport.TLSClientConfig == nil {
transport.TLSClientConfig = &tls.Config{MinVersion: tls.VersionTLS12}
}
if transport.TLSClientConfig.MinVersion == 0 {
transport.TLSClientConfig.MinVersion = tls.VersionTLS12
}
//nolint:gosec // The coderdtest server uses test-only TLS certificates.
transport.TLSClientConfig.InsecureSkipVerify = true
return &http.Client{Transport: transport}
}
// newHTTPClientWithTransportFrom returns a fresh client that shares the base
// transport without sharing mutable per-client state like CheckRedirect.
func newHTTPClientWithTransportFrom(base *http.Client) *http.Client {
if base == nil {
return NewIsolatedHTTPClient(nil)
}
if base.Transport == nil {
client := NewIsolatedHTTPClient(nil)
client.Timeout = base.Timeout
return client
}
return &http.Client{
Transport: base.Transport,
Timeout: base.Timeout,
}
}
// ProvisionerdCloser wraps a provisioner daemon as an io.Closer that can be called multiple times
type ProvisionerdCloser struct {
mu sync.Mutex
@@ -937,10 +977,11 @@ func createAnotherUserRetry(t testing.TB, client *codersdk.Client, organizationI
require.NoError(t, err)
}
other := codersdk.New(client.URL, codersdk.WithSessionToken(sessionToken))
t.Cleanup(func() {
other.HTTPClient.CloseIdleConnections()
})
other := codersdk.New(
client.URL,
codersdk.WithSessionToken(sessionToken),
codersdk.WithHTTPClient(newHTTPClientWithTransportFrom(client.HTTPClient)),
)
if len(roles) > 0 {
// Find the roles for the org vs the site wide roles