chore(rest): rename http request

Signed-off-by: lvlcn-t <[email protected]>

rest/client.go

@@ -95,8 +95,8 @@ type ResponseHandler func(*http.Response) error
 
 // Request represents a request to be made by the rest client.
 type Request struct {
-	// Request is the HTTP request to be made.
-	Request *http.Request
+	// Http is the HTTP request to be made.
+	Http *http.Request
 	// Delay is the amount of time to wait before executing the request.
 	Delay time.Duration
 	// ResponseHandler is the handler to be called when the response is received.
@@ -216,7 +216,7 @@ func (r *restClient) do(ctx context.Context, endpoint *Endpoint, payload, respon
 	}
 	req.Header.Set("Content-Type", "application/json")
 
-	request := &Request{Request: req, Delay: 0, ResponseHandler: handleResponse(response)}
+	request := &Request{Http: req, Delay: 0, ResponseHandler: handleResponse(response)}
 	for _, opt := range opts {
 		opt(request)
 	}
@@ -231,7 +231,7 @@ func (r *restClient) do(ctx context.Context, endpoint *Endpoint, payload, respon
 
 	r.wg.Add(1)
 	defer r.wg.Done()
-	resp, err := r.client.Do(request.Request)
+	resp, err := r.client.Do(request.Http)
 	if err != nil {
 		return 0, fmt.Errorf("failed to make request: %w", err)
 	}
@@ -289,7 +289,7 @@ func WithDelay(d time.Duration) RequestOption {
 // WithHeader is a request option that sets custom headers for the request
 func WithHeader(key, value string) RequestOption {
 	return func(r *Request) {
-		r.Request.Header.Set(key, value)
+		r.Http.Header.Set(key, value)
 	}
 }
 
@@ -301,14 +301,14 @@ func WithBearer(token string) RequestOption {
 // WithBasicAuth is a request option that sets basic auth for the request
 func WithBasicAuth(username, password string) RequestOption {
 	return func(r *Request) {
-		r.Request.SetBasicAuth(username, password)
+		r.Http.SetBasicAuth(username, password)
 	}
 }
 
 // WithTracer is a request option that sets a [httptrace.ClientTrace] for the request.
 func WithTracer(c *httptrace.ClientTrace) RequestOption {
 	return func(r *Request) {
-		r.Request = r.Request.WithContext(httptrace.WithClientTrace(r.Request.Context(), c))
+		r.Http = r.Http.WithContext(httptrace.WithClientTrace(r.Http.Context(), c))
 	}
 }
 

rest/client_test.go

@@ -487,7 +487,7 @@ func TestClient_RateLimiter(t *testing.T) {
 func TestWithDelay(t *testing.T) {
 	delay := 5 * time.Second
 	request := &Request{
-		Request: &http.Request{},
+		Http: &http.Request{},
 	}
 	WithDelay(delay)(request)
 
@@ -499,44 +499,44 @@ func TestWithDelay(t *testing.T) {
 func TestWithHeader(t *testing.T) {
 	key, value := "X-Custom-Header", "CustomValue"
 	request := &Request{
-		Request: &http.Request{
+		Http: &http.Request{
 			Header: http.Header{},
 		},
 	}
 	WithHeader(key, value)(request)
 
-	if request.Request.Header.Get(key) != value {
-		t.Errorf("WithHeader() = %v, want %v", request.Request.Header.Get(key), value)
+	if request.Http.Header.Get(key) != value {
+		t.Errorf("WithHeader() = %v, want %v", request.Http.Header.Get(key), value)
 	}
 }
 
 func TestWithBasicAuth(t *testing.T) {
 	username, password := "user", "password"
 	request := &Request{
-		Request: &http.Request{
+		Http: &http.Request{
 			Header: http.Header{},
 		},
 	}
 	WithBasicAuth(username, password)(request)
 
 	auth := fmt.Sprintf("%s:%s", username, password)
 	auth = base64.StdEncoding.EncodeToString([]byte(auth))
-	if request.Request.Header.Get("Authorization") != fmt.Sprintf("Basic %s", auth) {
-		t.Errorf("WithBasicAuth() = %v, want %v", request.Request.Header.Get("Authorization"), fmt.Sprintf("%s:%s", username, password))
+	if request.Http.Header.Get("Authorization") != fmt.Sprintf("Basic %s", auth) {
+		t.Errorf("WithBasicAuth() = %v, want %v", request.Http.Header.Get("Authorization"), fmt.Sprintf("%s:%s", username, password))
 	}
 }
 
 func TestWithBearer(t *testing.T) {
 	token := "token"
 	request := &Request{
-		Request: &http.Request{
+		Http: &http.Request{
 			Header: http.Header{},
 		},
 	}
 	WithBearer(token)(request)
 
-	if request.Request.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", token) {
-		t.Errorf("WithBearer() = %v, want %v", request.Request.Header.Get("Authorization"), fmt.Sprintf("Bearer %s", token))
+	if request.Http.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", token) {
+		t.Errorf("WithBearer() = %v, want %v", request.Http.Header.Get("Authorization"), fmt.Sprintf("Bearer %s", token))
 	}
 }
 
@@ -546,13 +546,13 @@ func TestWithTracer(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create request: %v", err)
 	}
-	request := &Request{Request: req}
+	request := &Request{Http: req}
 	c := &httptrace.ClientTrace{
 		GetConn: func(hostPort string) {},
 	}
 	WithTracer(c)(request)
 
-	got := httptrace.ContextClientTrace(request.Request.Context())
+	got := httptrace.ContextClientTrace(request.Http.Context())
 	if got == nil {
 		t.Fatalf("WithTracer() did not set ClientTrace in context")
 	}