Merge pull request #1 from rpkamp/feature/sqs-connection-factory-client

Use client defined in configuration in SqsConnectionFactory

Author: elazar

Diff for: pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml

@@ -33,3 +33,14 @@ services:
         public: true
         tags:
             - { name: 'enqueue.client.processor' }
+
+    test.sqs_client:
+        public: true
+        class: Aws\Sqs\SqsClient
+        arguments:
+            -
+                region: '%env(AWS_SQS_REGION)%'
+                version: '2012-11-05'
+                credentials:
+                    key: '%env(AWS_SQS_KEY)%'
+                    secret: '%env(AWS_SQS_SECRET)%'

Diff for: pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php

@@ -210,7 +210,7 @@ public function provideEnqueueConfigs()
                 'transport' => [
                     'default' => 'sqs',
                     'sqs' => [
-                        'client' => '@Aws\Sqs\SqsClient',
+                        'client' => 'test.sqs_client',
                     ],
                 ],
             ]];

Diff for: pkg/sqs/SqsConnectionFactory.php

@@ -39,7 +39,10 @@ class SqsConnectionFactory implements PsrConnectionFactory
     public function __construct($config = 'sqs:')
     {
         if ($config instanceof SqsClient) {
-            return $this->client = $config;
+            $this->client = $config;
+            $this->config = $this->defaultConfig();
+
+            return;
         } elseif (empty($config) || 'sqs:' === $config) {
             $config = [];
         } elseif (is_string($config)) {

Diff for: pkg/sqs/Symfony/SqsTransportFactory.php

@@ -38,7 +38,7 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                 ->scalarNode('key')->defaultNull()->end()
                 ->scalarNode('secret')->defaultNull()->end()
                 ->scalarNode('token')->defaultNull()->end()
-                ->scalarNode('region')->isRequired()->end()
+                ->scalarNode('region')->end()
                 ->integerNode('retries')->defaultValue(3)->end()
                 ->scalarNode('version')->cannotBeEmpty()->defaultValue('2012-11-05')->end()
                 ->booleanNode('lazy')
@@ -54,8 +54,18 @@ public function addConfiguration(ArrayNodeDefinition $builder)
      */
     public function createConnectionFactory(ContainerBuilder $container, array $config)
     {
+        if (empty($config['client']) && empty($config['region'])) {
+            throw new RuntimeException('Either "client" or "region" must be provided to SQS in Enqueue configuration');
+        }
+
+        $arguments = $config;
+
+        if (!empty($config['client'])) {
+            $arguments = new Reference($config['client']);
+        }
+
         $factory = new Definition(SqsConnectionFactory::class);
-        $factory->setArguments([$config]);
+        $factory->setArguments([$arguments]);
 
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
         $container->setDefinition($factoryId, $factory);