B2B-2028: [AWS S3] [Integration Tests]: Investigate Test Failures in CustomerCustomAttributes module

Author: oshmyheliuk

app/code/Magento/RemoteStorage/Model/File/Uploader.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RemoteStorage\Model\File;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\File\Mime;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\TargetDirectory;
+use Magento\Framework\Filesystem\DriverPool;
+use Magento\RemoteStorage\Model\Config;
+
+/**
+ * Uploader class for cases when remote storage is enabled and the uploaded file is located on remote storage
+ */
+class Uploader extends \Magento\Framework\File\Uploader
+{
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $tmpDirectoryWrite;
+
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $remoteDirectoryWrite;
+
+    /**
+     * Copies file to the tmp directory if remote storage is enabled and tmp file is located on remote storage
+     *
+     * {@inheritDoc}
+     */
+    public function __construct(
+        $fileId,
+        Mime $fileMime = null,
+        DirectoryList $directoryList = null,
+        DriverPool $driverPool = null,
+        TargetDirectory $targetDirectory = null,
+        Filesystem $filesystem = null
+    ) {
+        $targetDirectory = $targetDirectory ?: ObjectManager::getInstance()->get(TargetDirectory::class);
+        $filesystem = $filesystem ?: ObjectManager::getInstance()->get(FileSystem::class);
+        $config = ObjectManager::getInstance()->get(Config::class);
+
+        if ($config->isEnabled() && isset($fileId['tmp_name'])) {
+            $this->tmpDirectoryWrite = $filesystem->getDirectoryWrite(DirectoryList::TMP);
+            $this->remoteDirectoryWrite = $targetDirectory->getDirectoryWrite(DirectoryList::ROOT);
+
+            $fileId['tmp_name'] = $this->copyFileToTmp($fileId['tmp_name']);
+        }
+
+        parent::__construct($fileId, $fileMime, $directoryList, $driverPool, $targetDirectory, $filesystem);
+    }
+
+    /**
+     * Moves file from the remote storage to the tmp folder
+     *
+     * @param string $filePath
+     * @return string
+     * @throws FileSystemException
+     */
+    private function copyFileToTmp(string $filePath): string
+    {
+        $absolutePath = $this->remoteDirectoryWrite->getAbsolutePath($filePath);
+        if ($this->remoteDirectoryWrite->isFile($absolutePath)) {
+            $this->tmpDirectoryWrite->create();
+            $tmpPath = $this->tmpDirectoryWrite->getAbsolutePath() . basename($filePath);
+            $content = $this->remoteDirectoryWrite->getDriver()->fileGetContents($filePath);
+            $this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content);
+
+            return $tmpPath;
+        }
+
+        return $filePath;
+    }
+}

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

@@ -11,6 +11,7 @@
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProvider"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactoryInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactory"/>
     <preference for="Magento\Framework\Filesystem\DriverPool" type="Magento\RemoteStorage\Driver\DriverPool"/>
+    <preference for="Magento\Framework\File\Uploader" type="Magento\RemoteStorage\Model\File\Uploader"/>
     <virtualType name="remoteWriteFactory" type="Magento\Framework\Filesystem\Directory\WriteFactory">
         <arguments>
             <argument name="driverPool" xsi:type="object">Magento\RemoteStorage\Driver\DriverPool</argument>
@@ -99,6 +100,9 @@
     <type name="Magento\Framework\Image\Adapter\AbstractAdapter">
         <plugin name="remoteImageFile" type="Magento\RemoteStorage\Plugin\Image" sortOrder="10"/>
     </type>
+    <type name="Magento\Framework\Archive\Zip">
+        <plugin name="remoteZipArchive" type="Magento\RemoteStorage\Plugin\Zip" sortOrder="10"/>
+    </type>
     <type name="Magento\Catalog\Model\Category\FileInfo">
         <arguments>
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>