[SF] Make sure we override config in a predictable way (#503)

* Make sure we override config in a predictable way

* cs

Author: Nyholm

src/DependencyInjection/AsyncAwsExtension.php

@@ -30,7 +30,7 @@ private function registerConfiguredServices(ContainerBuilder $container, array $
         $availableServices = AwsPackagesProvider::getAllServices();
         $usedServices = [];
         $defaultConfig = $config;
-        unset($defaultConfig['clients']);
+        unset($defaultConfig['clients'], $defaultConfig['secrets']);
 
         foreach ($config['clients'] as $name => $data) {
             $client = $availableServices[$data['type']]['class'];
@@ -39,6 +39,7 @@ private function registerConfiguredServices(ContainerBuilder $container, array $
             }
 
             $serviceConfig = array_merge($defaultConfig, $data);
+            $serviceConfig['config'] = array_merge($defaultConfig['config'], $data['config']);
             if ($serviceConfig['register_service']) {
                 $usedServices[$name] = $client;
                 $this->addServiceDefinition($container, $name, $serviceConfig, $client);

tests/Functional/BundleInitializationTest.php

@@ -105,6 +105,34 @@ public function testNotRegisterSqs()
         self::assertFalse($container->has(SqsClient::class));
     }
 
+    public function testConfigOverride()
+    {
+        $kernel = $this->createKernel();
+        $kernel->addConfigFile(__DIR__ . '/Resources/config/override.yaml');
+        $this->bootKernel();
+
+        $container = $this->getContainer();
+        self::assertTrue($container->has('async_aws.client.s3'));
+        self::assertTrue($container->has('async_aws.client.ses'));
+        self::assertTrue($container->has('async_aws.client.sqs'));
+
+        /** @var SesClient $ses */
+        $ses = $container->get('async_aws.client.ses');
+        self::assertEquals('eu-central-1', $ses->getConfiguration()->get('region'));
+
+        /** @var S3Client $s3 */
+        $s3 = $container->get('async_aws.client.s3');
+        self::assertEquals('us-west-1', $s3->getConfiguration()->get('region'));
+        self::assertEquals('key', $s3->getConfiguration()->get('accessKeyId'));
+        self::assertEquals('secret', $s3->getConfiguration()->get('accessKeySecret'));
+
+        /** @var SqsClient $sqs */
+        $sqs = $container->get('async_aws.client.sqs');
+        self::assertEquals('eu-central-1', $sqs->getConfiguration()->get('region'));
+        self::assertFalse($sqs->getConfiguration()->has('accessKeyId'));
+        self::assertFalse($sqs->getConfiguration()->has('accessKeySecret'));
+    }
+
     public function testExceptionWhenConfigureServiceNotInstalled()
     {
         if (class_exists(SnsClient::class)) {

tests/Functional/Resources/config/override.yaml

@@ -0,0 +1,15 @@
+async_aws:
+    config:
+        region: eu-central-1
+        accessKeyId: key
+        accessKeySecret: secret
+    clients:
+        ses: ~
+        s3:
+            config:
+                region: us-west-1
+
+        sqs:
+            config:
+                accessKeyId: ~
+                accessKeySecret: ~