added back proxyOpts

In some cases we might need to handle proxy setting for the custom gitClient.

Signed-off-by: Vasyl Rudiuk <[email protected]>

Author: Vasyl Rudiuk

internal/controller/auth_certificate.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"net/http"
+	"net/url"
 
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	httptransport "github.com/go-git/go-git/v5/plumbing/transport/http"
@@ -18,13 +19,25 @@ func HttpTransportwithCustomCerts(tlsConfig *tls.Config, proxyStr *transport.Pro
 	log := ctrl.LoggerFrom(ctx)
 	// var message string
 
+	var (
+		proxyUrl *url.URL
+		err      error
+	)
+	if proxyStr != nil {
+		proxyUrl, err = url.Parse(proxyStr.URL)
+		if err != nil {
+			log.Info("failed to parse proxy url: %w", err)
+		}
+	}
+
 	if tlsConfig == nil || len(tlsConfig.Certificates) == 0 {
 		log.Info("tlsConfig cannot be nil")
 		return nil, nil
 	}
 
 	return httptransport.NewClient(&http.Client{
 		Transport: &http.Transport{
+			Proxy:           http.ProxyURL(proxyUrl),
 			TLSClientConfig: tlsConfig,
 		},
 	}), nil

internal/controller/gitrepository_controller.go

@@ -155,7 +155,6 @@ func (r *GitRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 type GitClientConfigurer interface {
 	ConfigureGitClient(ctx context.Context, obj *sourcev1.GitRepository)
 	IsValid() bool
-	backupHttpsTransport()
 }
 
 type GitClientHttpConfigurer struct {
@@ -184,9 +183,6 @@ func (r *GitRepositoryReconciler) isCertificateDataValid(sslCertificateData map[
 	return len(certBytes) > 0 && len(keyBytes) > 0
 }
 
-func (h *GitClientHttpConfigurer) backupHttpsTransport() {
-	h.DefaultTransport = gitclient.Protocols["https"]
-}
 
 func (h *GitClientHttpConfigurer) ConfigureGitClient(ctx context.Context, obj *sourcev1.GitRepository) {
 
@@ -201,7 +197,7 @@ func (h *GitClientHttpConfigurer) ConfigureGitClient(ctx context.Context, obj *s
 			fmt.Println("Error generating TLS config:", err)
 			return
 		}
-		h.backupHttpsTransport()
+
 
 		transportHttp, err := HttpTransportwithCustomCerts(tlsConfig, h.ProxyOpts, ctx)
 		if err != nil {