Revert "Revert "Do not override HttpClient DI"" (#1240)

This reverts commit b3d80e39707f220fade8c297af3fc500ae5d7ee9.

Author: jderusse

CHANGELOG.md

@@ -9,6 +9,8 @@
 - Support for TimestreamQuery
 - Support for TimestreamWrite
 - AWS enhancement: Documentation updates.
+- Reverted the automated decoration of the injected HttpClient
+- Added an AwsHttpClientFactory to help people creating retryable clients
 
 ### Changed
 

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) && !$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
-            );
+            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
+                );
+            }
         }
         $this->httpClient = $httpClient;
         $this->configuration = $configuration;

src/HttpClient/AwsHttpClientFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace AsyncAws\Core\HttpClient;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\HttpClient\RetryableHttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Jérémy Derussé <[email protected]>
+ */
+class AwsHttpClientFactory
+{
+    public static function createRetryableClient(HttpClientInterface $httpClient = null, LoggerInterface $logger = null): HttpClientInterface
+    {
+        if (null === $httpClient) {
+            $httpClient = HttpClient::create();
+        }
+        if (class_exists(RetryableHttpClient::class)) {
+            /** @psalm-suppress MissingDependency */
+            $httpClient = new RetryableHttpClient(
+                $httpClient,
+                new AwsRetryStrategy(),
+                3,
+                $logger
+            );
+        }
+
+        return $httpClient;
+    }
+}