[AWS S3] MC-37479: Support by Magento Content Design (#6179)

* MC-37479: Support by Magento Content Design

Author: shiftedreality

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -7,26 +7,35 @@
 
 namespace Magento\AwsS3\Driver;
 
+use Aws\S3\S3Client;
+use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use Magento\AwsS3\Model\Config;
-
 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 
 /**
  * Creates a pre-configured instance of AWS S3 driver.
  */
 class AwsS3Factory implements DriverFactoryInterface
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @var Config
      */
     private $config;
 
     /**
+     * @param ObjectManagerInterface $objectManager
      * @param Config $config
      */
-    public function __construct(Config $config)
+    public function __construct(ObjectManagerInterface $objectManager, Config $config)
     {
+        $this->objectManager = $objectManager;
         $this->config = $config;
     }
 
@@ -37,11 +46,33 @@ public function __construct(Config $config)
      */
     public function create(): DriverInterface
     {
-        return new AwsS3(
-            $this->config->getRegion(),
-            $this->config->getBucket(),
-            $this->config->getAccessKey(),
-            $this->config->getSecretKey()
+        $config = [
+            'region' => $this->config->getRegion(),
+            'version' => 'latest'
+        ];
+
+        $key = $this->config->getAccessKey();
+        $secret = $this->config->getSecretKey();
+
+        if ($key && $secret) {
+            $config['credentials'] = [
+                'key' => $key,
+                'secret' => $secret,
+            ];
+        }
+
+        return $this->objectManager->create(
+            AwsS3::class,
+            [
+                'adapter' => $this->objectManager->create(
+                    AwsS3Adapter::class,
+                    [
+                        'client' => $this->objectManager->create(S3Client::class, ['args' => $config]),
+                        'bucket' => $this->config->getBucket(),
+                        'prefix' => $this->config->getPrefix()
+                    ]
+                )
+            ]
         );
     }
 }

app/code/Magento/AwsS3/Driver/AwsS3Factory.php

@@ -7,28 +7,28 @@
 
 namespace Magento\AwsS3\Model;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Configuration for AWS S3.
  */
 class Config
 {
-    public const PATH_DRIVER = 'system/file_system/driver';
-    public const PATH_REGION = 'system/file_system/region';
-    public const PATH_BUCKET = 'system/file_system/bucket';
-    public const PATH_ACCESS_KEY = 'system/file_system/access_key';
-    public const PATH_SECRET_KEY = 'system/file_system/secret_key';
+    public const PATH_REGION = 'remote_storage/region';
+    public const PATH_BUCKET = 'remote_storage/bucket';
+    public const PATH_ACCESS_KEY = 'remote_storage/access_key';
+    public const PATH_SECRET_KEY = 'remote_storage/secret_key';
+    public const PATH_PREFIX = 'remote_storage/prefix';
 
     /**
-     * @var ScopeConfigInterface
+     * @var DeploymentConfig
      */
     private $config;
 
     /**
-     * @param ScopeConfigInterface $config
+     * @param DeploymentConfig $config
      */
-    public function __construct(ScopeConfigInterface $config)
+    public function __construct(DeploymentConfig $config)
     {
         $this->config = $config;
     }
@@ -40,7 +40,7 @@ public function __construct(ScopeConfigInterface $config)
      */
     public function getRegion(): string
     {
-        return (string)$this->config->getValue(self::PATH_REGION);
+        return (string)$this->config->get(self::PATH_REGION);
     }
 
     /**
@@ -50,7 +50,7 @@ public function getRegion(): string
      */
     public function getBucket(): string
     {
-        return (string)$this->config->getValue(self::PATH_BUCKET);
+        return (string)$this->config->get(self::PATH_BUCKET);
     }
 
     /**
@@ -60,7 +60,7 @@ public function getBucket(): string
      */
     public function getAccessKey(): string
     {
-        return (string)$this->config->getValue(self::PATH_ACCESS_KEY);
+        return (string)$this->config->get(self::PATH_ACCESS_KEY);
     }
 
     /**
@@ -70,6 +70,16 @@ public function getAccessKey(): string
      */
     public function getSecretKey(): string
     {
-        return (string)$this->config->getValue(self::PATH_SECRET_KEY);
+        return (string)$this->config->get(self::PATH_SECRET_KEY);
+    }
+
+    /**
+     * Retrieves prefix.
+     *
+     * @return string
+     */
+    public function getPrefix(): string
+    {
+        return (string)$this->config->get(self::PATH_PREFIX, '');
     }
 }