Revert "MCLOUD-5706: Add support of new ES option to ECE-Tools"

Author: shiftedreality

config/services.xml

@@ -35,7 +35,6 @@
         <service id="Magento\MagentoCloud\Scenario\Exception\ValidationException" autowire="false" />
         <service id="Magento\MagentoCloud\Service\ServiceMismatchException" autowire="false" />
         <service id="Magento\MagentoCloud\Config\ValidatorException" autowire="false" />
-        <service id="Magento\MagentoCloud\Service\ServiceException" autowire="false" />
         <service id="Magento\MagentoCloud\Shell\Process" autowire="false" />
         <service id="Magento\MagentoCloud\Shell\ProcessException" autowire="false" />
         <service id="Magento\MagentoCloud\Step\Build\BackupData" autowire="false" />

src/Config/SearchEngine.php

@@ -179,7 +179,12 @@ private function getSolrConfiguration(array $config): array
      */
     private function getElasticSearchConfiguration(array $config): array
     {
-        $engine = $this->elasticSearch->getFullVersion();
+        $engine = ElasticSearch::ENGINE_NAME;
+
+        $esVersion = $this->elasticSearch->getVersion();
+        if (Semver::satisfies($esVersion, '>= 5')) {
+            $engine .= (int)$esVersion;
+        }
 
         $elasticSearchConfig = [
             'engine' => $engine,

src/Config/SearchEngine/ElasticSuite.php

@@ -73,14 +73,6 @@ public function get(): array
         return $this->configMerger->merge($this->getConfig(), $envConfig);
     }
 
-    /**
-     * @return string
-     */
-    public function getServers(): string
-    {
-        return $this->get()['es_client']['servers'] ?? '';
-    }
-
     /**
      * Checks if both ElasticSearch and ElasticSuite are installed.
      *

src/Service/ElasticSearch.php

@@ -7,19 +7,17 @@
 
 namespace Magento\MagentoCloud\Service;
 
-use Composer\Semver\Semver;
 use Magento\MagentoCloud\Config\Environment;
 use Magento\MagentoCloud\Http\ClientFactory;
 use Psr\Log\LoggerInterface;
-use Throwable;
 
 /**
  * Returns ElasticSearch service configurations.
  */
 class ElasticSearch implements ServiceInterface
 {
-    private const RELATIONSHIP_KEY = 'elasticsearch';
-    public const ENGINE_NAME = 'elasticsearch';
+    const RELATIONSHIP_KEY = 'elasticsearch';
+    const ENGINE_NAME = 'elasticsearch';
 
     /**
      * @var ClientFactory
@@ -82,79 +80,33 @@ public function getConfiguration(): array
      *   elasticsearch doesn't exist in relationships.
      *
      * @return string
-     *
-     * @throws ServiceException
      */
     public function getVersion(): string
     {
-        if (!$this->isInstalled()) {
-            throw new ServiceException('ES service is not installed');
-        }
-
         if ($this->version === null) {
+            $this->version = '0';
+
+            $config = $this->getConfiguration();
+            if (!$config) {
+                return $this->version;
+            }
+
             try {
                 $esConfiguration = $this->call(sprintf(
                     '%s:%s',
-                    $this->getHost(),
-                    $this->getPort()
+                    $config['host'],
+                    $config['port']
                 ));
 
                 $this->version = $esConfiguration['version']['number'];
-            } catch (Throwable $exception) {
-                throw new ServiceException('Can\'t get version of elasticsearch: ' . $exception->getMessage());
+            } catch (\Exception $exception) {
+                $this->logger->warning('Can\'t get version of elasticsearch: ' . $exception->getMessage());
             }
         }
 
         return $this->version;
     }
 
-    /**
-     * Retrieve host.
-     *
-     * @return string
-     * @throws ServiceException
-     */
-    public function getHost(): string
-    {
-        if (!$this->isInstalled()) {
-            throw new ServiceException('ES service is not installed');
-        }
-
-        return (string)$this->getConfiguration()['host'];
-    }
-
-    /**
-     * Retrieve port.
-     *
-     * @return string
-     * @throws ServiceException
-     */
-    public function getPort(): string
-    {
-        if (!$this->isInstalled()) {
-            throw new ServiceException('ES service is not installed');
-        }
-
-        return (string)$this->getConfiguration()['port'];
-    }
-
-    /**
-     * Return full version with engine name.
-     *
-     * @return string
-     * @throws ServiceException
-     */
-    public function getFullVersion(): string
-    {
-        $version = $this->getVersion();
-
-        if (Semver::satisfies($version, '>= 5')) {
-            return self::ENGINE_NAME . (int)$version;
-        }
-
-        return self::ENGINE_NAME;
-    }
-
     /**
      * Retrieves default template configuration.
      * May contain configuration for replicas and shards.