Merge pull request #41 from bstoney/aws-v3-config

Fixed passing request options to AWS S3v3 client
bushbaby · Jul 19, 2018 · 83d8f3a · 83d8f3a
2 parents 12e861d + 88a5c5a
commit 83d8f3a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Adapter/Factory/AwsS3v3AdapterFactory.php b/src/Adapter/Factory/AwsS3v3AdapterFactory.php
@@ -24,7 +24,7 @@ public function doCreateService(ServiceLocatorInterface $serviceLocator): Adapte
         $config = [
             'region' => $this->options['region'],
             'version' => $this->options['version'],
-            'request.options' => $this->options['request.options'],
+            'http' => $this->options['request.options'],
         ];
 
         // Override the endpoint for example: when using an s3 compatible host

diff --git a/test/Adapter/Factory/AwsS3v3AdapterFactoryTest.php b/test/Adapter/Factory/AwsS3v3AdapterFactoryTest.php
@@ -173,4 +173,33 @@ public function validateConfigProvider(): array
             ],
         ];
     }
+
+    public function testCreateServiceWithRequestOptions()
+    {
+        $this->markTestSkipped('Skipped because Aws3Sv2 and Aws3Sv3 are not compatible.');
+
+        $options = [
+            'credentials' => [
+                'key' => 'abc',
+                'secret' => 'def',
+            ],
+            'region' => 'ghi',
+            'bucket' => 'jkl',
+            'request.options' => [
+                'timeout' => 1,
+            ],
+        ];
+
+        $sm = Bootstrap::getServiceManager();
+        $factory = new AwsS3v3AdapterFactory($options);
+
+        /** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
+        $adapter = $factory($sm, 'awss3_default');
+
+        /** @var \Aws\Command $command */
+        $command = $adapter->getClient()->getCommand('GetObject');
+
+        self::assertTrue($command->hasParam('@http'));
+        self::assertEquals(['timeout' => 1], $command['@http']);
+    }
 }