Fix regression with HTTP Client and Proxy environment variables

Fixes buildkite#319
lionelfleury · Nov 5, 2024 · aa0b7a3 · aa0b7a3
1 parent f258a69
commit aa0b7a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/collector/collector.go b/collector/collector.go
@@ -414,6 +414,7 @@ func NewHTTPClient(timeout, maxIdleConns int) *http.Client {
 	return &http.Client{
 		Timeout: connectionTimeout,
 		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
 			MaxIdleConns:          maxIdleConns,
 			IdleConnTimeout:       connectionTimeout,
 			ResponseHeaderTimeout: connectionTimeout,

diff --git a/collector/collector_test.go b/collector/collector_test.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 )
 
@@ -283,3 +284,12 @@ func TestCollectorWithSomeJobsAndAgentsForAQueue(t *testing.T) {
 		})
 	}
 }
+
+func TestCollectorWithProxy(t *testing.T) {
+	os.Setenv("HTTP_PROXY", "http://unit.test")
+	client := NewHTTPClient(1, 1)
+	proxyHost := client.Transport.(*http.Transport).Proxy
+	if proxyHost == nil {
+		t.Fatalf("Proxy was not picked up from env.")
+	}
+}