Quellcode durchsuchen

Revert the roundtripper back to it's original state

Signed-off-by: Matt Bolt <mbolt35@gmail.com>
Matt Bolt vor 3 Jahren
Ursprung
Commit
4aae52bdf3
1 geänderte Dateien mit 5 neuen und 8 gelöschten Zeilen
  1. 5 8
      pkg/util/httputil/roundtrip.go

+ 5 - 8
pkg/util/httputil/roundtrip.go

@@ -1,20 +1,17 @@
 package httputil
 package httputil
 
 
-import (
-	"net/http"
-)
+import "net/http"
 
 
 type userAgentTransport struct {
 type userAgentTransport struct {
-	http.RoundTripper
-
 	userAgent string
 	userAgent string
+	base      http.RoundTripper
 }
 }
 
 
 // NewUserAgentTransport creates a RoundTripper that attaches the configured user agent.
 // NewUserAgentTransport creates a RoundTripper that attaches the configured user agent.
 func NewUserAgentTransport(userAgent string, base http.RoundTripper) http.RoundTripper {
 func NewUserAgentTransport(userAgent string, base http.RoundTripper) http.RoundTripper {
 	return &userAgentTransport{
 	return &userAgentTransport{
-		RoundTripper: base,
-		userAgent:    userAgent,
+		userAgent: userAgent,
+		base:      base,
 	}
 	}
 }
 }
 
 
@@ -30,5 +27,5 @@ func (t userAgentTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 	}
 	}
 	r2.Header.Set("User-Agent", t.userAgent)
 	r2.Header.Set("User-Agent", t.userAgent)
 	r = r2
 	r = r2
-	return t.RoundTripper.RoundTrip(r)
+	return t.base.RoundTrip(r)
 }
 }