Merge pull request #523 from magento/MAGECLOUD-3668

MAGECLOUD-3668: Custom data in env.php removed after redeploy

Author: Yevhen Miroshnychenko

src/Config/Deploy/Writer.php

@@ -58,16 +58,6 @@ public function create(array $config)
      * @inheritdoc
      */
     public function update(array $config)
-    {
-        $updatedConfig = array_replace($this->reader->read(), $config);
-
-        $this->create($updatedConfig);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function updateRecursive(array $config)
     {
         $updatedConfig = array_replace_recursive($this->reader->read(), $config);
 

src/Config/Shared.php

@@ -79,7 +79,7 @@ public function all(): array
     public function update(array $config)
     {
         $this->reset();
-        $this->writer->updateRecursive($config);
+        $this->writer->update($config);
     }
 
     /**

src/Config/Shared/Writer.php

@@ -58,16 +58,6 @@ public function create(array $config)
      * @inheritdoc
      */
     public function update(array $config)
-    {
-        $updatedConfig = array_replace($this->reader->read(), $config);
-
-        $this->create($updatedConfig);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function updateRecursive(array $config)
     {
         $updatedConfig = array_replace_recursive($this->reader->read(), $config);
 

src/Config/State.php

@@ -85,7 +85,7 @@ public function isInstalled(): bool
             return true;
         }
 
-        $this->writer->updateRecursive(['install' => ['date' => date('r')]]);
+        $this->writer->update(['install' => ['date' => date('r')]]);
 
         return true;
     }

src/Filesystem/Writer/WriterInterface.php

@@ -21,21 +21,12 @@ interface WriterInterface
      */
     public function create(array $config);
 
-    /**
-     * Updates existence configuration.
-     *
-     * @param array $config
-     * @return void
-     * @throws FileSystemException
-     */
-    public function update(array $config);
-
     /**
      * Recursively updates existence configuration.
      *
      * @param array $config
      * @return void
      * @throws FileSystemException
      */
-    public function updateRecursive(array $config);
+    public function update(array $config);
 }

src/Process/Deploy/DisableCron.php

@@ -53,7 +53,7 @@ public function __construct(
     public function execute()
     {
         $this->logger->info('Disable cron');
-        $this->writer->updateRecursive(['cron' => ['enabled' => 0]]);
+        $this->writer->update(['cron' => ['enabled' => 0]]);
 
         $this->cronProcessKill->execute();
     }

src/Process/Deploy/InstallUpdate/ConfigUpdate/DocumentRoot.php

@@ -42,6 +42,6 @@ public function __construct(
     public function execute()
     {
         $this->logger->info('The value of the property \'directories/document_root_is_pub\' set as \'true\'');
-        $this->configWriter->updateRecursive(['directories' => ['document_root_is_pub' => true]]);
+        $this->configWriter->update(['directories' => ['document_root_is_pub' => true]]);
     }
 }

src/Process/Deploy/InstallUpdate/ConfigUpdate/SearchEngine.php

@@ -9,10 +9,13 @@
 
 use Magento\MagentoCloud\App\GenericException;
 use Magento\MagentoCloud\Config\Deploy\Writer as EnvWriter;
+use Magento\MagentoCloud\Config\Deploy\Reader as EnvReader;
 use Magento\MagentoCloud\Config\Shared\Writer as SharedWriter;
+use Magento\MagentoCloud\Config\Shared\Reader as SharedReader;
+use Magento\MagentoCloud\Filesystem\Reader\ReaderInterface;
+use Magento\MagentoCloud\Filesystem\Writer\WriterInterface;
 use Magento\MagentoCloud\Package\MagentoVersion;
 use Magento\MagentoCloud\Config\SearchEngine as SearchEngineConfig;
-use Magento\MagentoCloud\Package\UndefinedPackageException;
 use Magento\MagentoCloud\Process\ProcessException;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Psr\Log\LoggerInterface;
@@ -49,23 +52,39 @@ class SearchEngine implements ProcessInterface
      */
     private $searchEngineConfig;
 
+    /**
+     * @var EnvReader
+     */
+    private $envReader;
+
+    /**
+     * @var SharedReader
+     */
+    private $sharedReader;
+
     /**
      * @param LoggerInterface $logger
      * @param EnvWriter $envWriter
+     * @param EnvReader $envReader
      * @param SharedWriter $sharedWriter
+     * @param SharedReader $sharedReader
      * @param MagentoVersion $version
      * @param SearchEngineConfig $searchEngineConfig
      */
     public function __construct(
         LoggerInterface $logger,
         EnvWriter $envWriter,
+        EnvReader $envReader,
         SharedWriter $sharedWriter,
+        SharedReader $sharedReader,
         MagentoVersion $version,
         SearchEngineConfig $searchEngineConfig
     ) {
         $this->logger = $logger;
         $this->envWriter = $envWriter;
+        $this->envReader = $envReader;
         $this->sharedWriter = $sharedWriter;
+        $this->sharedReader = $sharedReader;
         $this->magentoVersion = $version;
         $this->searchEngineConfig = $searchEngineConfig;
     }
@@ -81,24 +100,38 @@ public function execute()
         try {
             $config = $this->searchEngineConfig->getConfig();
             $engine = $this->searchEngineConfig->getName();
-        } catch (UndefinedPackageException $exception) {
-            throw new ProcessException($exception->getMessage(), $exception->getCode(), $exception);
-        }
 
-        $this->logger->info('Updating search engine configuration.');
-        $this->logger->info('Set search engine to: ' . $engine);
+            $this->logger->info('Updating search engine configuration.');
+            $this->logger->info('Set search engine to: ' . $engine);
 
-        try {
             $isMagento21 = $this->magentoVersion->satisfies('2.1.*');
 
             // 2.1.x requires search config to be written to the shared config file: MAGECLOUD-1317
             if ($isMagento21) {
-                $this->sharedWriter->update($config);
+                $this->updateSearchConfiguration($config, $this->sharedReader, $this->sharedWriter);
             } else {
-                $this->envWriter->update($config);
+                $this->updateSearchConfiguration($config, $this->envReader, $this->envWriter);
             }
         } catch (GenericException $exception) {
             throw new ProcessException($exception->getMessage(), $exception->getCode(), $exception);
         }
     }
+
+    /**
+     * Unset previous search configuration and updates with new one from $searchConfig array
+     *
+     * @param array $searchConfig
+     * @param ReaderInterface $reader
+     * @param WriterInterface $writer
+     * @throws \Magento\MagentoCloud\Filesystem\FileSystemException
+     */
+    private function updateSearchConfiguration(array $searchConfig, ReaderInterface $reader, WriterInterface $writer)
+    {
+        $config = $reader->read();
+
+        unset($config['system']['default']['smile_elasticsuite_core_base_settings']);
+        unset($config['system']['default']['catalog']['search']);
+
+        $writer->create(array_merge_recursive($config, $searchConfig));
+    }
 }

src/Process/Deploy/InstallUpdate/Update/SetAdminUrl.php

@@ -64,7 +64,7 @@ public function execute()
         $config['backend']['frontName'] = $adminUrl;
 
         try {
-            $this->configWriter->updateRecursive($config);
+            $this->configWriter->update($config);
         } catch (FileSystemException $exception) {
             throw new ProcessException($exception->getMessage(), $exception->getCode(), $exception);
         }

src/Process/Deploy/SetCryptKey.php

@@ -79,7 +79,7 @@ public function execute()
         $config['crypt']['key'] = $key;
 
         try {
-            $this->configWriter->updateRecursive($config);
+            $this->configWriter->update($config);
         } catch (FileSystemException $exception) {
             throw new ProcessException($exception->getMessage(), $exception->getCode(), $exception);
         }