Skip to content

Commit 2e370d4

Browse files
authored
MCLOUD-7304: Release ece-tools 2002.1.4 (#18)
1 parent 7c7b400 commit 2e370d4

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/ece-tools",
33
"description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "2002.1.3",
5+
"version": "2002.1.4",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {

src/Config/Validator/Deploy/SearchConfiguration.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
use Magento\MagentoCloud\App\Error;
1111
use Magento\MagentoCloud\App\GenericException;
1212
use Magento\MagentoCloud\Config\ConfigMerger;
13+
use Magento\MagentoCloud\Config\SearchEngine;
1314
use Magento\MagentoCloud\Config\Stage\DeployInterface;
1415
use Magento\MagentoCloud\Config\Validator;
1516
use Magento\MagentoCloud\Config\Validator\ResultFactory;
1617
use Magento\MagentoCloud\Config\ValidatorException;
1718
use Magento\MagentoCloud\Config\ValidatorInterface;
1819
use Magento\MagentoCloud\Package\MagentoVersion;
19-
use Magento\MagentoCloud\Service\ElasticSearch;
2020

2121
/**
2222
* Validates SEARCH_CONFIGURATION variable
@@ -74,7 +74,7 @@ public function validate(): Validator\ResultInterface
7474

7575
if ($this->magentoVersion->isGreaterOrEqual('2.4.0')
7676
&& isset($searchConfig['engine'])
77-
&& $searchConfig['engine'] != ElasticSearch::ENGINE_NAME
77+
&& $searchConfig['engine'] == SearchEngine::ENGINE_MYSQL
7878
) {
7979
return $this->resultFactory->errorByCode(Error::DEPLOY_WRONG_SEARCH_ENGINE);
8080
}

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

+14
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,20 @@ public function validateDataProvider(): array
174174
Success::class,
175175
true
176176
],
177+
[
178+
[
179+
'engine' => 'elasticsearch7',
180+
],
181+
Success::class,
182+
true
183+
],
184+
[
185+
[
186+
'engine' => 'elasticsuite',
187+
],
188+
Success::class,
189+
true
190+
],
177191
];
178192
}
179193

0 commit comments

Comments
 (0)