feat: 1243 returns both resetErr and the request's err on retries.Halt

Author: pengux

httpclient/api_client.go

@@ -259,7 +259,9 @@ func (c *ApiClient) handleError(ctx context.Context, err error, body common.Requ
 		return nil, retries.Halt(err)
 	}
 	if resetErr := body.Reset(); resetErr != nil {
-		return nil, retries.Halt(resetErr)
+		return nil, retries.Halt(
+			fmt.Errorf("%w, request error: %w", resetErr, err),
+		)
 	}
 	return nil, retries.Continue(err)
 }

httpclient/api_client_test.go

@@ -601,6 +601,7 @@ func TestCannotRetryArbitraryReader(t *testing.T) {
 	err := client.Do(context.Background(), "POST", "/a",
 		WithRequestData(customReader{}))
 	require.ErrorContains(t, err, "cannot reset reader of type httpclient.customReader")
+	require.ErrorContains(t, err, "http 429")
 }
 
 func TestRetryGetRequest(t *testing.T) {