Merge pull request #1481 from gruntwork-io/http-global-proxy

httpdo* with global proxy

modules/http-helper/http_helper.go

@@ -262,9 +262,8 @@ func HTTPDoWithOptionsE(
 ) (int, string, error) {
 	logger.Default.Logf(t, "Making an HTTP %s call to URL %s", options.Method, options.Url)
 
-	tr := &http.Transport{
-		TLSClientConfig: options.TlsConfig,
-	}
+	tr := http.DefaultTransport.(*http.Transport).Clone()
+	tr.TLSClientConfig = options.TlsConfig
 
 	client := http.Client{
 		// By default, Go does not impose a timeout, so an HTTP connection attempt can hang for a LONG time.

modules/http-helper/http_helper_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -204,3 +205,26 @@ func failRetryHandler(w http.ResponseWriter, r *http.Request) {
 		w.Write(bytes)
 	}
 }
+
+func TestGlobalProxy(t *testing.T) {
+	proxiedURL := ""
+	httpProxy := getTestServerForFunction(func(w http.ResponseWriter, r *http.Request) {
+		proxiedURL = r.RequestURI
+		bodyCopyHandler(w, r)
+	})
+	t.Cleanup(httpProxy.Close)
+
+	t.Setenv("HTTP_PROXY", httpProxy.URL)
+	targetURL := "http://www.notexist.com/"
+	body := "should be copied"
+
+	st, b, err := HTTPDoWithOptionsE(t, HttpDoOptions{
+		Url:    targetURL,
+		Method: http.MethodPost,
+		Body:   strings.NewReader(body),
+	})
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, st)
+	assert.Equal(t, targetURL, proxiedURL)
+	assert.Equal(t, body, b)
+}