Merge branch 'MCLOUD-13455' of github.com:magento-commerce/ece-tools into MCLOUD-13455

Author: ashvini22326

src/Config/Validator/Deploy/ServiceVersion.php

@@ -9,12 +9,12 @@
 
 use Magento\MagentoCloud\App\Error;
 use Magento\MagentoCloud\App\GenericException;
+use Magento\MagentoCloud\Config\Validator;
+use Magento\MagentoCloud\Config\ValidatorInterface;
 use Magento\MagentoCloud\Service\Detector\DatabaseType;
 use Magento\MagentoCloud\Service\ServiceInterface;
 use Magento\MagentoCloud\Service\ServiceFactory;
 use Magento\MagentoCloud\Service\Validator as ServiceVersionValidator;
-use Magento\MagentoCloud\Config\Validator;
-use Magento\MagentoCloud\Config\ValidatorInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -80,8 +80,8 @@ public function validate(): Validator\ResultInterface
             $services = [
                 ServiceInterface::NAME_RABBITMQ,
                 ServiceInterface::NAME_REDIS,
-                ServiceInterface::NAME_VALKEY,
                 ServiceInterface::NAME_REDIS_SESSION,
+                ServiceInterface::NAME_VALKEY,
                 ServiceInterface::NAME_VALKEY_SESSION,
                 ServiceInterface::NAME_ELASTICSEARCH,
                 ServiceInterface::NAME_OPENSEARCH,

src/Service/Validator.php

@@ -27,10 +27,10 @@ class Validator
      * Supported version constraints of Valkey services
      */
     private const VALKEY_SUPPORT_VERSIONS = [
+        '2.4.5-p13 <2.4.6' => '~8.0.0 || ~8.0.1',
+        '2.4.6-p11 <2.4.7' => '~8.0.0 || ~8.0.1',
+        '2.4.7-p6 <2.4.8' => '~8.0.0 || ~8.0.1',
         '>=2.4.8' => ' ~8.0.0 || ~8.0.1',
-        '2.4.7-p6' => '~8.0.0 || ~8.0.1',
-        '2.4.6-p11' => '~8.0.0 || ~8.0.1',
-        '2.4.5-p13' => '~8.0.0 || ~8.0.1',
     ];
 
     /**

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

@@ -10,9 +10,9 @@
 use Magento\MagentoCloud\Config\Validator\Deploy\ServiceVersion;
 use Magento\MagentoCloud\Config\ValidatorException;
 use Magento\MagentoCloud\Service\Detector\DatabaseType;
-use Magento\MagentoCloud\Service\ServiceMismatchException;
-use Magento\MagentoCloud\Service\ServiceInterface;
 use Magento\MagentoCloud\Service\ServiceFactory;
+use Magento\MagentoCloud\Service\ServiceInterface;
+use Magento\MagentoCloud\Service\ServiceMismatchException;
 use Magento\MagentoCloud\Service\Validator as ServiceVersionValidator;
 use Magento\MagentoCloud\Config\Validator\Result\Error;
 use Magento\MagentoCloud\Config\Validator\Result\Success;
@@ -190,7 +190,9 @@ public function testValidateWithErrors(): void
             'error message 3',
             'error message 4',
             'error message 5',
-            'error message 6'
+            'error message 6',
+            'error message 7',
+            'error message 8',
         ];
         $service1 = $this->createMock(ServiceInterface::class);
         $service1->expects($this->once())
@@ -206,20 +208,37 @@ public function testValidateWithErrors(): void
             ->willReturn('2.2');
         $service4 = $this->createMock(ServiceInterface::class);
         $service4->expects($this->once())
-            ->method('getVersion')
-            ->willReturn('7.7');
+                ->method('getVersion')
+                ->willReturn('8.0');
         $service5 = $this->createMock(ServiceInterface::class);
         $service5->expects($this->once())
-            ->method('getVersion')
-            ->willReturn('1.2');
+                ->method('getVersion')
+                ->willReturn('8.0');
         $service6 = $this->createMock(ServiceInterface::class);
         $service6->expects($this->once())
+            ->method('getVersion')
+            ->willReturn('7.7');
+        $service7 = $this->createMock(ServiceInterface::class);
+        $service7->expects($this->once())
+            ->method('getVersion')
+            ->willReturn('1.2');
+        $service8 = $this->createMock(ServiceInterface::class);
+        $service8->expects($this->once())
             ->method('getVersion')
             ->willReturn('5.7');
-        $this->serviceFactory->expects($this->exactly(6))
+        $this->serviceFactory->expects($this->exactly(8))
             ->method('create')
-            ->willReturnOnConsecutiveCalls($service1, $service2, $service3, $service4, $service5, $service6);
-        $this->serviceVersionValidatorMock->expects($this->exactly(6))
+            ->willReturnOnConsecutiveCalls(
+                $service1,
+                $service2,
+                $service3,
+                $service4,
+                $service5,
+                $service6,
+                $service7,
+                $service8,
+        );
+        $this->serviceVersionValidatorMock->expects($this->exactly(8))
             ->method('validateService')
             // withConsecutive() alternative.
             ->willReturnCallback(
@@ -231,16 +250,18 @@ function ($arg1, $arg2) use ($errorMessages) {
                     } elseif ($arg1 == ServiceInterface::NAME_REDIS_SESSION && $arg2 == '2.2') {
                         return $errorMessages[2];
                     } elseif ($arg1 == ServiceInterface::NAME_VALKEY && $arg2 == '8.0') {
-                        return $errorMessages[1];
+                        return $errorMessages[3];
                     } elseif ($arg1 == ServiceInterface::NAME_VALKEY_SESSION && $arg2 == '8.0') {
-                        return $errorMessages[2];
+                        return $errorMessages[4];
                     } elseif ($arg1 == ServiceInterface::NAME_ELASTICSEARCH && $arg2 == '7.7') {
-                        return $errorMessages[3];
+                        return $errorMessages[5];
                     } elseif ($arg1 == ServiceInterface::NAME_OPENSEARCH && $arg2 == '1.2') {
-                        return $errorMessages[4];
+                        return $errorMessages[6];
                     } elseif ($arg1 == ServiceInterface::NAME_DB_MYSQL && $arg2 == '5.7') {
-                        return $errorMessages[5];
+                        return $errorMessages[7];
                     }
+
+                    return '';
                 }
             );
         $this->resultFactoryMock->expects($this->once())