MCLOUD-8548: Fix the service validator for ElasticSearch (#86)

Author: BaDos

src/Command/Dev/GenerateSchemaError.php

@@ -168,13 +168,14 @@ private function generateDocs(array $errors): string
     public function getErrorTypeDescription(): array
     {
         return [
-            'critical' => 'Critical errors indicate a problem with the Commerce on cloud infrastructure project configuration ' .
-                'that causes deployment failure, for example incorrect, unsupported, or missing configuration for ' .
-                'required settings. Before you can deploy, you must update the configuration to resolve these errors.',
-            'warning' => 'Warning errors indicate a problem with the Commerce on cloud infrastructure project configuration ' .
-                'such as incorrect, deprecated, unsupported, or missing configuration settings for optional features ' .
-                'that can affect site operation. Although a warning does not cause deployment failure, you ' .
-                'should review warning messages and update the configuration to resolve them.',
+            'critical' => 'Critical errors indicate a problem with the Commerce on cloud infrastructure project ' .
+                'configuration that causes deployment failure, for example incorrect, unsupported, or missing ' .
+                'configuration for required settings. Before you can deploy, you must update the configuration ' .
+                'to resolve these errors.',
+            'warning' => 'Warning errors indicate a problem with the Commerce on cloud infrastructure project ' .
+                'configuration such as incorrect, deprecated, unsupported, or missing configuration settings for ' .
+                'optional features that can affect site operation. Although a warning does not cause deployment ' .
+                'failure, you should review warning messages and update the configuration to resolve them.',
         ];
     }
 }

src/Service/Validator.php

@@ -66,10 +66,13 @@ class Validator
             '>=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 <2.3.7' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
-            '>=2.3.7 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
+            '>=2.3.7 <2.3.7-p3' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
                 ' || ~7.9.0',
+            '>=2.3.7-p3 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
+                ' || ~7.9.0 || ~7.10.0',
             '>=2.4.0 <2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0',
-            '>=2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0',
+            '>=2.4.2 <2.4.3' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0',
+            '>=2.4.3' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0 || ~7.10.0',
         ],
         ServiceInterface::NAME_OPENSEARCH => [
             '>=2.3.7-p3 <2.4.0 || >=2.4.3-p2' => '~1.1 || ~1.2.1',

src/Test/Unit/Service/ValidatorTest.php

@@ -332,6 +332,55 @@ public function validateVersionsDataProvider(): array
                 ],
                 0
             ],
+            [
+                '2.3.7-p2',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
+                ],
+                1
+            ],
+            [
+                '2.3.7-p3',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10'
+                ],
+                0
+            ],
+            [
+                '2.4.0',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
+                ],
+                1
+            ],
+            [
+                '2.4.1',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
+                ],
+                1
+            ],
+            [
+                '2.4.2',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
+                ],
+                1
+            ],
+            [
+                '2.4.3',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10'
+                ],
+                0
+            ],
+            [
+                '2.4.4',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.10'
+                ],
+                0
+            ],
         ];
     }
 }