MCLOUD-6144: Adjust service validators prior to 2.4.0 version (magento#737)

Author: BaDos

config/eol.yaml

@@ -8,13 +8,19 @@ php:
     eol: 2020-11-30
   - version: '7.3'
     eol: 2021-12-06
+  - version: '7.4'
+    eol:
 mariadb:
   - version: '10.0'
     eol: 2019-03-31
   - version: '10.1'
     eol: 2020-10-17
   - version: '10.2'
     eol: 2022-05-23
+  - version: '10.3'
+    eol: 2023-05-25
+  - version: '10.4'
+    eol: 2024-06-18
 elasticsearch:
   - version: '1.7'
     eol: 2017-01-16
@@ -24,8 +30,16 @@ elasticsearch:
     eol: 2018-07-31
   - version: '6.5'
     eol: 2020-05-14
+  - version: '6.8'
+    eol: 2020-11-20
+  - version: '7.2'
+    eol: 2020-12-25
   - version: '7.5'
-    eol: 2021-06-02    
+    eol: 2021-06-02
+  - version: '7.6'
+    eol: 2021-08-11
+  - version: '7.7'
+    eol: 2021-11-13
 rabbitmq:
   - version: '3.5'
     eol: 2016-10-31
@@ -37,8 +51,10 @@ redis:
   - version: '3.2'
     eol: 2018-10-17
   - version: '4.0'
-    eol:
+    eol: 2020-04-30
   - version: '5.0'
     eol:
   - version: '5.2'
     eol:
+  - version: '6.0'
+    eol:

src/Config/Validator/Deploy/ElasticSearchVersion.php

@@ -77,9 +77,19 @@ class ElasticSearchVersion implements ValidatorInterface
             'esVersionRaw' => '6.x',
         ],
         [
-            'packageVersion' => '~7.0',
-            'esVersion' => '~7.0',
-            'esVersionRaw' => '7.x',
+            'packageVersion' => '>=7.0 <7.2',
+            'esVersion' => '>=7.0 <7.2',
+            'esVersionRaw' => '>=7.0 <7.2',
+        ],
+        [
+            'packageVersion' => '>=7.2 <7.4',
+            'esVersion' => '>=7.2 <7.4',
+            'esVersionRaw' => '>=7.2 <7.4',
+        ],
+        [
+            'packageVersion' => '>=7.4',
+            'esVersion' => '>=7.4',
+            'esVersionRaw' => '>=7.4',
         ],
     ];
 

src/Service/Validator.php

@@ -27,10 +27,12 @@ class Validator
             '>=2.2.5 <2.2.10' => '>=7.0 <7.2', //'~7.0.13|~7.1.0',
             '>=2.2.10 <2.3.0' => '>=7.1 <7.3', //'~7.1.0|~7.2.0',
             '>=2.3.0 <2.3.3' => '>=7.1 <7.3',   //'~7.1.3 || ~7.2.0',
-            '>=2.3.3' => '>=7.1 <7.4',       //  '~7.1.3||~7.2.0||~7.3.0'
+            '>=2.3.3 <2.4.0' => '>=7.1 <7.4',   //  '~7.1.3||~7.2.0||~7.3.0'
+            '>=2.4.0' => '>=7.3 <7.5', // '~7.3.0||~7.4.0'
         ],
         ServiceInterface::NAME_DB => [
-            '*' => '>=10.0 <10.3',
+            '<2.4.0' => '>=10.0 <10.3',
+            '>=2.4.0' => '>=10.2 <10.5',
         ],
         ServiceInterface::NAME_NGINX => [
             '*' => '^1.9.0',
@@ -47,7 +49,8 @@ class Validator
             '<2.2.0' => '~1.7.0 || ~2.4.0',
             '>=2.2.0 <2.2.8 || 2.3.0' => '~1.7.0 || ~2.4.0 || ~5.2.0',
             '>=2.2.8 <2.3.0 || >=2.3.1 <2.3.5' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0',
-            '>=2.3.5' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~7.5.0',
+            '>=2.3.5 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0|| ~7.4.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
+            '>=2.4.0' => '~7.4.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
         ],
         ServiceInterface::NAME_RABBITMQ => [
             '<2.3.0' => '~3.5.0',

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

@@ -236,7 +236,14 @@ public function validateDataProvider(): array
             ['5.1', '5.0', Success::class],
             ['5.2', '5.1', Success::class],
             ['7.0', '7.1', Success::class],
-            ['7.4', '7.2', Success::class],
+            ['7.1', '7.0', Success::class],
+            ['7.2', '7.3', Success::class],
+            ['7.3', '7.2', Success::class],
+            ['7.4', '7.6', Success::class],
+            ['7.6', '7.4', Success::class],
+            ['7.4', '7.5', Success::class],
+            ['7.5', '7.4', Success::class],
+            ['7.4', '7.2', Error::class],
             ['6.1', '2.0', Error::class],
             [
                 '6.2',

src/Test/Unit/Service/ValidatorTest.php

@@ -144,16 +144,42 @@ public function validateVersionsDataProvider(): array
             [
                 '2.5.0',
                 [
-                    ServiceInterface::NAME_PHP => '7.2.13',
+                    ServiceInterface::NAME_PHP => '7.2.13', // wrong
                     ServiceInterface::NAME_DB => '10.2.1',
                     ServiceInterface::NAME_NGINX => '1.9',
                     ServiceInterface::NAME_VARNISH => '5.5',
                     ServiceInterface::NAME_REDIS => 'latest',
                     ServiceInterface::NAME_ELASTICSEARCH => '6.7', // wrong
                     ServiceInterface::NAME_RABBITMQ => '3.7'
                 ],
+                2
+            ],
+            [
+                '2.4.0',
+                [
+                    ServiceInterface::NAME_PHP => '7.4',
+                    ServiceInterface::NAME_DB => '10.4',
+                    ServiceInterface::NAME_NGINX => '1.9',
+                    ServiceInterface::NAME_VARNISH => '6.2',
+                    ServiceInterface::NAME_REDIS => '5.0',
+                    ServiceInterface::NAME_ELASTICSEARCH => '6.8', // wrong
+                    ServiceInterface::NAME_RABBITMQ => '3.8'
+                ],
                 1
             ],
+            [
+                '2.4.0',
+                [
+                    ServiceInterface::NAME_PHP => '7.4',
+                    ServiceInterface::NAME_DB => '10.4',
+                    ServiceInterface::NAME_NGINX => '1.9',
+                    ServiceInterface::NAME_VARNISH => '6.2',
+                    ServiceInterface::NAME_REDIS => '5.0',
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.4', // wrong
+                    ServiceInterface::NAME_RABBITMQ => '3.8'
+                ],
+                0
+            ],
             [
                 '2.1.4',
                 [ServiceInterface::NAME_PHP => '5.6'],