From 2353e3af75d87d74bb36c97dc5a34c7507f99965 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 4 Nov 2020 21:18:50 -0300 Subject: [PATCH 1/2] feat: use proxy from environment Signed-off-by: Carlos Alexandro Becker --- 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..df229b1d149 100644 --- a/internal/client/github.go +++ b/internal/client/github.go @@ -39,6 +39,7 @@ func NewGitHub(ctx *context.Context, token string) (Client, error) { InsecureSkipVerify: ctx.Config.GitHubURLs.SkipTLSVerify, } httpClient.Transport.(*oauth2.Transport).Base = base + base.(*http.Transport).Proxy = http.ProxyFromEnvironment client := github.NewClient(httpClient) if ctx.Config.GitHubURLs.API != "" { api, err := url.Parse(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, }, From b1d95eac00803e1cedc78d9b859a46285a50ba11 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 4 Nov 2020 22:29:07 -0300 Subject: [PATCH 2/2] Update internal/client/github.go --- internal/client/github.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/client/github.go b/internal/client/github.go index df229b1d149..7994d03977d 100644 --- a/internal/client/github.go +++ b/internal/client/github.go @@ -38,8 +38,8 @@ func NewGitHub(ctx *context.Context, token string) (Client, error) { base.(*http.Transport).TLSClientConfig = &tls.Config{ InsecureSkipVerify: ctx.Config.GitHubURLs.SkipTLSVerify, } - httpClient.Transport.(*oauth2.Transport).Base = base base.(*http.Transport).Proxy = http.ProxyFromEnvironment + httpClient.Transport.(*oauth2.Transport).Base = base client := github.NewClient(httpClient) if ctx.Config.GitHubURLs.API != "" { api, err := url.Parse(ctx.Config.GitHubURLs.API)