Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkg/http/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
)

var (
baseTransportMu sync.Mutex
baseTransportOnce sync.Once
baseTransportInst *http.Transport

Expand All @@ -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
}

Expand All @@ -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()
Expand Down
27 changes: 27 additions & 0 deletions pkg/http/http_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package http

import (
nethttp "net/http"
"testing"
"time"

"github.com/devsy-org/devsy/pkg/config"
)
Expand All @@ -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()
}
6 changes: 6 additions & 0 deletions pkg/http/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions pkg/http/stall.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions pkg/http/useragent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
2 changes: 2 additions & 0 deletions pkg/workspace/provider_update_extended_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
})
Expand Down
Loading