fix: apply HttpTransports when cluster http client provide

Author: morlay

pkg/courierhttp/client/client.go

@@ -18,6 +18,17 @@ import (
 	"github.com/octohelm/courier/pkg/statuserror"
 )
 
+type HttpTransport = func(rt http.RoundTripper) http.RoundTripper
+
+func WithHttpTransports(rts ...HttpTransport) func(rt http.RoundTripper) http.RoundTripper {
+	return func(r http.RoundTripper) http.RoundTripper {
+		for _, rt := range rts {
+			r = rt(r)
+		}
+		return r
+	}
+}
+
 type RoundTrip = func(request *http.Request) (*http.Response, error)
 
 func HttpTransportFunc(round func(request *http.Request, next RoundTrip) (*http.Response, error)) HttpTransport {
@@ -38,8 +49,6 @@ func (h *httpTransportFunc) RoundTrip(request *http.Request) (*http.Response, er
 	return h.round(request, h.rt.RoundTrip)
 }
 
-type HttpTransport = func(rt http.RoundTripper) http.RoundTripper
-
 type Client struct {
 	Endpoint       string `flag:""`
 	NewError       func() error
@@ -62,6 +71,11 @@ func (c *Client) Do(ctx context.Context, req any, metas ...courier.Metadata) cou
 	httpClient := HttpClientFromContext(ctx)
 	if httpClient == nil {
 		httpClient = GetReasonableClientContext(ctx, c.HttpTransports...)
+	} else {
+		if httpClient.Transport == nil {
+			httpClient.Transport = http.DefaultTransport
+		}
+		httpClient.Transport = WithHttpTransports(c.HttpTransports...)(httpClient.Transport)
 	}
 
 	resp, err := httpClient.Do(httpReq)

pkg/courierhttp/client/http_default.go

@@ -35,11 +35,7 @@ func GetReasonableClientContext(ctx context.Context, httpTransports ...HttpTrans
 		t = tc()
 	}
 
-	for i := range httpTransports {
-		t = httpTransports[i](t)
-	}
-
-	return &http.Client{Transport: t}
+	return &http.Client{Transport: WithHttpTransports(httpTransports...)(t)}
 }
 
 func newRoundTripperWithoutKeepAlive() http.RoundTripper {
@@ -67,9 +63,5 @@ func GetShortConnClientContext(ctx context.Context, httpTransports ...HttpTransp
 		t = tc()
 	}
 
-	for i := range httpTransports {
-		t = httpTransports[i](t)
-	}
-
-	return &http.Client{Transport: t}
+	return &http.Client{Transport: WithHttpTransports(httpTransports...)(t)}
 }