fix: Cancel the retry sleep if the request context is cancelled or de…

…adline exceeded

httpclient/client.go

@@ -172,8 +172,14 @@ func (c *Client) Do(request *http.Request) (*http.Response, error) {
 			break
 		}
 
-		backoffTime := c.retrier.NextInterval(i)
-		time.Sleep(backoffTime)
+		// Cancel the retry sleep if the request context is cancelled or deadline exceeded
+		timer := time.NewTimer(c.retrier.NextInterval(i))
+		select {
+		case <-request.Context().Done():
+			timer.Stop()
+			break
+		case <-timer.C:
+		}
 	}
 
 	if !shouldRetry && err == nil {
@@ -185,6 +191,11 @@ func (c *Client) Do(request *http.Request) (*http.Response, error) {
 }
 
 func (c *Client) checkRetry(ctx context.Context, resp *http.Response, err error) (bool, error) {
+	// do not retry on context.Canceled or context.DeadlineExceeded
+	if ctx.Err() != nil {
+		return false, ctx.Err()
+	}
+
 	if err != nil {
 		return true, err
 	}

httpclient/client_test.go

@@ -2,6 +2,7 @@ package httpclient
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -15,6 +16,37 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestHTTPRequestWithContextDoSuccess(t *testing.T) {
+	noOfRetries := 3
+	backoffInterval := 1 * time.Millisecond
+	maximumJitterInterval := 10 * time.Millisecond
+
+	client := NewClient(
+		WithRetryCount(noOfRetries),
+		WithRetrier(heimdall.NewRetrier(heimdall.NewConstantBackoff(backoffInterval, maximumJitterInterval))),
+	)
+
+	dummyHandler := func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(`{ "response": "ok" }`))
+		time.Sleep(100 * time.Millisecond)
+	}
+
+	server := httptest.NewServer(http.HandlerFunc(dummyHandler))
+	defer server.Close()
+
+	req, err := http.NewRequest(http.MethodGet, server.URL, nil)
+	require.NoError(t, err)
+
+	// define some user case context
+	subCtx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
+	defer cancel()
+
+	req = req.WithContext(subCtx)
+	_, err = client.Do(req)
+	require.Contains(t, err.Error(), "context deadline exceeded")
+}
+
 func TestHTTPClientDoSuccess(t *testing.T) {
 	client := NewClient(WithHTTPTimeout(10 * time.Millisecond))