B2B-1610: Upgrade to Flysystem 2.0

- metadata and cache fix

Author: Roman Hanin

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

@@ -119,7 +119,15 @@ public function createConfigured(
         $client = new S3Client($config);
         $adapter = new AwsS3V3Adapter($client, $config['bucket'], $prefix);
         $cache = $this->cacheInterfaceFactory->create(
-            $this->cachePrefix ? ['prefix' => $this->cachePrefix] : []
+            // Custom cache prefix required to distinguish cache records for different sources.
+            // phpcs:ignore Magento2.Security.InsecureFunction
+            $this->cachePrefix ? ['prefix' => $this->cachePrefix] : ['prefix' => md5($config['bucket'] . $prefix)]
+        );
+        $metadataProvider = $this->metadataProviderFactory->create(
+            [
+                'adapter' => $adapter,
+                'cache' => $cache
+            ]
         );
 
         return $this->objectManager->create(
@@ -128,16 +136,12 @@ public function createConfigured(
                 'adapter' => $this->cachedAdapterInterfaceFactory->create(
                     [
                         'adapter' => $adapter,
-                        'cache' => $cache
+                        'cache' => $cache,
+                        'metadataProvider' => $metadataProvider
                     ]
                 ),
                 'objectUrl' => $client->getObjectUrl($config['bucket'], trim($prefix, '\\/') . '/.'),
-                'metadataProvider' => $this->metadataProviderFactory->create(
-                    [
-                        'adapter' => $adapter,
-                        'cache' => $cache
-                    ]
-                ),
+                'metadataProvider' => $metadataProvider,
             ]
         );
     }

app/code/Magento/RemoteStorage/Driver/Adapter/CachedAdapter.php

@@ -27,11 +27,6 @@ class CachedAdapter implements CachedAdapterInterface
      */
     private $cache;
 
-    /**
-     * @var MetadataProviderInterfaceFactory
-     */
-    private $metadataProviderFactory;
-
     /**
      * @var MetadataProviderInterface
      */
@@ -42,16 +37,16 @@ class CachedAdapter implements CachedAdapterInterface
      *
      * @param FilesystemAdapter $adapter
      * @param CacheInterface $cache
-     * @param MetadataProviderInterfaceFactory $metadataProviderFactory
+     * @param MetadataProviderInterface $metadataProvider
      */
     public function __construct(
         FilesystemAdapter $adapter,
         CacheInterface $cache,
-        MetadataProviderInterfaceFactory $metadataProviderFactory
+        MetadataProviderInterface $metadataProvider
     ) {
         $this->adapter = $adapter;
         $this->cache = $cache;
-        $this->metadataProviderFactory = $metadataProviderFactory;
+        $this->metadataProvider = $metadataProvider;
     }
 
     /**
@@ -201,14 +196,6 @@ public function listContents(string $path, bool $deep): iterable
      */
     private function getMetadata($path)
     {
-        if (!$this->metadataProvider) {
-            $this->metadataProvider = $this->metadataProviderFactory->create(
-                [
-                    'adapter' => $this->adapter,
-                    'cache' => $this->cache
-                ]
-            );
-        }
         return $this->metadataProvider->getMetadata($path);
     }