Skip to content

Commit e4287c3

Browse files
glo71317glo71317
committed
AC-13818::Make ES8 to be default for 2.4.8 instead of ES7
1 parent 55a9430 commit e4287c3

File tree

14 files changed

+16
-28
lines changed

14 files changed

+16
-28
lines changed

‎app/code/Magento/AdvancedSearch/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
77
Before disabling or uninstalling this module, note that the following modules depends on this module:
88

99
- Magento_Elasticsearch
10-
- Magento_Elasticsearch7
10+
- Magento_Elasticsearch8
1111

1212
For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
1313

‎app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require([
1717
'It is recommended to use OpenSearch as a search engine instead.'),
1818
updateCommentText = () => {
1919
const engineValue = engineField.val(),
20-
newCommentText = ['elasticsearch7', 'elasticsearch8'].includes(engineValue) ?
20+
newCommentText = ['elasticsearch8'].includes(engineValue) ?
2121
unsupportedText : defaultText;
2222

2323
if (commentContainer.text() !== newCommentText) {

‎app/code/Magento/Config/Test/Mftf/ActionGroup/ChooseElasticSearchAsSearchEngineActionGroup.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="ChooseElasticSearchAsSearchEngineActionGroup">
1212
<annotations>
13-
<description>Goes to the 'Configuration' page for 'Catalog'. Sets the 'Search Engine' to 'elasticsearch7'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.</description>
13+
<description>Goes to the 'Configuration' page for 'Catalog'. Sets the 'Search Engine' to 'elasticsearch8'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.</description>
1414
</annotations>
1515

1616
<amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="configureSearchEngine"/>
@@ -19,7 +19,7 @@
1919
<conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab"/>
2020
<waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible"/>
2121
<uncheckOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="uncheckUseSystemValue"/>
22-
<selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 7" stepKey="chooseES5"/>
22+
<selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 8" stepKey="chooseES5"/>
2323
<!--<scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>-->
2424
<!--<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseCatalogSearchTab"/>-->
2525
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>

‎dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/SearchEngineVersionReader.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SearchEngineVersionReader
2424
private $versionInfo;
2525

2626
/**
27-
* Returns full search engine version e.g. 'elasticsearch7'
27+
* Returns full search engine version e.g. 'elasticsearch8'
2828
*
2929
* @return string
3030
*/

‎dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/QuickSearchTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
4747
*
4848
* @magentoAppArea frontend
4949
* @magentoDbIsolation disabled
50-
* @magentoConfigFixture current_store catalog/search/elasticsearch7_minimum_should_match 100%
5150
* @magentoConfigFixture current_store catalog/search/elasticsearch8_minimum_should_match 100%
5251
* @magentoConfigFixture current_store catalog/search/opensearch_minimum_should_match 100%
5352
* @magentoDataFixture Magento/Elasticsearch/_files/products_for_search.php

‎dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Important: Please make sure that each integration test file works with unique search index. In order to
2626
* achieve this, use @magentoConfigFixture to pass unique value for index_prefix for every test
27-
* method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix indexerhandlertest'
27+
* method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix indexerhandlertest'
2828
*
2929
* @magentoDbIsolation disabled
3030
* @magentoDataFixture Magento/Elasticsearch/_files/indexer.php

‎dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Important: Please make sure that each integration test file works with unique search index. In order to
2323
* achieve this, use @magentoConfigFixture to pass unique value for index_prefix for every test
2424
* method.
25-
* E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix indexerhandlertest_configurable'
25+
* E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix indexerhandlertest_configurable'
2626
*
2727
* @magentoDbIsolation disabled
2828
* @magentoAppIsolation enabled

‎dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* Important: Please make sure that each integration test file works with unique elastic search index. In order to
2323
* achieve this, use @ magentoConfigFixture to pass unique value for index_prefix for every test
24-
* method. E.g. '@ magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix adaptertest'
24+
* method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix adaptertest'
2525
*
2626
* In ElasticSearch, a reindex is required if the test includes a new data fixture with new items to search, see
2727
* testAdvancedSearchDateField().

‎dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/extension_conflicts/ce.php

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// so core modules must not be dependent on them
1111
'Magento\LiveSearch' => [
1212
'Magento\Elasticsearch',
13-
'Magento\Elasticsearch7',
1413
'Magento\Elasticsearch8',
1514
'Magento\OpenSearch'
1615
],

‎dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

-8
Original file line numberDiff line numberDiff line change
@@ -4330,23 +4330,15 @@
43304330
'Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder\MatchQueryTest'
43314331
],
43324332
[
4333-
'Magento\Elasticsearch6\Block\Adminhtml\System\Config\TestConnection',
4334-
'Magento\Elasticsearch7\Block\Adminhtml\System\Config\TestConnection',
43354333
'Magento\Elasticsearch8\Block\Adminhtml\System\Config\TestConnection'
43364334
],
43374335
[
4338-
'Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver',
4339-
'Magento\Elasticsearch7\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver',
43404336
'Magento\Elasticsearch8\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver'
43414337
],
43424338
[
4343-
'Magento\Elasticsearch6\Model\Client\Elasticsearch',
4344-
'Magento\Elasticsearch7\Model\Client\Elasticsearch',
43454339
'Magento\Elasticsearch8\Model\Client\Elasticsearch'
43464340
],
43474341
['Magento\Elasticsearch\Test\Unit\Model\DataProvider\Base\SuggestionsTest'],
4348-
['Magento\Elasticsearch6\Test\Unit\Model\Client\ElasticsearchTest'],
4349-
['Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolverTest'],
43504342
['Zend_Measure_Length', 'Magento\Framework\Measure\Length'],
43514343
['Zend_Measure_Weight', 'Magento\Framework\Measure\Weight'],
43524344
];

‎phpserver/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ php bin/magento setup:install --base-url=http://127.0.0.1:8082 \
2222
--admin-firstname=Magento --admin-lastname=User [email protected] \
2323
--admin-user=admin --admin-password=admin123 --language=en_US \
2424
--currency=USD --timezone=America/Chicago --use-rewrites=1 \
25-
--search-engine=elasticsearch7 --elasticsearch-host=es-host.example.com --elasticsearch-port=9200
25+
--search-engine=elasticsearch8 --elasticsearch-host=es-host.example.com --elasticsearch-port=9200
2626
```
2727

2828
Note: By default, Magento creates a random Admin URI for you. Make sure to write this value down because it's how you access the Magento Admin later. For example: `http://127.0.0.1:8082/index.php/admin_1vpn01`.

‎setup/src/Magento/Setup/Model/SearchConfigOptionsList.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -149,7 +149,6 @@ public function getOptionsList(): array
149149
public function getAvailableSearchEngineList(): array
150150
{
151151
return [
152-
'elasticsearch7' => 'Elasticsearch 7.x (deprecated)',
153152
'elasticsearch8' => 'Elasticsearch 8.x (deprecated)',
154153
'opensearch' => 'OpenSearch'
155154
];

‎setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -36,8 +36,7 @@ public function testGetOptionsList()
3636
$this->assertEquals('search-engine', $optionsList[0]->getName());
3737

3838
$selectOptions = $optionsList[0]->getSelectOptions();
39-
$this->assertCount(3, $selectOptions);
40-
$this->assertContains('elasticsearch7', $selectOptions);
39+
$this->assertCount(2, $selectOptions);
4140
$this->assertContains('elasticsearch8', $selectOptions);
4241
$this->assertContains('opensearch', $selectOptions);
4342

‎setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public static function installInputDataProvider()
141141
'base-url-secure' => null,
142142
'use-secure-admin' => null,
143143
'admin-use-security-key' => null,
144-
'search-engine' => 'elasticsearch7',
144+
'search-engine' => 'elasticsearch8',
145145
'elasticsearch-host' => 'localhost',
146146
'elasticsearch-port' => '9200',
147147
'elasticsearch-enable-auth' => false,
@@ -150,7 +150,7 @@ public static function installInputDataProvider()
150150
'no-interaction' => false,
151151
],
152152
'searchInput' => [
153-
'search-engine' => 'elasticsearch7',
153+
'search-engine' => 'elasticsearch8',
154154
'elasticsearch-host' => 'localhost',
155155
'elasticsearch-port' => '9200',
156156
'elasticsearch-enable-auth' => false,

0 commit comments

Comments
 (0)