B2B-2024: [AWS S3] [Integration Tests]: Investigate Test Failures in cms module

Author: oshmyheliuk

app/code/Magento/RemoteStorage/Model/Filesystem/Directory/WriteFactory.php

@@ -19,8 +19,6 @@
 class WriteFactory extends BaseWriteFactory
 {
     /**
-     * Object Manager
-     *
      * @var ObjectManagerInterface
      */
     private $objectManager;
@@ -32,19 +30,29 @@ class WriteFactory extends BaseWriteFactory
      */
     private $driverPool;
 
+    /**
+     * Deny List Validator
+     *
+     * @var DenyListPathValidator
+     */
+    private $denyListPathValidator;
+
     /**
      * WriteFactory constructor.
      *
      * @param ObjectManagerInterface $objectManager
      * @param BaseDriverPool $driverPool
+     * @param DenyListPathValidator|null $denyListPathValidator
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        BaseDriverPool $driverPool
+        BaseDriverPool $driverPool,
+        ?DenyListPathValidator $denyListPathValidator = null
     ) {
         $this->objectManager = $objectManager;
         $this->driverPool = $driverPool;
-        parent::__construct($driverPool);
+        $this->denyListPathValidator = $denyListPathValidator;
+        parent::__construct($driverPool, $denyListPathValidator);
     }
 
     /**
@@ -64,7 +72,7 @@ public function create(
 
             $validators = [
                 'pathValidator' => new PathValidator($driver),
-                'denyListPathValidator' => new DenyListPathValidator($driver)
+                'denyListPathValidator' => $this->denyListPathValidator ?: new DenyListPathValidator($driver)
             ];
 
             $pathValidator = new CompositePathValidator($validators);
@@ -82,6 +90,5 @@ public function create(
         } else {
             return parent::create($path, $driverCode, $createPermissions);
         }
-
     }
 }

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php

@@ -12,10 +12,10 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\DenyListPathValidator;
-use Magento\Framework\Filesystem\Directory\TargetDirectory;
-use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\Driver\File;
+use Magento\RemoteStorage\Driver\DriverPool;
+use Magento\RemoteStorage\Model\Filesystem\Directory\WriteFactory;
 
 /**
  * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles class.
@@ -79,11 +79,6 @@ class DeleteFilesTest extends \PHPUnit\Framework\TestCase
      */
     private $bypassDenyListWrite;
 
-    /**
-     * @var WriteInterface
-     */
-    private $rootDirectory;
-
     /**
      * @inheritdoc
      * @throws FileSystemException
@@ -97,8 +92,6 @@ protected function setUp(): void
         /** @var \Magento\Cms\Helper\Wysiwyg\Images $imagesHelper */
         $this->imagesHelper = $this->objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        $this->rootDirectory = $this->objectManager->get(TargetDirectory::class)
-            ->getDirectoryWrite(DirectoryList::ROOT);
         $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot() . $directoryName;
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
         $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
@@ -190,8 +183,13 @@ public function testDeleteHtaccess()
         $bypassDenyListWriteFactory = $this->objectManager->create(WriteFactory::class, [
             'denyListPathValidator' => $denyListPathValidator
         ]);
-        $this->bypassDenyListWrite = $bypassDenyListWriteFactory
-            ->create($this->directoryList->getPath(DirectoryList::MEDIA));
+        $this->bypassDenyListWrite = $bypassDenyListWriteFactory->create(
+            $this->mediaDirectory->getAbsolutePath(),
+            $this->mediaDirectory->getDriver() instanceof File ? DriverPool::FILE : DriverPool::REMOTE,
+            null,
+            DirectoryList::MEDIA
+        );
+
         if (!$this->bypassDenyListWrite->isFile($path)) {
             $this->bypassDenyListWrite->writeFile($path, "Order deny,allow\nDeny from all");
         }
@@ -205,6 +203,7 @@ public function testDeleteHtaccess()
                 $this->bypassDenyListWrite->getRelativePath($testDir . '/' . '.htaccess')
             )
         );
+        $this->bypassDenyListWrite->delete($testDir);
     }
 
     /**

lib/internal/Magento/Framework/Filesystem/Directory/DenyListPathValidator.php

@@ -55,7 +55,7 @@ public function validate(
     ): void {
         $realDirectoryPath = $this->driver->getRealPathSafety($directoryPath);
         $fullPath = $this->driver->getAbsolutePath(
-            $realDirectoryPath . DIRECTORY_SEPARATOR,
+            rtrim($realDirectoryPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
             $path,
             $scheme
         );