[Symfony] Make sure we can override config (#795)

* [Symfony] Make sure we can override config

* cs

* Added changelog

Author: Nyholm

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## NOT RELEASED
 
+## 1.1.1
+
+### Fixed
+
+- Make sure you can override config in different environments.
+
 ## 1.1.0
 
 ### Added

src/DependencyInjection/Configuration.php

@@ -25,15 +25,15 @@ public function getConfigTreeBuilder()
                 ->scalarNode('credential_provider_cache')->info('A service implementing Symfony\Contracts\Cache\CacheInterface to efficiently cache credentials.')->defaultValue('cache.app')->end()
                 ->scalarNode('http_client')->info('A service name for Symfony\Contracts\HttpClient\HttpClientInterface.')->end()
                 ->scalarNode('logger')->info('A service name for Psr\Log\LoggerInterface.')->end()
-                ->arrayNode('config')->info('Default config that will be merged will all services.')->normalizeKeys(false)->prototype('variable')->end()->end()
+                ->arrayNode('config')->info('Default config that will be merged will all services.')->useAttributeAsKey('name')->normalizeKeys(false)->prototype('variable')->end()->end()
 
                 ->arrayNode('clients')
                     ->beforeNormalization()->always()->then(\Closure::fromCallable([$this, 'validateType']))->end()
                     ->useAttributeAsKey('name')
                     ->arrayPrototype()
                         ->children()
                             ->booleanNode('register_service')->info('If set to false, no service will be created for this AWS type.')->defaultTrue()->end()
-                            ->arrayNode('config')->info('Configuration specific to this service.')->normalizeKeys(false)->prototype('variable')->end()->end()
+                            ->arrayNode('config')->info('Configuration specific to this service.')->useAttributeAsKey('name')->normalizeKeys(false)->prototype('variable')->end()->end()
                             ->enumNode('type')->info('A valid AWS type. The service name will be used as default.')->values(AwsPackagesProvider::getServiceNames())->end()
                             ->scalarNode('credential_provider')->info('A service name for AsyncAws\Core\Credentials\CredentialProvider.')->end()
                             ->scalarNode('http_client')->info('A service name for Symfony\Contracts\HttpClient\HttpClientInterface.')->end()

tests/Functional/BundleInitializationTest.php

@@ -146,6 +146,18 @@ public function testExceptionWhenConfigureServiceNotInstalled()
         $this->bootKernel();
     }
 
+    public function testIssue793()
+    {
+        $kernel = $this->createKernel();
+        $kernel->addConfigFile(__DIR__ . '/Resources/config/issue-793/default.yaml');
+        $kernel->addConfigFile(__DIR__ . '/Resources/config/issue-793/dev.yaml');
+
+        $this->bootKernel();
+        $container = $this->getContainer();
+        $x = $container->get(S3Client::class);
+        self::assertSame('./docker/dynamodb/credentials', $x->getConfiguration()->get('sharedCredentialsFile'));
+    }
+
     protected function getBundleClass()
     {
         return AsyncAwsBundle::class;

tests/Functional/Resources/config/issue-793/default.yaml

@@ -0,0 +1,6 @@
+framework:
+    router:
+        utf8: true
+async_aws:
+    config:
+        sharedCredentialsFile: ~

tests/Functional/Resources/config/issue-793/dev.yaml

@@ -0,0 +1,3 @@
+async_aws:
+    config:
+        sharedCredentialsFile: './docker/dynamodb/credentials'