Do not override HttpClient DI

Author: jderusse

src/AsyncAwsBundle.php

@@ -4,6 +4,7 @@
 
 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;
@@ -15,5 +16,6 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass(new InjectCasterPass());
+        $container->addCompilerPass(new CreateHttpClientPass());
     }
 }

src/DependencyInjection/AsyncAwsExtension.php

@@ -8,13 +8,17 @@
 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;
 
@@ -94,7 +98,17 @@ 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.
-            $httpClient = new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE);
+            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');
+            }
         }
 
         // If no credential provider is specified, lets configured a credentials provider with cache.
@@ -126,10 +140,12 @@ private function addServiceDefinition(ContainerBuilder $container, string $name,
         }
 
         $definition = new Definition($clientClass);
-        $definition->addArgument($config['config']);
-        $definition->addArgument($credentialServiceId ? new Reference($credentialServiceId) : null);
-        $definition->addArgument($httpClient);
-        $definition->addArgument($logger);
+        $definition->setArguments([
+            $config['config'],
+            $credentialServiceId ? new Reference($credentialServiceId) : null,
+            $httpClient,
+            $logger,
+        ]);
         $definition->addTag('monolog.logger', ['channel' => 'async_aws']);
         $container->setDefinition(sprintf('async_aws.client.%s', $name), $definition);
     }

src/DependencyInjection/Compiler/CreateHttpClientPass.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace AsyncAws\Symfony\Bundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class CreateHttpClientPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('http_client')) {
+            $container->register('async_aws.http_client', HttpClientInterface::class)
+                ->setFactory([HttpClient::class, 'create']);
+            return;
+        }
+
+        $container->setAlias('async_aws.http_client', 'http_client');
+    }
+}