Revert "Do not override HttpClient DI"

This reverts commit 70b7f42c48e6386674827077cd53c64a9d2884e5.

Author: jderusse

src/AsyncAwsBundle.php

@@ -4,7 +4,6 @@
 
 namespace AsyncAws\Symfony\Bundle;
 
-use AsyncAws\Symfony\Bundle\DependencyInjection\Compiler\CreateHttpClientPass;
 use AsyncAws\Symfony\Bundle\DependencyInjection\Compiler\InjectCasterPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -16,6 +15,5 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass(new InjectCasterPass());
-        $container->addCompilerPass(new CreateHttpClientPass());
     }
 }

src/DependencyInjection/AsyncAwsExtension.php

@@ -8,17 +8,13 @@
 use AsyncAws\Core\Credentials\ChainProvider;
 use AsyncAws\Core\Credentials\CredentialProvider;
 use AsyncAws\Core\Credentials\SymfonyCacheProvider;
-use AsyncAws\Core\HttpClient\AwsRetryStrategy;
 use AsyncAws\Symfony\Bundle\Secrets\CachedEnvVarLoader;
 use AsyncAws\Symfony\Bundle\Secrets\SsmVault;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpClient\Retry\RetryStrategyInterface;
-use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Contracts\Cache\CacheInterface;
 
@@ -98,17 +94,7 @@ private function addServiceDefinition(ContainerBuilder $container, string $name,
             $httpClient = $config['http_client'] ? new Reference($config['http_client']) : null;
         } else {
             // Use default Symfony http_client unless explicitly set to null.
-            if (class_exists(RetryableHttpClient::class)) {
-                $httpClient = new Definition(RetryableHttpClient::class);
-                $httpClient->setArguments([
-                    new Reference('async_aws.http_client'),
-                    new Definition(AwsRetryStrategy::class),
-                    3,
-                    $logger,
-                ]);
-            } else {
-                $httpClient = new Reference('async_aws.http_client');
-            }
+            $httpClient = new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE);
         }
 
         // If no credential provider is specified, lets configured a credentials provider with cache.
@@ -140,12 +126,10 @@ private function addServiceDefinition(ContainerBuilder $container, string $name,
         }
 
         $definition = new Definition($clientClass);
-        $definition->setArguments([
-            $config['config'],
-            $credentialServiceId ? new Reference($credentialServiceId) : null,
-            $httpClient,
-            $logger,
-        ]);
+        $definition->addArgument($config['config']);
+        $definition->addArgument($credentialServiceId ? new Reference($credentialServiceId) : null);
+        $definition->addArgument($httpClient);
+        $definition->addArgument($logger);
         $definition->addTag('monolog.logger', ['channel' => 'async_aws']);
         $container->setDefinition(sprintf('async_aws.client.%s', $name), $definition);
     }