use internal function to be able to unit test the behavior

elastic · Feb 5, 2025 · 04d509d · 04d509d
1 parent 3fb97d6
commit 04d509d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/internal/pkg/agent/application/inject_proxy_component_modifier.go b/internal/pkg/agent/application/inject_proxy_component_modifier.go
@@ -10,6 +10,7 @@ import (
 	"github.com/elastic/elastic-agent-client/v7/pkg/client"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/coordinator"
 	"github.com/elastic/elastic-agent/pkg/component"
+	"golang.org/x/net/http/httpproxy"
 )
 
 // InjectProxyEndpointModifier injects a proxy_url value into endpoint's output config if one is not set.
@@ -84,7 +85,8 @@ func injectProxyURL(m map[string]interface{}, hosts []string) {
 		if err != nil {
 			continue
 		}
-		proxyURL, err := http.ProxyFromEnvironment(request)
+		// not using http.ProxyFromEnvironment() to be able to change the environment in unit tests
+		proxyURL, err := httpproxy.FromEnvironment().ProxyFunc()(request.URL)
 		if err != nil {
 			continue
 		}

diff --git a/internal/pkg/agent/application/inject_proxy_component_modifier_test.go b/internal/pkg/agent/application/inject_proxy_component_modifier_test.go
@@ -318,6 +318,10 @@ func TestInjectProxyEndpointModifier(t *testing.T) {
 }
 
 func Test_injectProxyURL(t *testing.T) {
+	t.Setenv("HTTPS_PROXY", "https://localhost:8080")
+	t.Setenv("HTTP_PROXY", "http://localhost:8081")
+	t.Setenv("NO_PROXY", "do.not.inject.proxy.for.me")
+
 	tests := []struct {
 		name   string
 		m      map[string]interface{}
@@ -356,10 +360,6 @@ func Test_injectProxyURL(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			t.Setenv("HTTPS_PROXY", "https://localhost:8080")
-			t.Setenv("HTTP_PROXY", "http://localhost:8081")
-			t.Setenv("NO_PROXY", "do.not.inject.proxy.for.me")
-
 			injectProxyURL(tc.m, tc.hosts)
 			require.Equal(t, tc.expect, tc.m)
 		})