From 95cfa8792be2b1393044b211ed1fd91cafe8e04c Mon Sep 17 00:00:00 2001
From: Adrian Lai <aidy@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:46:43 +0000
Subject: [PATCH] Revert "enable proxy for remaining clients (#152)" (#165)

Co-authored-by: David Collom <david.collom@jetstack.io>
---
 pkg/client/acr/acr.go       | 3 +--
 pkg/client/docker/docker.go | 3 +--
 pkg/client/ecr/ecr.go       | 3 ---
 pkg/client/gcr/gcr.go       | 9 +++------
 pkg/client/ghcr/ghcr.go     | 3 +--
 pkg/client/quay/quay.go     | 1 -
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkg/client/acr/acr.go b/pkg/client/acr/acr.go
index de003b6d..630f8989 100644
--- a/pkg/client/acr/acr.go
+++ b/pkg/client/acr/acr.go
@@ -55,8 +55,7 @@ type ACRManifestResponse struct {
 
 func New(opts Options) (*Client, error) {
 	client := &http.Client{
-		Timeout:   time.Second * 5,
-		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+		Timeout: time.Second * 5,
 	}
 
 	if len(opts.RefreshToken) > 0 &&
diff --git a/pkg/client/docker/docker.go b/pkg/client/docker/docker.go
index 9dcdc364..27b2dbb6 100644
--- a/pkg/client/docker/docker.go
+++ b/pkg/client/docker/docker.go
@@ -52,8 +52,7 @@ type Image struct {
 
 func New(ctx context.Context, opts Options) (*Client, error) {
 	client := &http.Client{
-		Timeout:   time.Second * 10,
-		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+		Timeout: time.Second * 10,
 	}
 
 	// Setup Auth if username and password used.
diff --git a/pkg/client/ecr/ecr.go b/pkg/client/ecr/ecr.go
index 935ee179..12265862 100644
--- a/pkg/client/ecr/ecr.go
+++ b/pkg/client/ecr/ecr.go
@@ -3,7 +3,6 @@ package ecr
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"sync"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -103,8 +102,6 @@ func (c *Client) getClient(region string) (*ecr.ECR, error) {
 			return nil, err
 		}
 	}
-	// Try and use an HTTP(S) Proxies defined within Environment variables.
-	client.Config.WithHTTPClient(&http.Client{Transport: &http.Transport{Proxy: http.ProxyFromEnvironment}})
 
 	c.cachedRegionClients[region] = client
 	return client, nil
diff --git a/pkg/client/gcr/gcr.go b/pkg/client/gcr/gcr.go
index d94a2ba0..19dd3b19 100644
--- a/pkg/client/gcr/gcr.go
+++ b/pkg/client/gcr/gcr.go
@@ -35,14 +35,11 @@ type ManifestItem struct {
 }
 
 func New(opts Options) *Client {
-	client := &http.Client{
-		Timeout:   time.Second * 5,
-		Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
-	}
-
 	return &Client{
 		Options: opts,
-		Client:  client,
+		Client: &http.Client{
+			Timeout: time.Second * 5,
+		},
 	}
 }
 
diff --git a/pkg/client/ghcr/ghcr.go b/pkg/client/ghcr/ghcr.go
index fbbfd7f6..33595840 100644
--- a/pkg/client/ghcr/ghcr.go
+++ b/pkg/client/ghcr/ghcr.go
@@ -25,8 +25,7 @@ func New(opts Options) *Client {
 	return &Client{
 		Options: opts,
 		Client: &http.Client{
-			Timeout:   time.Second * 5,
-			Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
+			Timeout: time.Second * 5,
 		},
 	}
 }
diff --git a/pkg/client/quay/quay.go b/pkg/client/quay/quay.go
index 3578f99e..ca6031e9 100644
--- a/pkg/client/quay/quay.go
+++ b/pkg/client/quay/quay.go
@@ -59,7 +59,6 @@ type responseManifestDataItem struct {
 
 func New(opts Options) *Client {
 	client := retryablehttp.NewClient()
-	client.HTTPClient.Transport = &http.Transport{Proxy: http.ProxyFromEnvironment}
 	client.RetryMax = 10
 	client.Logger = nil