From cdeb9c8904230af8f4197a3d0ea335751c31d025 Mon Sep 17 00:00:00 2001
From: ezilber-akamai <ezilber@akamai.com>
Date: Mon, 6 Jul 2026 13:46:26 -0400
Subject: [PATCH 1/3] Fixed bug in SetRetry causing unintentional behavior
 differing from Resty

---
 client.go      |  5 +++--
 client_test.go | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/client.go b/client.go
index fcf6a0748..e92e91563 100644
--- a/client.go
+++ b/client.go
@@ -471,7 +471,7 @@ func (c *Client) SetRetryAfter(callback RetryAfter) *Client {
 	return c
 }
 
-// SetRetryCount sets the maximum retry attempts before aborting.
+// SetRetryCount sets the number of retries after the initial request before aborting. .
 func (c *Client) SetRetryCount(count int) *Client {
 	c.retryCount = count
 	return c
@@ -519,7 +519,8 @@ func (c *Client) doRequest(ctx context.Context, method, endpoint string, params
 		err  error
 	)
 
-	for range c.retryCount {
+	// retryCount controls the number of retries after the initial attempt
+	for range c.retryCount + 1 {
 		// createRequest seeks params.Body back to the start, so it's safe to retry.
 		req, err = c.createRequest(ctx, method, endpoint, params)
 		if err != nil {
diff --git a/client_test.go b/client_test.go
index a9baf5679..82ff71797 100644
--- a/client_test.go
+++ b/client_test.go
@@ -858,3 +858,35 @@ func TestEnableLogSanitization(t *testing.T) {
 		t.Error("expected Authorization header to appear in request log output")
 	}
 }
+
+func TestDoRequest_RetryCountZero_StillExecutes(t *testing.T) {
+	called := false
+
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		called = true
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte(`{"id":1}`))
+	}
+
+	server := httptest.NewServer(http.HandlerFunc(handler))
+	defer server.Close()
+
+	client := newTestClient(t, nil)
+	client.SetBaseURL(server.URL)
+	client.SetRetryCount(0)
+
+	type result struct {
+		ID int `json:"id"`
+	}
+
+	var got result
+
+	err := client.doRequest(context.Background(), http.MethodGet, "/test", requestParams{
+		Response: &got,
+	}, nil)
+	require.NoError(t, err, "doRequest should not return an error")
+	require.True(t, called, "server handler should have been called even with retryCount=0")
+	require.Equal(t, 1, got.ID, "response should have been decoded")
+}
+

From 7e12004d7fe47ca9308e6a68c146a798f4d6c410 Mon Sep 17 00:00:00 2001
From: ezilber-akamai <ezilber@akamai.com>
Date: Mon, 6 Jul 2026 13:59:37 -0400
Subject: [PATCH 2/3] Address CoPilot suggestions

---
 client_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client_test.go b/client_test.go
index 82ff71797..8c53d569f 100644
--- a/client_test.go
+++ b/client_test.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"reflect"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -860,10 +861,10 @@ func TestEnableLogSanitization(t *testing.T) {
 }
 
 func TestDoRequest_RetryCountZero_StillExecutes(t *testing.T) {
-	called := false
+	var called atomic.Bool
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
-		called = true
+		called.Store(true)
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 		_, _ = w.Write([]byte(`{"id":1}`))
@@ -886,7 +887,6 @@ func TestDoRequest_RetryCountZero_StillExecutes(t *testing.T) {
 		Response: &got,
 	}, nil)
 	require.NoError(t, err, "doRequest should not return an error")
-	require.True(t, called, "server handler should have been called even with retryCount=0")
+	require.True(t, called.Load(), "server handler should have been called even with retryCount=0")
 	require.Equal(t, 1, got.ID, "response should have been decoded")
 }
-

From 9bc58341455f312024268e48b468f34fe0d2de0c Mon Sep 17 00:00:00 2001
From: ezilber-akamai <ezilber@akamai.com>
Date: Mon, 6 Jul 2026 15:37:40 -0400
Subject: [PATCH 3/3] Address CoPilot suggestions

---
 client.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client.go b/client.go
index e92e91563..578e8b3d7 100644
--- a/client.go
+++ b/client.go
@@ -471,9 +471,15 @@ func (c *Client) SetRetryAfter(callback RetryAfter) *Client {
 	return c
 }
 
-// SetRetryCount sets the number of retries after the initial request before aborting. .
+// SetRetryCount sets the number of retries after the initial request before aborting.
+// Negative values are treated as 0 (no retries).
 func (c *Client) SetRetryCount(count int) *Client {
+	if count < 0 {
+		count = 0
+	}
+
 	c.retryCount = count
+
 	return c
 }