MC-39033: Rename AWS S3 module

Author: shiftedreality

app/code/Magento/AwsS3/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "magento/module-aws-s-3",
+    "name": "magento/module-aws-s3",
     "description": "N/A",
     "config": {
         "sort-packages": true

app/code/Magento/RemoteStorage/Driver/Cache/CacheFactory.php

@@ -7,10 +7,15 @@
 
 namespace Magento\RemoteStorage\Driver\Cache;
 
+use League\Flysystem\Adapter\Local;
 use League\Flysystem\Cached\CacheInterface;
 use League\Flysystem\Cached\Storage\Memory;
 use League\Flysystem\Cached\Storage\Predis;
+use League\Flysystem\Cached\Storage\Adapter;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\RemoteStorage\Driver\DriverException;
+use Magento\RemoteStorage\Driver\DriverPool;
 use Predis\Client;
 
 /**
@@ -20,14 +25,32 @@ class CacheFactory
 {
     public const ADAPTER_PREDIS = 'predis';
     public const ADAPTER_MEMORY = 'memory';
+    public const ADAPTER_LOCAL = 'local';
 
     private const CACHE_KEY = 'storage';
+    private const CACHE_FILE = 'storage_cache.json';
 
     /**
      * Cache for 30 days.
      */
     private const CACHE_EXPIRATION = 30 * 86400;
 
+    /**
+     * @var string
+     */
+    private $localCacheRoot;
+
+    /**
+     * @param Filesystem $filesystem
+     */
+    public function __construct(Filesystem $filesystem)
+    {
+        $this->localCacheRoot = $filesystem->getDirectoryRead(
+            DirectoryList::VAR_DIR,
+            DriverPool::FILE
+        )->getAbsolutePath();
+    }
+
     /**
      * Create cache adapter.
      *
@@ -47,6 +70,8 @@ public function create(string $adapter, array $config = []): CacheInterface
                 return new Predis(new Client($config), self::CACHE_KEY, self::CACHE_EXPIRATION);
             case self::ADAPTER_MEMORY:
                 return new Memory();
+            case self::ADAPTER_LOCAL:
+                return new Adapter(new Local($this->localCacheRoot), self::CACHE_FILE, self::CACHE_EXPIRATION);
         }
 
         throw new DriverException(__('Cache adapter %1 is not supported', $adapter));

app/code/Magento/RemoteStorage/etc/di.xml

@@ -31,7 +31,13 @@
         </arguments>
     </virtualType>
     <virtualType name="fullRemoteFilesystem" type="Magento\RemoteStorage\Filesystem" />
+    <virtualType name="stdFilesystem" type="Magento\Framework\Filesystem" />
     <preference for="Magento\Framework\Filesystem" type="customRemoteFilesystem"/>
+    <type name="Magento\RemoteStorage\Driver\Cache\CacheFactory">
+        <arguments>
+            <argument name="filesystem" xsi:type="object">stdFilesystem</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Filesystem\Directory\TargetDirectory">
         <arguments>
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>

composer.json

@@ -327,7 +327,7 @@
         "tinymce/tinymce": "3.4.7",
         "magento/module-tinymce-3": "*",
         "magento/module-csp": "*",
-        "magento/module-aws-s-3": "*",
+        "magento/module-aws-s3": "*",
         "magento/module-remote-storage": "*"
     },
     "conflict": {