Handle ctx errors in retry

pkg/retry/retry.go

@@ -18,6 +18,7 @@
 package retry
 
 import (
+	"context"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
@@ -116,13 +117,17 @@ func DoTypedWithBackoffAndRetry[T any](cb TypedCallback[T], bo Backoff) (T, erro
 	return DoTypedWithBackoff(wrapper, bo)
 }
 
-// Retry wraps error to mark it as retryable
+// Retry wraps error to mark it as retryable. Skips retry for context errors.
 func Retry(err error) error {
-	if err == nil {
+	switch {
+	case err == nil:
 		return nil
+	case errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded):
+		// do not retry context errors
+		return err
+	default:
+		return errRetryable{error: err}
 	}
-
-	return errRetryable{error: err}
 }
 
 // RetryTyped wraps error to mark it as retryable

pkg/retry/retry_test.go

@@ -1,6 +1,7 @@
 package retry
 
 import (
+	"context"
 	"errors"
 	"testing"
 	"time"
@@ -77,6 +78,26 @@ func TestDo(t *testing.T) {
 		assert.ErrorContains(t, err, "retry limit exceeded")
 	})
 
+	t.Run("context errors are non-retryable", func(t *testing.T) {
+		ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
+		defer cancel()
+
+		var counter int
+		err := Do(func() error {
+			time.Sleep(100 * time.Millisecond)
+
+			if err := ctx.Err(); err != nil {
+				return err
+			}
+
+			counter++
+
+			return nil
+		})
+
+		assert.Equal(t, 0, counter)
+		assert.ErrorIs(t, err, context.DeadlineExceeded)
+	})
 }
 
 func TestDoTyped(t *testing.T) {