disableAutomaticRetries in Apache 5.x since SDK handles retries , also define Apache5 dependencies in .brazil.json

Author: joviegas

.brazil.json

@@ -141,7 +141,9 @@
         "io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
         "io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
         "org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
+        "org.apache.httpcomponents.client5:httpclient5": { "packageName": "Apache-HttpComponents-HttpClient5", "packageVersion": "5.0.x" },
         "org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
+        "org.apache.httpcomponents.core5:httpcore5": { "packageName": "Apache-HttpComponents-HttpCore5", "packageVersion": "5.0.x" },
         "org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

@@ -166,7 +166,9 @@ private ConnectionManagerAwareHttpClient createClient(Apache5HttpClient.DefaultB
                .setUserAgent("") // SDK will set the user agent header in the pipeline. Don't let Apache waste time
                .setConnectionManager(ClientConnectionManagerFactory.wrap(cm))
                //This is done to keep backward compatibility with Apache 4.x
-               .disableRedirectHandling();
+               .disableRedirectHandling()
+               // SDK handles retries , we do not need additional retries on Http clients.
+               .disableAutomaticRetries();
 
         addProxyConfig(builder, configuration);
 

test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java

@@ -20,6 +20,8 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
@@ -59,6 +61,7 @@ public abstract class SdkHttpClientTestSuite {
     private static final Logger LOG = Logger.loggerFor(SdkHttpClientTestSuite.class);
 
     private static final ConnectionCountingTrafficListener CONNECTION_COUNTER = new ConnectionCountingTrafficListener();
+    private static final int HTTP_TOO_MANY_REQUESTS = 429;
 
     @Rule
     public WireMockRule mockServer = createWireMockRule();
@@ -218,6 +221,47 @@ public void testCustomTlsTrustManagerAndTrustAllFails() throws Exception {
         assertThatThrownBy(() -> createSdkHttpClient(httpClientOptions)).isInstanceOf(IllegalArgumentException.class);
     }
 
+    @Test
+    public void doesNotRetryOn429StatusCode() throws Exception {
+        SdkHttpClientOptions httpClientOptions = new SdkHttpClientOptions();
+        httpClientOptions.trustAll(true);
+        try (SdkHttpClient client = createSdkHttpClient(httpClientOptions)) {
+            stubForMockRequest(HTTP_TOO_MANY_REQUESTS);
+            SdkHttpFullRequest req = mockSdkRequest("http://localhost:" + mockServer.port(), SdkHttpMethod.POST);
+            HttpExecuteResponse response = client.prepareRequest(HttpExecuteRequest.builder()
+                                                                                   .request(req)
+                                                                                   .contentStreamProvider(req.contentStreamProvider().orElse(null))
+                                                                                   .build())
+                                                 .call();
+            // Drain the response body if present
+            response.responseBody().ifPresent(IoUtils::drainInputStream);
+
+            // Verify the response has 429 status code
+            assertThat(response.httpResponse().statusCode()).isEqualTo(429);
+
+            // Verify that the request was made exactly once (no retries)
+            mockServer.verify(1, postRequestedFor(urlEqualTo("/"))
+                .withHeader("Host", containing("localhost")));
+
+            // Reset and make another request to ensure it's not a connection issue
+            mockServer.resetAll();
+            stubForMockRequest(200);
+            HttpExecuteResponse successResponse = client.prepareRequest(HttpExecuteRequest.builder()
+                                                                                          .request(req)
+                                                                                          .contentStreamProvider(req.contentStreamProvider().orElse(null))
+                                                                                          .build())
+                                                        .call();
+            successResponse.responseBody().ifPresent(IoUtils::drainInputStream);
+
+            // Verify the second request succeeded
+            assertThat(successResponse.httpResponse().statusCode()).isEqualTo(200);
+
+            // Verify only one request was made for each call (no retries)
+            mockServer.verify(1, postRequestedFor(urlEqualTo("/")));
+        }
+    }
+
+
     protected void testForResponseCode(int returnCode) throws Exception {
         testForResponseCode(returnCode, SdkHttpMethod.POST);
     }