AC-13818::Make ES8 to be default for 2.4.8 instead of ES7

glo71317 · glo71317 · commit e4287c3f6b93 · 2025-02-07T13:26:00.000+05:30
diff --git a/app/code/Magento/AdvancedSearch/README.md b/app/code/Magento/AdvancedSearch/README.md
@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch7
+- Magento_Elasticsearch8
 
 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).
 
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js b/app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js
@@ -17,7 +17,7 @@ require([
                 'It is recommended to use OpenSearch as a search engine instead.'),
             updateCommentText = () => {
                 const engineValue = engineField.val(),
-                    newCommentText = ['elasticsearch7', 'elasticsearch8'].includes(engineValue) ?
+                    newCommentText = ['elasticsearch8'].includes(engineValue) ?
                         unsupportedText : defaultText;
 
                 if (commentContainer.text() !== newCommentText) {
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ChooseElasticSearchAsSearchEngineActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ChooseElasticSearchAsSearchEngineActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ChooseElasticSearchAsSearchEngineActionGroup">
         <annotations>
-            <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>
+            <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>
         </annotations>
 
         <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="configureSearchEngine"/>
@@ -19,7 +19,7 @@
         <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab"/>
         <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 7" stepKey="chooseES5"/>
+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 8" stepKey="chooseES5"/>
         <!--<scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>-->
         <!--<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseCatalogSearchTab"/>-->
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/SearchEngineVersionReader.php b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/Model/SearchEngineVersionReader.php
@@ -24,7 +24,7 @@ class SearchEngineVersionReader
     private $versionInfo;
 
     /**
-     * Returns full search engine version e.g. 'elasticsearch7'
+     * Returns full search engine version e.g. 'elasticsearch8'
      *
      * @return string
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/QuickSearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/QuickSearchTest.php
@@ -47,7 +47,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
      *
      * @magentoAppArea frontend
      * @magentoDbIsolation disabled
-     * @magentoConfigFixture current_store catalog/search/elasticsearch7_minimum_should_match 100%
      * @magentoConfigFixture current_store catalog/search/elasticsearch8_minimum_should_match 100%
      * @magentoConfigFixture current_store catalog/search/opensearch_minimum_should_match 100%
      * @magentoDataFixture Magento/Elasticsearch/_files/products_for_search.php
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -24,7 +24,7 @@
 /**
  * Important: Please make sure that each integration test file works with unique search index. In order to
  * achieve this, use @magentoConfigFixture to pass unique value for index_prefix for every test
- * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix indexerhandlertest'
+ * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix indexerhandlertest'
  *
  * @magentoDbIsolation disabled
  * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -22,7 +22,7 @@
  * Important: Please make sure that each integration test file works with unique search index. In order to
  * achieve this, use @magentoConfigFixture to pass unique value for index_prefix for every test
  * method.
- * E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix indexerhandlertest_configurable'
+ * E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix indexerhandlertest_configurable'
  *
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -21,7 +21,7 @@
  *
  * Important: Please make sure that each integration test file works with unique elastic search index. In order to
  * achieve this, use @ magentoConfigFixture to pass unique value for index_prefix for every test
- * method. E.g. '@ magentoConfigFixture current_store catalog/search/elasticsearch7_index_prefix adaptertest'
+ * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch8_index_prefix adaptertest'
  *
  * In ElasticSearch, a reindex is required if the test includes a new data fixture with new items to search, see
  * testAdvancedSearchDateField().
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/extension_conflicts/ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/extension_conflicts/ce.php
@@ -10,7 +10,6 @@
     // so core modules must not be dependent on them
     'Magento\LiveSearch' => [
         'Magento\Elasticsearch',
-        'Magento\Elasticsearch7',
         'Magento\Elasticsearch8',
         'Magento\OpenSearch'
     ],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4330,23 +4330,15 @@
         'Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder\MatchQueryTest'
     ],
     [
-        'Magento\Elasticsearch6\Block\Adminhtml\System\Config\TestConnection',
-        'Magento\Elasticsearch7\Block\Adminhtml\System\Config\TestConnection',
         'Magento\Elasticsearch8\Block\Adminhtml\System\Config\TestConnection'
     ],
     [
-        'Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver',
-        'Magento\Elasticsearch7\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver',
         'Magento\Elasticsearch8\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver'
     ],
     [
-        'Magento\Elasticsearch6\Model\Client\Elasticsearch',
-        'Magento\Elasticsearch7\Model\Client\Elasticsearch',
         'Magento\Elasticsearch8\Model\Client\Elasticsearch'
     ],
     ['Magento\Elasticsearch\Test\Unit\Model\DataProvider\Base\SuggestionsTest'],
-    ['Magento\Elasticsearch6\Test\Unit\Model\Client\ElasticsearchTest'],
-    ['Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolverTest'],
     ['Zend_Measure_Length', 'Magento\Framework\Measure\Length'],
     ['Zend_Measure_Weight', 'Magento\Framework\Measure\Weight'],
 ];
diff --git a/phpserver/README.md b/phpserver/README.md
@@ -22,7 +22,7 @@ php bin/magento setup:install --base-url=http://127.0.0.1:8082 \
 --admin-firstname=Magento --admin-lastname=User --admin-email=user@example.com \
 --admin-user=admin --admin-password=admin123 --language=en_US \
 --currency=USD --timezone=America/Chicago --use-rewrites=1 \
---search-engine=elasticsearch7 --elasticsearch-host=es-host.example.com --elasticsearch-port=9200
+--search-engine=elasticsearch8 --elasticsearch-host=es-host.example.com --elasticsearch-port=9200
 ```
 
 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`.
diff --git a/setup/src/Magento/Setup/Model/SearchConfigOptionsList.php b/setup/src/Magento/Setup/Model/SearchConfigOptionsList.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -149,7 +149,6 @@ public function getOptionsList(): array
     public function getAvailableSearchEngineList(): array
     {
         return [
-            'elasticsearch7' => 'Elasticsearch 7.x (deprecated)',
             'elasticsearch8' => 'Elasticsearch 8.x (deprecated)',
             'opensearch' => 'OpenSearch'
         ];
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -36,8 +36,7 @@ public function testGetOptionsList()
         $this->assertEquals('search-engine', $optionsList[0]->getName());
 
         $selectOptions = $optionsList[0]->getSelectOptions();
-        $this->assertCount(3, $selectOptions);
-        $this->assertContains('elasticsearch7', $selectOptions);
+        $this->assertCount(2, $selectOptions);
         $this->assertContains('elasticsearch8', $selectOptions);
         $this->assertContains('opensearch', $selectOptions);
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php b/setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php
@@ -141,7 +141,7 @@ public static function installInputDataProvider()
                     'base-url-secure' => null,
                     'use-secure-admin' => null,
                     'admin-use-security-key' => null,
-                    'search-engine' => 'elasticsearch7',
+                    'search-engine' => 'elasticsearch8',
                     'elasticsearch-host' => 'localhost',
                     'elasticsearch-port' => '9200',
                     'elasticsearch-enable-auth' => false,
@@ -150,7 +150,7 @@ public static function installInputDataProvider()
                     'no-interaction' => false,
                 ],
                 'searchInput' => [
-                    'search-engine' => 'elasticsearch7',
+                    'search-engine' => 'elasticsearch8',
                     'elasticsearch-host' => 'localhost',
                     'elasticsearch-port' => '9200',
                     'elasticsearch-enable-auth' => false,

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class SearchEngineVersionReader`
`24`	`24`	`private $versionInfo;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * Returns full search engine version e.g. 'elasticsearch7'`
	`27`	`+ * Returns full search engine version e.g. 'elasticsearch8'`
`28`	`28`	`*`
`29`	`29`	`* @return string`
`30`	`30`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()`
`47`	`47`	`*`
`48`	`48`	`* @magentoAppArea frontend`
`49`	`49`	`* @magentoDbIsolation disabled`
`50`		`- * @magentoConfigFixture current_store catalog/search/elasticsearch7_minimum_should_match 100%`
`51`	`50`	`* @magentoConfigFixture current_store catalog/search/elasticsearch8_minimum_should_match 100%`
`52`	`51`	`* @magentoConfigFixture current_store catalog/search/opensearch_minimum_should_match 100%`
`53`	`52`	`* @magentoDataFixture Magento/Elasticsearch/_files/products_for_search.php`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`/**`
`25`	`25`	`* Important: Please make sure that each integration test file works with unique search index. In order to`
`26`	`26`	`* 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'`
`28`	`28`	`*`
`29`	`29`	`* @magentoDbIsolation disabled`
`30`	`30`	`* @magentoDataFixture Magento/Elasticsearch/_files/indexer.php`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* Important: Please make sure that each integration test file works with unique search index. In order to`
`23`	`23`	`* achieve this, use @magentoConfigFixture to pass unique value for index_prefix for every test`
`24`	`24`	`* 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'`
`26`	`26`	`*`
`27`	`27`	`* @magentoDbIsolation disabled`
`28`	`28`	`* @magentoAppIsolation enabled`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* Important: Please make sure that each integration test file works with unique elastic search index. In order to`
`23`	`23`	`* 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'`
`25`	`25`	`*`
`26`	`26`	`* In ElasticSearch, a reindex is required if the test includes a new data fixture with new items to search, see`
`27`	`27`	`* testAdvancedSearchDateField().`