From f1049b94ef34861737068f7976c811a99e15f1d5 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
Date: Thu, 5 Nov 2020 05:16:25 -0300
Subject: [PATCH] feat: use proxy from environment (#1885)

* feat: use proxy from environment

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* Update internal/client/github.go

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 internal/client/gitea.go  | 1 +
 internal/client/github.go | 1 +
 internal/client/gitlab.go | 1 +
 internal/http/http.go     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/internal/client/gitea.go b/internal/client/gitea.go
index 48808425e6c..65c51e7dd47 100644
--- a/internal/client/gitea.go
+++ b/internal/client/gitea.go
@@ -40,6 +40,7 @@ func NewGitea(ctx *context.Context, token string) (Client, error) {
 		return nil, err
 	}
 	transport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
 		TLSClientConfig: &tls.Config{
 			// nolint: gosec
 			InsecureSkipVerify: ctx.Config.GiteaURLs.SkipTLSVerify,
diff --git a/internal/client/github.go b/internal/client/github.go
index 77e00ed1afa..7994d03977d 100644
--- a/internal/client/github.go
+++ b/internal/client/github.go
@@ -38,6 +38,7 @@ func NewGitHub(ctx *context.Context, token string) (Client, error) {
 	base.(*http.Transport).TLSClientConfig = &tls.Config{
 		InsecureSkipVerify: ctx.Config.GitHubURLs.SkipTLSVerify,
 	}
+	base.(*http.Transport).Proxy = http.ProxyFromEnvironment
 	httpClient.Transport.(*oauth2.Transport).Base = base
 	client := github.NewClient(httpClient)
 	if ctx.Config.GitHubURLs.API != "" {
diff --git a/internal/client/gitlab.go b/internal/client/gitlab.go
index 8fb65307b70..ecd2b71fcbf 100644
--- a/internal/client/gitlab.go
+++ b/internal/client/gitlab.go
@@ -28,6 +28,7 @@ type gitlabClient struct {
 // NewGitLab returns a gitlab client implementation.
 func NewGitLab(ctx *context.Context, token string) (Client, error) {
 	transport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
 		TLSClientConfig: &tls.Config{
 			// nolint: gosec
 			InsecureSkipVerify: ctx.Config.GitLabURLs.SkipTLSVerify,
diff --git a/internal/http/http.go b/internal/http/http.go
index 957dfa80a97..af6272551e4 100644
--- a/internal/http/http.go
+++ b/internal/http/http.go
@@ -311,6 +311,7 @@ func getHTTPClient(upload *config.Upload) (*h.Client, error) {
 	pool.AppendCertsFromPEM([]byte(upload.TrustedCerts)) // already validated certs checked by CheckConfig
 	return &h.Client{
 		Transport: &h.Transport{
+			Proxy: h.ProxyFromEnvironment,
 			TLSClientConfig: &tls.Config{ // nolint: gosec
 				RootCAs: pool,
 			},