From cf1b0845fd7d0c083b5f20ba2c0a495d0e9bf9ad Mon Sep 17 00:00:00 2001
From: Andreas Mautz <am@webvisum.de>
Date: Fri, 29 Nov 2019 10:58:58 +0100
Subject: [PATCH] [FIXES] #25674: Elasticsearch version selections in admin are
 overly broad. This removes the X.0+ notation and replaces it with X.x
 notation

---
 .../Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml  | 6 +++---
 app/code/Magento/Elasticsearch/etc/adminhtml/system.xml     | 2 +-
 app/code/Magento/Elasticsearch/etc/di.xml                   | 2 +-
 .../Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml    | 2 +-
 app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml    | 2 +-
 app/code/Magento/Elasticsearch6/etc/di.xml                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
index d8ce091fba76f..9891b80435476 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
@@ -11,7 +11,7 @@
     <test name="ProductQuickSearchUsingElasticSearchTest">
         <annotations>
             <features value="Search"/>
-            <stories value="Quick Search of products on Storefront when ES 5.0+ is enabled"/>
+            <stories value="Quick Search of products on Storefront when ES 5.x is enabled"/>
             <title value="Product quick search doesn't throw exception after ES is chosen as search engine"/>
             <description value="Verify no elastic search exception is thrown when searching for product before catalogsearch reindexing"/>
             <severity value="CRITICAL"/>
@@ -36,7 +36,7 @@
         </after>
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-        <comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
+        <comment userInput="Change Catalog search engine option to Elastic Search 5.x" stepKey="chooseElasticSearch5"/>
         <actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
         <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
         <actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
@@ -57,4 +57,4 @@
         <comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
         </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
index dd42b408ff75e..e08d4fafd63da 100644
--- a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
@@ -63,7 +63,7 @@
                         <field id="engine">elasticsearch</field>
                     </depends>
                 </field>
-                <!-- Elasticsearch 5.0+ -->
+                <!-- Elasticsearch 5.x -->
                 <field id="elasticsearch5_server_hostname" translate="label" type="text" sortOrder="61" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Hostname</label>
                     <depends>
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index f42d957276d76..2b29e53635e3a 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -169,7 +169,7 @@
         <arguments>
             <argument name="engines" xsi:type="array">
                 <item name="elasticsearch" xsi:type="string">Elasticsearch</item>
-                <item name="elasticsearch5" xsi:type="string">Elasticsearch 5.0+</item>
+                <item name="elasticsearch5" xsi:type="string">Elasticsearch 5.x</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
index f1f2f39f4457b..03a1c63f71515 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
@@ -10,7 +10,7 @@
     <entity name="SearchEngineElasticsearchConfigData">
         <data key="path">catalog/search/engine</data>
         <data key="scope_id">1</data>
-        <data key="label">Elasticsearch 6.0+</data>
+        <data key="label">Elasticsearch 6.x</data>
         <data key="value">elasticsearch6</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
index 067a0acb8c908..6002f3d489d3c 100644
--- a/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
+++ b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
     <system>
         <section id="catalog">
             <group id="search">
-                <!-- Elasticsearch 6.0+ -->
+                <!-- Elasticsearch 6.x -->
                 <field id="elasticsearch6_server_hostname" translate="label" type="text" sortOrder="71"
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Hostname</label>
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 580c61ffc8cdb..434aec5af221a 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+</item>
+                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6.x</item>
             </argument>
         </arguments>
     </type>