Merge pull request #128 from glo72880/MCLOUD-10167

MCLOUD-10167: Skip ElasticSearch & OpenSearch error when LiveSearch enabled

Author: andriyShevtsov

src/Config/Validator/Deploy/ElasticSearchIntegrity.php

@@ -8,6 +8,7 @@
 namespace Magento\MagentoCloud\Config\Validator\Deploy;
 
 use Magento\MagentoCloud\App\Error;
+use Magento\MagentoCloud\Config\Magento\Shared\Reader;
 use Magento\MagentoCloud\Config\Validator;
 use Magento\MagentoCloud\Config\ValidatorException;
 use Magento\MagentoCloud\Config\ValidatorInterface;
@@ -42,22 +43,30 @@ class ElasticSearchIntegrity implements ValidatorInterface
      */
     private $openSearch;
 
+    /**
+     * @var Reader
+     */
+    private $reader;
+
     /**
      * @param MagentoVersion $magentoVersion
      * @param Validator\ResultFactory $resultFactory
      * @param ElasticSearch $elasticSearch
      * @param OpenSearch $openSearch
+     * @param Reader $reader
      */
     public function __construct(
         MagentoVersion $magentoVersion,
         Validator\ResultFactory $resultFactory,
         ElasticSearch $elasticSearch,
-        OpenSearch $openSearch
+        OpenSearch $openSearch,
+        Reader $reader
     ) {
         $this->magentoVersion = $magentoVersion;
         $this->resultFactory = $resultFactory;
         $this->elasticsearch = $elasticSearch;
         $this->openSearch = $openSearch;
+        $this->reader = $reader;
     }
 
     /**
@@ -70,8 +79,11 @@ public function validate(): Validator\ResultInterface
                 return $this->resultFactory->success();
             }
 
+            $modules = $this->reader->read()['modules'] ?? [];
+            $liveSearchEnabled = $modules['Magento_LiveSearchAdapter'] ?? false;
+
             if ($this->magentoVersion->isGreaterOrEqual('2.4.0')
-                && !$this->elasticsearch->isInstalled()
+                && !$this->elasticsearch->isInstalled() && !$liveSearchEnabled
             ) {
                 return $this->resultFactory->errorByCode(Error::DEPLOY_ES_SERVICE_NOT_INSTALLED);
             }

src/Config/Validator/Deploy/OpenSearchIntegrity.php

@@ -8,6 +8,7 @@
 namespace Magento\MagentoCloud\Config\Validator\Deploy;
 
 use Magento\MagentoCloud\App\Error;
+use Magento\MagentoCloud\Config\Magento\Shared\Reader;
 use Magento\MagentoCloud\App\GenericException;
 use Magento\MagentoCloud\Config\Validator;
 use Magento\MagentoCloud\Config\ValidatorException;
@@ -43,22 +44,30 @@ class OpenSearchIntegrity implements ValidatorInterface
      */
     private $openSearch;
 
+    /**
+     * @var Reader
+     */
+    private $reader;
+
     /**
      * @param MagentoVersion $magentoVersion
      * @param Validator\ResultFactory $resultFactory
      * @param ElasticSearch $elasticSearch
      * @param OpenSearch $openSearch
+     * @param Reader $reader
      */
     public function __construct(
         MagentoVersion $magentoVersion,
         Validator\ResultFactory $resultFactory,
         ElasticSearch $elasticSearch,
-        OpenSearch $openSearch
+        OpenSearch $openSearch,
+        Reader $reader
     ) {
         $this->magentoVersion = $magentoVersion;
         $this->resultFactory = $resultFactory;
         $this->elasticsearch = $elasticSearch;
         $this->openSearch = $openSearch;
+        $this->reader = $reader;
     }
 
     /**
@@ -77,8 +86,11 @@ public function validate(): Validator\ResultInterface
                 return $this->resultFactory->errorByCode(Error::DEPLOY_MAGENTO_VERSION_DOES_NOT_SUPPORT_OS);
             }
 
+            $modules = $this->reader->read()['modules'] ?? [];
+            $liveSearchEnabled = $modules['Magento_LiveSearchAdapter'] ?? false;
+
             if ($this->magentoVersion->isGreaterOrEqual('2.4.3-p2')
-                && !$this->openSearch->isInstalled()
+                && !$this->openSearch->isInstalled() && !$liveSearchEnabled
             ) {
                 return $this->resultFactory->errorByCode(Error::DEPLOY_OS_SERVICE_NOT_INSTALLED);
             }

src/Test/Unit/Config/Validator/Deploy/ElasticsearchIntegrityTest.php

@@ -8,6 +8,7 @@
 namespace Magento\MagentoCloud\Test\Unit\Config\Validator\Deploy;
 
 use Magento\MagentoCloud\App\Error;
+use Magento\MagentoCloud\Config\Magento\Shared\Reader;
 use Magento\MagentoCloud\Config\Validator\Deploy\ElasticSearchIntegrity;
 use Magento\MagentoCloud\Config\Validator\ResultFactory;
 use Magento\MagentoCloud\Config\ValidatorException;
@@ -47,6 +48,11 @@ class ElasticsearchIntegrityTest extends TestCase
      */
     private $openSearchMock;
 
+    /**
+     * @var Reader|MockObject
+     */
+    private $readerMock;
+
     /**
      * @inheritDoc
      */
@@ -56,12 +62,14 @@ protected function setUp(): void
         $this->resultFactoryMock = $this->createMock(ResultFactory::class);
         $this->elasticSearchMock = $this->createMock(ElasticSearch::class);
         $this->openSearchMock = $this->createMock(OpenSearch::class);
+        $this->readerMock = $this->createMock(Reader::class);
 
         $this->validator = new ElasticSearchIntegrity(
             $this->magentoVersionMock,
             $this->resultFactoryMock,
             $this->elasticSearchMock,
-            $this->openSearchMock
+            $this->openSearchMock,
+            $this->readerMock
         );
     }
 
@@ -208,4 +216,34 @@ public function testValidateNoElasticSearchWithOpenSearch240(): void
 
         $this->validator->validate();
     }
+
+    /**
+     * @throws ValidatorException
+     */
+    public function testValidateNoElasticSearchAndNoOpenSearchWithLiveSearchEnabledMagentoGreater244(): void
+    {
+        $this->magentoVersionMock->expects($this->once())
+            ->method('satisfies')
+            ->with('>=2.4.3-p2')
+            ->willReturn(true);
+        $this->magentoVersionMock->expects($this->once())
+            ->method('isGreaterOrEqual')
+            ->with('2.4.0')
+            ->willReturn(true);
+        $this->openSearchMock->expects($this->once())
+            ->method('isInstalled')
+            ->willReturn(false);
+        $this->elasticSearchMock->expects($this->once())
+            ->method('isInstalled')
+            ->willReturn(false);
+
+        $this->readerMock->expects($this->once())
+            ->method('read')
+            ->willReturn(['modules' => ['Magento_LiveSearchAdapter' => 1]]);
+
+        $this->resultFactoryMock->expects($this->once())
+            ->method('success');
+
+        $this->validator->validate();
+    }
 }

src/Test/Unit/Http/TransferStatsHandlerTest.php

@@ -96,7 +96,7 @@ public function testStatHandlerTransferTime()
         $stats = new TransferStats($mockRequest, null, 3.1415926);
 
         $mockRequest->method('getUri')
-            ->wilLReturn('/');
+            ->wilLReturn($mockUriInterface);
         $this->loggerMock->expects($this->once())
             ->method('debug')
             ->with('cURL stats are missing from the request; using total transfer time');

src/Test/Unit/Service/ValidatorTest.php

@@ -110,7 +110,7 @@ public function testValidateNonexistentService()
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function validateVersionsDataProvider(): array
+    public function validateVersionsDataProvider(): array
     {
         return [
             [