move configuration elasticsearch, adjustment of db and magento upgrade tasks to db migration task

Author: ejnshtein

build-packages/magento-scripts/lib/tasks/magento/setup-magento/adjust-magento-configuration.js

@@ -0,0 +1,20 @@
+const adjustMagentoConfiguration = {
+    title: 'Adjusting Magento Database Configuration',
+    task: async (ctx) => {
+        const { mysqlConnection } = ctx;
+
+        // delete varnish configuration if exists
+        await mysqlConnection.query(`
+            DELETE FROM core_config_data WHERE path LIKE '%varnish%';
+        `);
+
+        // update cache policy to not use varnish
+        await mysqlConnection.query(`
+            UPDATE core_config_data
+            SET value = ?
+            WHERE path = ?;
+        `, ['0', 'system/full_page_cache/caching_application']);
+    }
+};
+
+module.exports = adjustMagentoConfiguration;

build-packages/magento-scripts/lib/tasks/magento/setup-magento/index.js

@@ -1,7 +1,6 @@
 const flushRedisConfig = require('./flush-redis-config');
 const waitingForRedis = require('./waiting-for-redis');
 const migrateDatabase = require('./migrate-database');
-const configureElasticsearch = require('./configure-elasticsearch');
 const createAdmin = require('./create-admin');
 const setDeploymentMode = require('./set-deployment-mode');
 const setBaseUrl = require('./set-base-url');
@@ -16,11 +15,10 @@ const setupMagento = {
         flushRedisConfig,
         waitingForRedis,
         migrateDatabase,
-        configureElasticsearch,
-        createAdmin,
-        setDeploymentMode,
         setBaseUrl,
         setUrlRewrite,
+        createAdmin,
+        setDeploymentMode,
         postDeploy,
         disable2fa
     ], {

build-packages/magento-scripts/lib/tasks/magento/setup-magento/migrate-database.js

@@ -2,7 +2,10 @@
 /* eslint-disable no-param-reassign */
 // const runComposerCommand = require('../../../util/run-composer');
 const runMagentoCommand = require('../../../util/run-magento');
+const adjustMagentoConfiguration = require('./adjust-magento-configuration');
+const configureElasticsearch = require('./configure-elasticsearch');
 const installMagento = require('./install-magento');
+const upgradeMagento = require('./upgrade-magento');
 
 const migrateDatabase = {
     title: 'Migrating database',
@@ -19,7 +22,8 @@ const migrateDatabase = {
             task.output = 'No Magento is installed in DB!\nInstalling...';
 
             return task.newListr([
-                installMagento
+                installMagento,
+                configureElasticsearch
             ], {
                 concurrent: false,
                 exitOnError: true,
@@ -39,23 +43,25 @@ const migrateDatabase = {
         }
         case 1: {
             return task.newListr([
-                installMagento
+                installMagento,
+                configureElasticsearch
             ], {
                 concurrent: false,
                 exitOnError: true,
                 ctx
             });
         }
         case 2: {
-            task.output = 'Upgrading magento';
-            await runMagentoCommand('setup:upgrade', {
-                magentoVersion,
-                callback: (t) => {
-                    task.output = t;
-                }
+            task.output = 'Migrating database: upgrade magento';
+            return task.newListr([
+                adjustMagentoConfiguration,
+                configureElasticsearch,
+                upgradeMagento
+            ], {
+                concurrent: false,
+                exitOnError: true,
+                ctx
             });
-            task.title = 'Migrating database: upgraded!';
-            break;
         }
         default: {
         // TODO: handle these statuses ?

build-packages/magento-scripts/lib/tasks/theme/link-theme/upgrade-magento.js renamed to build-packages/magento-scripts/lib/tasks/magento/setup-magento/upgrade-magento.js

@@ -4,7 +4,7 @@ const { getCachedPorts } = require('../../../config/get-port-config');
 const themeSymlink = require('./theme-symlink');
 const installTheme = require('./install-theme');
 const themeSubtask = require('./theme-subtask');
-const upgradeMagento = require('./upgrade-magento');
+const upgradeMagento = require('../../magento/setup-magento/upgrade-magento');
 const disablePageCache = require('./disable-page-cache');
 const checkThemeFolder = require('./check-theme-folder');