Merge pull request #127 from glo72880/MCLOUD-10819

MCLOUD-10819: Added wildcard range 1.2.*

Author: andriyShevtsov

src/Service/Validator.php

@@ -83,7 +83,7 @@ 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.6' => '~1.1.0 || ~1.2.1',
+            '>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.6' => '~1.1.0 || 1.2.*',
             '>=2.4.6' => '^2',
         ],
         ServiceInterface::NAME_RABBITMQ => [

src/Test/Unit/Service/ValidatorTest.php

@@ -309,7 +309,7 @@ protected function validateVersionsDataProvider(): array
                     ServiceInterface::NAME_NGINX => '1.18.0',
                     ServiceInterface::NAME_VARNISH => '6.5.1',
                     ServiceInterface::NAME_REDIS => '6.0.12',
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.1',
+                    ServiceInterface::NAME_OPENSEARCH => '1.2',
                     ServiceInterface::NAME_RABBITMQ => '3.9.0'
                 ],
                 0
@@ -324,14 +324,14 @@ protected function validateVersionsDataProvider(): array
             [
                 '2.4.0',
                 [
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.1' //wrong
+                    ServiceInterface::NAME_OPENSEARCH => '1.2' //wrong
                 ],
                 1
             ],
             [
                 '2.4.3-p2',
                 [
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.2'
+                    ServiceInterface::NAME_OPENSEARCH => '1.2'
                 ],
                 0
             ],
@@ -409,7 +409,7 @@ protected function validateVersionsDataProvider(): array
                     ServiceInterface::NAME_NGINX => '1.18.0',
                     ServiceInterface::NAME_VARNISH => '6.5.1',
                     ServiceInterface::NAME_REDIS => '6.0.12',
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.1',
+                    ServiceInterface::NAME_OPENSEARCH => '1.2',
                     ServiceInterface::NAME_RABBITMQ => '3.8.0'
                 ],
                 0
@@ -429,7 +429,7 @@ protected 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.1',
+                    ServiceInterface::NAME_OPENSEARCH => '1.2',
                     ServiceInterface::NAME_RABBITMQ => '3.9.0'
                 ],
                 0
@@ -449,7 +449,7 @@ protected function validateVersionsDataProvider(): array
                     ServiceInterface::NAME_DB_MARIA => '10.5.0', //wrong
                     ServiceInterface::NAME_VARNISH => '7.1.0', //wrong
                     ServiceInterface::NAME_REDIS => '6.1.3', //wrong
-                    ServiceInterface::NAME_OPENSEARCH => '1.2.0', //wrong
+                    ServiceInterface::NAME_OPENSEARCH => '1.0.0', //wrong
                     ServiceInterface::NAME_RABBITMQ => '3.8.1' //wrong
                 ],
                 6
@@ -462,7 +462,7 @@ protected 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.1',
+                    ServiceInterface::NAME_OPENSEARCH => '1.2',
                     ServiceInterface::NAME_RABBITMQ => '3.9.0'
                 ],
                 0