Merge pull request #83 from eivydas/fix-awss3-options

Fix AWS S3 adapter options
bushbaby · May 30, 2023 · 2eee1c5 · 2eee1c5
2 parents 6b2c9d6 + 0249227
commit 2eee1c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/config/bsb_flysystem.local.php.dist b/config/bsb_flysystem.local.php.dist
@@ -20,10 +20,10 @@ return [
                 'factory' => BsbFlysystem\Adapter\Factory\FtpAdapterFactory::class,
                 'options' => [
                     'connectionOptions' => [
-                         'host' => 'localhost',
-                         'root' => '/var/www/html',
-                         'username' => 'username',
-                         'password' => '',
+                        'host' => 'localhost',
+                        'root' => '/var/www/html',
+                        'username' => 'username',
+                        'password' => '',
                         //  'port' => 21,
                         //  'ssl' => false,
                         //  'timeout' => 90,
@@ -146,7 +146,6 @@ return [
                             'secret' => 'xxxxx',
                         ],
                         'region' => 'eu-west-1',
-                        'bucket' => 'xxxxx',
                         'version' => 'latest', // default: 'latest'
                         // guzzle request options; see http://docs.guzzlephp.org/en/latest/request-options.html#proxy
                         'http' => [
@@ -156,13 +155,14 @@ return [
                     ],
                     'bucket' => 'xxxxx',
                     // 'prefix' => '',
+                    // 'visibility' => \League\Flysystem\Visibility::PUBLIC,
                     // 'mimeTypeDetector' => 'service_manager_key', // return a \League\MimeTypeDetection\MimeTypeDetector
-                    // 'defaultVisibility' => \League\Flysystem\Visibility::PUBLIC,
                     // 'options' => [],
                     // 'streamReads' => true,
                     // 'forwardedOptions' => self::AVAILABLE_OPTIONS,
                     // 'metadataFields' => self::EXTRA_METADATA_FIELDS,
                     // 'multipartUploadOptions' => self::MUP_AVAILABLE_OPTIONS,
+                    // 'iam' => false,
                 ],
             ],
             'replicate_default' => [
@@ -201,7 +201,7 @@ return [
                 ],
             ],
         ],
-         'adapter_manager' => [
+        'adapter_manager' => [
             'config' => [],
             'lazy_services' => [
                 // directory where proxy classes will be written - default to system_get_tmp_dir()

diff --git a/src/Adapter/Factory/AwsS3v3AdapterFactory.php b/src/Adapter/Factory/AwsS3v3AdapterFactory.php
@@ -53,6 +53,8 @@ public function doCreateService(ContainerInterface $container): FilesystemAdapte
             $this->options['visibility'] = $container->get($this->options['visibility']);
         }
 
+        unset($this->options['iam']);
+
         return new AwsS3V3Adapter(...$this->options);
     }
 

diff --git a/test/Adapter/Factory/AwsS3v3AdapterFactoryTest.php b/test/Adapter/Factory/AwsS3v3AdapterFactoryTest.php
@@ -72,14 +72,15 @@ public function testGettingFromServiceManager(): void
             'client' => [
                 'credentials' => [
                     'key' => 'abc',
-                     'secret' => 'xxx',
+                    'secret' => 'xxx',
                 ],
                 'region' => 'eu-west-1',
                 'version' => 'latest',
             ],
             'bucket' => 'xxxxx',
             'visibility' => 'a-visibility',
             'mimeTypeDetector' => 'a-mime-type-detector',
+            'iam' => false,
         ]);
 
         $this->assertInstanceOf(AwsS3V3Adapter::class, $adapter);

diff --git a/test/Assets/bsb_flysystem.local.php b/test/Assets/bsb_flysystem.local.php
@@ -35,10 +35,10 @@
                 'factory' => BsbFlysystem\Adapter\Factory\FtpAdapterFactory::class,
                 'options' => [
                     'connectionOptions' => [
-                         'host' => 'localhost',
-                         'root' => '/var/www/html',
-                         'username' => 'username',
-                         'password' => '',
+                        'host' => 'localhost',
+                        'root' => '/var/www/html',
+                        'username' => 'username',
+                        'password' => '',
                         //  'port' => 21,
                         //  'ssl' => false,
                         //  'timeout' => 90,
@@ -161,7 +161,6 @@
                             'secret' => 'xxxxx',
                         ],
                         'region' => 'eu-west-1',
-                        'bucket' => 'xxxxx',
                         'version' => 'latest', // default: 'latest'
                         // guzzle request options; see http://docs.guzzlephp.org/en/latest/request-options.html#proxy
                         'http' => [
@@ -171,13 +170,14 @@
                     ],
                     'bucket' => 'xxxxx',
                     // 'prefix' => '',
+                    // 'visibility' => \League\Flysystem\Visibility::PUBLIC,
                     // 'mimeTypeDetector' => 'service_manager_key', // return a \League\MimeTypeDetection\MimeTypeDetector
-                    // 'defaultVisibility' => \League\Flysystem\Visibility::PUBLIC,
                     // 'options' => [],
                     // 'streamReads' => true,
                     // 'forwardedOptions' => self::AVAILABLE_OPTIONS,
                     // 'metadataFields' => self::EXTRA_METADATA_FIELDS,
                     // 'multipartUploadOptions' => self::MUP_AVAILABLE_OPTIONS,
+                    // 'iam' => false,
                 ],
             ],
             'replicate_default' => [