Simplify HttpClient injection (#1162)

Author: jderusse

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Added
 
+- Make the injected HttpClient decorated by our  `RetryableHttpClient`
 - Support for KMS
 
 ## 1.13.0

src/AbstractApi.php

@@ -74,15 +74,15 @@ public function __construct($configuration = [], ?CredentialProvider $credential
         $this->awsErrorFactory = $this->getAwsErrorFactory();
         if (!isset($httpClient)) {
             $httpClient = HttpClient::create();
-            if (class_exists(RetryableHttpClient::class)) {
-                /** @psalm-suppress MissingDependency */
-                $httpClient = new RetryableHttpClient(
-                    $httpClient,
-                    new AwsRetryStrategy(AwsRetryStrategy::DEFAULT_RETRY_STATUS_CODES, 1000, 2.0, 0, 0.1, $this->awsErrorFactory),
-                    3,
-                    $this->logger
-                );
-            }
+        }
+        if (class_exists(RetryableHttpClient::class) && !$httpClient instanceof RetryableHttpClient) {
+            /** @psalm-suppress MissingDependency */
+            $httpClient = new RetryableHttpClient(
+                $httpClient,
+                new AwsRetryStrategy(AwsRetryStrategy::DEFAULT_RETRY_STATUS_CODES, 1000, 2.0, 0, 0.1, $this->awsErrorFactory),
+                3,
+                $this->logger
+            );
         }
         $this->httpClient = $httpClient;
         $this->configuration = $configuration;