Merge branch 'develop' into MCLOUD-13628

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.4')) {
+        if ($this->magentoVersion->satisfies('2.4.4-p13 || >=2.4.5-p12')) {
             return static::ENGINE_NAME;
         }
 

src/Service/Search/AbstractService.php

@@ -117,7 +117,7 @@ public function getVersion(): string
             }
         }
 
-        return preg_replace('/-.*/', '', $this->version); // Removes any suffix after '-'
+        return $this->version;
     }
 
     /**

src/Service/Validator.php

@@ -94,7 +94,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-p13 || 2.4.5 || >=2.4.5-p1 <2.4.5-p12' => '~1.1.0 || 1.2.*',
+            '>=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.4-p12 || >=2.4.5-p6 <2.4.5-p11'  => '1.3.*',
             '2.4.4-p13 || >=2.4.5-p12' => '^2'
         ],
         ServiceInterface::NAME_RABBITMQ => [

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.4')) {
+                if ($this->magentoVersion->satisfies('2.4.4-p13 || >=2.4.5-p12')) {
                     $enginePrefixName = 'opensearch';
                 }
             } else {

src/Test/Unit/Service/OpenSearchTest.php

@@ -222,7 +222,7 @@ public function getVersionFromTypeDataProvider()
      */
     public function testGetFullEngineName(bool $greaterOrEqual, string $expectedResult): void
     {
-        $this->magentoVersionMock->expects($this->once())
+        $this->magentoVersionMock->expects($this->any())
             ->method('isGreaterOrEqual')
             ->willReturn($greaterOrEqual);
         $this->assertSame($expectedResult, $this->openSearch->getFullEngineName());
@@ -234,8 +234,8 @@ public function testGetFullEngineName(bool $greaterOrEqual, string $expectedResu
     public function getFullEngineNameDataProvider()
     {
         return [
+            [true, 'elasticsearch7'],
             [false, 'elasticsearch7'],
-            [true, 'opensearch'],
         ];
     }
 

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

@@ -503,10 +503,12 @@ public function testExecuteWithOSauthOptions(
                 ['2.4.2', true],
                 ['2.4.4', $greaterOrEqual],
             ]);
-        $this->magentoVersionMock->expects($this->once())
-            ->method('satisfies')
-            ->with('>=2.3.7-p3 <2.4.0 || >=2.4.3-p2')
-            ->willReturn(true);
+
+        $this->magentoVersionMock->method('satisfies')
+            ->willReturnCallback(function (string $constraint) {
+                $supportedConstraint = '>=2.3.7-p3 <2.4.0 || >=2.4.3-p2';
+                return $constraint === $supportedConstraint;
+            });
         $this->openSearchMock->expects($this->any())
             ->method('isInstalled')
             ->willReturn(true);
@@ -515,7 +517,7 @@ public function testExecuteWithOSauthOptions(
             ->willReturn(true);
         $this->openSearchMock->expects($this->once())
             ->method('getFullEngineName')
-            ->willReturn('opensearch');
+            ->willReturn('opensearch1');
         $this->openSearchMock->expects($this->once())
             ->method('getHost')
             ->willReturn('127.0.0.1');
@@ -536,7 +538,7 @@ public function testExecuteWithOSauthOptions(
 
         $this->elasticSearchMock->expects($this->any())
             ->method('isInstalled')
-            ->willReturn(false);
+            ->willReturn(true);
         $this->elasticSearchMock->expects($this->never())
             ->method('isAuthEnabled');
         $this->elasticSearchMock->expects($this->never())
@@ -549,7 +551,7 @@ public function testExecuteWithOSauthOptions(
             ->method('getConfiguration');
 
         $command = $this->installCommandFactory->create();
-        self::assertStringContainsString("--search-engine='opensearch'", $command);
+        self::assertStringContainsString("--search-engine='opensearch1'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-enable-auth='1'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-username='user'", $command);
         self::assertStringContainsString("--" . $enginePrefixName . "-password='secret'", $command);
@@ -561,10 +563,7 @@ public function testExecuteWithOSauthOptions(
      */
     public function executeWithOSauthOptionsDataProvider()
     {
-        return [
-            [false, 'elasticsearch'],
-            [true, 'opensearch'],
-        ];
+        return [[false, 'elasticsearch']];
     }
 
     /**