MCLOUD-13493: Made opensearch2 compatible with 2.4.4 & 2.4.5

Author: prateek-karanpuria-adobe

src/Service/OpenSearch.php

@@ -51,7 +51,7 @@ public function __construct(
      */
     public function getFullEngineName(): string
     {
-        if ($this->magentoVersion->isGreaterOrEqual('2.4.6')) {
+        if ($this->magentoVersion->isGreaterOrEqual('2.4.4')) {
             return static::ENGINE_NAME;
         }
 

src/Service/Validator.php

@@ -85,9 +85,8 @@ class Validator
             '>=2.4.4' => '~7.10.0', // Greater than 7.10 isn't supported on cloud infrastructure.
         ],
         ServiceInterface::NAME_OPENSEARCH => [
-            '>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.4-p7 || >=2.4.5 <2.4.5-p7' => '~1.1.0 || 1.2.*',
-            '>=2.4.4-p8 < 2.4.5 || >=2.4.5-p6 <2.4.6'  => '1.3.*',
-            '>=2.4.6' => '^2'
+            '>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.0' => '~1.1.0 || 1.2.*',
+            '>=2.4.4' => '^2'
         ],
         ServiceInterface::NAME_RABBITMQ => [
             '<2.3.0' => '~3.5.0',

src/Step/Deploy/InstallUpdate/Install/Setup/InstallCommandFactory.php

@@ -268,7 +268,7 @@ private function getEsOptions(): array
                 $configuration = $this->openSearch->getConfiguration();
                 $isAuthEnabled = $this->openSearch->isAuthEnabled();
 
-                if ($this->magentoVersion->isGreaterOrEqual('2.4.6')) {
+                if ($this->magentoVersion->isGreaterOrEqual('2.4.4')) {
                     $enginePrefixName = 'opensearch';
                 }
             } else {

src/Test/Unit/Service/OpenSearchTest.php

@@ -205,7 +205,12 @@ public function getVersionFromTypeDataProvider()
                 ],
                 '1.1'
             ],
-
+            [
+                [
+                    ['host' => '127.0.0.1', 'port' => '1234', 'type' => 'opensearch:2.0']
+                ],
+                '2.0'
+            ],
         ];
     }
 

src/Test/Unit/Service/ValidatorTest.php

@@ -332,7 +332,7 @@ public function validateVersionsDataProvider(): array
             [
                 '2.4.4',
                 [
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.2',
+                    ServiceInterface::NAME_OPENSEARCH => '2.3.0',
                     ServiceInterface::NAME_REDIS => '6.2',
                     ServiceInterface::NAME_REDIS_SESSION => '6.2',
                     ServiceInterface::NAME_RABBITMQ => '3.9'
@@ -416,7 +416,7 @@ public function validateVersionsDataProvider(): array
                     ServiceInterface::NAME_NGINX => '1.18.0',
                     ServiceInterface::NAME_VARNISH => '7.0.0',
                     ServiceInterface::NAME_REDIS => '6.2.6',
-                    ServiceInterface::NAME_OPENSEARCH => '1.2',
+                    ServiceInterface::NAME_OPENSEARCH => '2.3.0',
                     ServiceInterface::NAME_RABBITMQ => '3.9.0'
                 ],
                 0
@@ -449,7 +449,7 @@ public function validateVersionsDataProvider(): array
                     ServiceInterface::NAME_NGINX => '1.18.0',
                     ServiceInterface::NAME_VARNISH => '7.0.0',
                     ServiceInterface::NAME_REDIS => '6.2.6',
-                    ServiceInterface::NAME_OPENSEARCH => '1.2',
+                    ServiceInterface::NAME_OPENSEARCH => '2.3.0',
                     ServiceInterface::NAME_RABBITMQ => '3.9.0'
                 ],
                 0

src/Test/Unit/Step/Deploy/InstallUpdate/Install/Setup/InstallCommandFactoryTest.php

@@ -501,8 +501,7 @@ public function testExecuteWithOSauthOptions(
             ->willReturnMap([
                 ['2.4.0', true],
                 ['2.4.2', true],
-                ['2.4.4', true],
-                ['2.4.6', $greaterOrEqual],
+                ['2.4.4', $greaterOrEqual],
             ]);
         $this->magentoVersionMock->expects($this->once())
             ->method('satisfies')
@@ -516,7 +515,7 @@ public function testExecuteWithOSauthOptions(
             ->willReturn(true);
         $this->openSearchMock->expects($this->once())
             ->method('getFullEngineName')
-            ->willReturn('opensearch1');
+            ->willReturn('opensearch');
         $this->openSearchMock->expects($this->once())
             ->method('getHost')
             ->willReturn('127.0.0.1');
@@ -537,7 +536,7 @@ public function testExecuteWithOSauthOptions(
 
         $this->elasticSearchMock->expects($this->once())
             ->method('isInstalled')
-            ->willReturn(true);
+            ->willReturn(false);
         $this->elasticSearchMock->expects($this->never())
             ->method('isAuthEnabled');
         $this->elasticSearchMock->expects($this->never())
@@ -550,7 +549,7 @@ public function testExecuteWithOSauthOptions(
             ->method('getConfiguration');
 
         $command = $this->installCommandFactory->create();
-        self::assertStringContainsString("--search-engine='opensearch1'", $command);
+        self::assertStringContainsString("--search-engine='opensearch'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-enable-auth='1'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-username='user'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-password='secret'", $command);