Skip to content

Commit f746099

Browse files
MCLOUD-13493: Allowed OS2 only for 2.4.4-p13 and >=2.4.5-p12
1 parent 0228bc1 commit f746099

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Service/Validator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class Validator
8585
'>=2.4.4' => '~7.10.0', // Greater than 7.10 isn't supported on cloud infrastructure.
8686
],
8787
ServiceInterface::NAME_OPENSEARCH => [
88-
'>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.0' => '~1.1.0 || 1.2.*',
89-
'>=2.4.4' => '^2'
88+
'>=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.*',
89+
'2.4.4-p13 || >=2.4.5-p12' => '^2'
9090
],
9191
ServiceInterface::NAME_RABBITMQ => [
9292
'<2.3.0' => '~3.5.0',

src/Test/Unit/Service/ValidatorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public function validateVersionsDataProvider(): array
320320
[
321321
ServiceInterface::NAME_OPENSEARCH => '1.2'
322322
],
323-
1
323+
0
324324
],
325325
[
326326
'2.4.3',
@@ -337,7 +337,7 @@ public function validateVersionsDataProvider(): array
337337
ServiceInterface::NAME_REDIS_SESSION => '6.2',
338338
ServiceInterface::NAME_RABBITMQ => '3.9'
339339
],
340-
0
340+
1
341341
],
342342
[
343343
'2.3.7-p2',
@@ -399,7 +399,7 @@ public function validateVersionsDataProvider(): array
399399
ServiceInterface::NAME_OPENSEARCH => '1.2',
400400
ServiceInterface::NAME_RABBITMQ => '3.8.0'
401401
],
402-
1
402+
0
403403
],
404404
[
405405
'2.4.3-p3',
@@ -416,7 +416,7 @@ public function validateVersionsDataProvider(): array
416416
ServiceInterface::NAME_NGINX => '1.18.0',
417417
ServiceInterface::NAME_VARNISH => '7.0.0',
418418
ServiceInterface::NAME_REDIS => '6.2.6',
419-
ServiceInterface::NAME_OPENSEARCH => '2.3.0',
419+
ServiceInterface::NAME_OPENSEARCH => '1.2',
420420
ServiceInterface::NAME_RABBITMQ => '3.9.0'
421421
],
422422
0
@@ -436,7 +436,7 @@ public function validateVersionsDataProvider(): array
436436
ServiceInterface::NAME_DB_MARIA => '10.5.0', //wrong
437437
ServiceInterface::NAME_VARNISH => '7.1.0', //wrong
438438
ServiceInterface::NAME_REDIS => '6.1.3', //wrong
439-
ServiceInterface::NAME_OPENSEARCH => '1.0.0', //wrong
439+
ServiceInterface::NAME_OPENSEARCH => '2.3.0', //wrong
440440
ServiceInterface::NAME_RABBITMQ => '3.8.1' //wrong
441441
],
442442
6
@@ -449,7 +449,7 @@ public function validateVersionsDataProvider(): array
449449
ServiceInterface::NAME_NGINX => '1.18.0',
450450
ServiceInterface::NAME_VARNISH => '7.0.0',
451451
ServiceInterface::NAME_REDIS => '6.2.6',
452-
ServiceInterface::NAME_OPENSEARCH => '2.3.0',
452+
ServiceInterface::NAME_OPENSEARCH => '1.2',
453453
ServiceInterface::NAME_RABBITMQ => '3.9.0'
454454
],
455455
0

0 commit comments

Comments
 (0)