#AC10721-changes in the implementation to remove the extra directoryexist check on mftf tests s3assertion file as it is not required

Author: glo05363

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

@@ -20,7 +20,7 @@
 use Magento\Framework\Phrase;
 use Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface;
 use Magento\RemoteStorage\Driver\DriverException;
-use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
+use Magento\RemoteStorage\Driver\RemoteDriverInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -30,7 +30,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AwsS3 implements ExtendedRemoteDriverInterface
+class AwsS3 implements RemoteDriverInterface
 {
     public const TYPE_DIR = 'dir';
     public const TYPE_FILE = 'file';
@@ -154,35 +154,6 @@ public function isExists($path): bool
         }
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isDirectoryExists($path): bool
-    {
-        if ($path === '/') {
-            return true;
-        }
-
-        $path = $this->normalizeRelativePath($path, true);
-
-        if (!$path) {
-            return true;
-        }
-
-        $pathStats = $this->stat($path);
-
-        if ($pathStats['type'] == self::TYPE_DIR) {
-            try {
-                return $this->adapter->directoryExists($path);
-            } catch (FlysystemFilesystemException $e) {
-                $this->logger->error($e->getMessage());
-                return false;
-            }
-        }
-
-        return false; // Return false if the path is not a directory
-    }
-
     /**
      * @inheritDoc
      */

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

@@ -16,12 +16,11 @@
 use Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterfaceFactory;
 use Magento\RemoteStorage\Driver\DriverException;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
-use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
+use Magento\RemoteStorage\Driver\RemoteDriverInterface;
 use Magento\RemoteStorage\Model\Config;
 
 /**
  * Creates a pre-configured instance of AWS S3 driver.
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AwsS3Factory implements DriverFactoryInterface
 {
@@ -91,7 +90,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function create(): ExtendedRemoteDriverInterface
+    public function create(): RemoteDriverInterface
     {
         try {
             return $this->createConfigured(
@@ -142,7 +141,7 @@ public function createConfigured(
         string $prefix,
         string $cacheAdapter = '',
         array $cacheConfig = []
-    ): ExtendedRemoteDriverInterface {
+    ): RemoteDriverInterface {
         $config = $this->prepareConfig($config);
         $client = new S3Client($config);
         $adapter = new AwsS3V3Adapter($client, $config['bucket'], $prefix);

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -199,7 +199,7 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
      */
     public function assertDirectoryExists($path, $message = ''): void
     {
-        $this->assertTrue($this->driver->isDirectoryExists($path), "Failed asserting $path exists. " . $message);
+        $this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
     }
 
     /**
@@ -213,7 +213,7 @@ public function assertDirectoryExists($path, $message = ''): void
      */
     public function assertDirectoryDoesNotExist($path, $message = ''): void
     {
-        $this->assertFalse($this->driver->isDirectoryExists($path), "Failed asserting $path does not exist. " . $message);
+        $this->assertFalse($this->driver->isDirectory($path), "Failed asserting $path does not exist. " . $message);
     }
 
     /**

app/code/Magento/RemoteStorage/Driver/DriverFactoryInterface.php

@@ -16,11 +16,11 @@ interface DriverFactoryInterface
     /**
      * Creates driver from stored config.
      *
-     * @return ExtendedRemoteDriverInterface
+     * @return RemoteDriverInterface
      *
      * @throws DriverException
      */
-    public function create(): ExtendedRemoteDriverInterface;
+    public function create(): RemoteDriverInterface;
 
     /**
      * Creates driver from config.
@@ -29,7 +29,7 @@ public function create(): ExtendedRemoteDriverInterface;
      * @param string $prefix
      * @param string $cacheAdapter
      * @param array $cacheConfig
-     * @return ExtendedRemoteDriverInterface
+     * @return RemoteDriverInterface
      *
      * @throws DriverException
      */
@@ -38,5 +38,5 @@ public function createConfigured(
         string $prefix,
         string $cacheAdapter = '',
         array $cacheConfig = []
-    ): ExtendedRemoteDriverInterface;
+    ): RemoteDriverInterface;
 }

app/code/Magento/RemoteStorage/Driver/ExtendedRemoteDriverInterface.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 use Magento\RemoteStorage\Driver\DriverFactoryPool;
-use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
+use Magento\RemoteStorage\Driver\RemoteDriverInterface;
 use Magento\RemoteStorage\Setup\ConfigOptionsList;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -86,7 +86,7 @@ public function testValidate(array $input, bool $isDeploymentConfigExists, array
                 ->with($input['remote-storage-driver'])
                 ->willReturn($driverFactoryMock);
 
-            $remoteDriverMock = $this->getMockBuilder(ExtendedRemoteDriverInterface::class)
+            $remoteDriverMock = $this->getMockBuilder(RemoteDriverInterface::class)
                 ->disableOriginalConstructor()
                 ->getMock();