@scandipwa/magento-scripts 2.0.0-alpha.10 → 2.0.0-alpha.13

package/lib/config/versions/magento-2.4.3-p1.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.3-p2.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.3-p3.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p3',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.3.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.4-p1.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php81 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4-p1',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.4.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php81 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/config/versions/magento-2.4.5.js

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php81 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.5',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.17.5'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

package/lib/tasks/composer/local-auth-json.js

@@ -27,7 +27,7 @@ const localAuthJson = () => ({
                 throw new KnownError(`Your ./auth.json file does not contain the ${ logger.style.misc("{ 'http-basic': { 'repo.magento.com': <> } }") } field.`);
             }
 
-            process.env.COMPOSER_AUTH = localAuthJson;
+            process.env.COMPOSER_AUTH = JSON.stringify(JSON.parse(localAuthJson), null, 0);
         }
     },
     options: {

package/lib/tasks/database/connect-to-database.js

@@ -3,6 +3,8 @@ const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const sleep = require('../../util/sleep');
 const { createMagentoDatabase } = require('./create-magento-database');
+const { createMagentoUser } = require('./create-magento-user');
+const defaultMagentoUser = require('./default-magento-user');
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -60,9 +62,9 @@ const gettingDatabaseConnection = () => ({
                 const connection = await mysql2.createConnection({
                     host: '127.0.0.1',
                     port: ports.mariadb,
-                    user: mariadb.env.MARIADB_USER,
-                    password: mariadb.env.MARIADB_PASSWORD,
-                    database: mariadb.env.MARIADB_DATABASE
+                    user: defaultMagentoUser.user,
+                    password: defaultMagentoUser.password,
+                    database: 'magento'
                 });
 
                 ctx.databaseConnection = connection;
@@ -101,6 +103,7 @@ const connectToDatabase = () => ({
     task: (ctx, task) => task.newListr([
         waitForDatabaseInitialization(),
         createMagentoDatabase(),
+        createMagentoUser(),
         terminatingExistingConnection(),
         gettingDatabaseConnection()
     ], {

package/lib/tasks/database/create-magento-database.js

@@ -1,4 +1,4 @@
-const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { containerApi } = require('../docker/containers');
 
 /**
  * Will create database 'magento' in MariaDB if it does not exist for some reason
@@ -9,7 +9,10 @@ const createMagentoDatabase = () => ({
     task: async (ctx, task) => {
         const { mariadb } = ctx.config.docker.getContainers();
         task.title = `Creating Magento database in ${ mariadb._ }`;
-        await execAsyncSpawn(`docker exec ${mariadb.name} mysql -umagento -pmagento -h 127.0.0.1 -e "CREATE DATABASE IF NOT EXISTS magento;"`);
+        await containerApi.exec(
+            `mysql -uroot -p${ mariadb.env.MARIADB_ROOT_PASSWORD } -h 127.0.0.1 -e "CREATE DATABASE IF NOT EXISTS magento;"`,
+            mariadb.name
+        );
     }
 });
 

package/lib/tasks/database/create-magento-user.js

@@ -0,0 +1,50 @@
+const mysql2 = require('mysql2/promise');
+const defaultMagentoUser = require('./default-magento-user');
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createMagentoUser = () => ({
+    title: 'Creating Magento user',
+    task: async (ctx, task) => {
+        const { mariadb } = ctx.config.docker.getContainers();
+        const connection = await mysql2.createConnection({
+            host: '127.0.0.1',
+            port: ctx.ports.mariadb,
+            user: 'root',
+            password: mariadb.env.MARIADB_ROOT_PASSWORD
+        });
+
+        const result = await connection.query('select Host, User from mysql.user;');
+
+        if (result.length === 0) {
+            task.skip();
+            return;
+        }
+
+        const [users] = result;
+
+        if (users.some((user) => user.User === defaultMagentoUser.user && user.Host === '%')) {
+            task.skip();
+            return;
+        }
+
+        if (users.some((user) => user.User === defaultMagentoUser.user)) {
+            const magentoUser = users.find((user) => user.User === defaultMagentoUser.user);
+
+            await connection.query(`DROP USER '${ magentoUser.User }'@'${ magentoUser.Host }'`);
+        }
+
+        await connection.query(
+            `CREATE USER '${ defaultMagentoUser.user }'@'${ defaultMagentoUser.host }' IDENTIFIED BY '${ defaultMagentoUser.password }';`
+        );
+        await connection.query(`GRANT ALL PRIVILEGES ON *.* TO '${ defaultMagentoUser.user }'@'${ defaultMagentoUser.host }' WITH GRANT OPTION;`);
+        await connection.query('FLUSH PRIVILEGES;');
+
+        await connection.destroy();
+    }
+});
+
+module.exports = {
+    createMagentoUser
+};

package/lib/tasks/database/default-magento-database.js

@@ -0,0 +1,3 @@
+module.exports = {
+    defaultMagentoDatabase: 'magento'
+};

package/lib/tasks/database/default-magento-user.js

@@ -0,0 +1,7 @@
+const defaultMagentoUser = {
+    user: 'magento',
+    password: 'magento',
+    host: '%'
+};
+
+module.exports = defaultMagentoUser;

package/lib/tasks/database/import-dump-to-database.js

@@ -5,6 +5,7 @@ const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn, execCommandTask } = require('../../util/exec-async-command');
 const pathExists = require('../../util/path-exists');
 const connectToDatabase = require('./connect-to-database');
+const defaultMagentoUser = require('./default-magento-user');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -88,8 +89,8 @@ const executeImportDumpSQL = () => ({
                     message: `root (${logger.style.command('Probably safest option')})`
                 },
                 {
-                    name: `--user=${mariadb.env.MARIADB_USER} --password=${mariadb.env.MARIADB_PASSWORD}`,
-                    message: `${mariadb.env.MARIADB_USER}`
+                    name: `--user=${defaultMagentoUser.user} --password=${defaultMagentoUser.password}`,
+                    message: `${defaultMagentoUser.user}`
                 }
             ]
         });

package/lib/tasks/docker/api.d.ts

@@ -1,7 +1,6 @@
 import { ExecAsyncSpawnOptions } from '../../util/exec-async-command';
 
 export interface DockerVersionOptions<T extends boolean = false> {
-    format?: string
     format?: string
     formatToJSON?: T
 }
@@ -69,3 +68,28 @@ export function version(
     options: DockerVersionOptions<true>,
     execOptions?: ExecAsyncSpawnOptions<false>
 ): Promise<DockerVersionResult>
+
+export interface DockerContextOptions<T extends boolean = false> {
+    format?: string
+    formatToJSON?: T
+}
+
+export interface DockerContextResult {
+    Current: boolean
+    Description: string
+    DockerEndpoint: string
+    KubernetesEndpoint: string
+    ContextType: string
+    Name: string
+    StackOrchestrator: string
+}
+
+export function context(
+    options: DockerContextOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>
+
+export function context(
+    options: DockerContextOptions<true>,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<DockerContextResult[]>

package/lib/tasks/docker/api.js

@@ -25,6 +25,36 @@ const version = async (options, execOptions = {}) => {
     return execAsyncSpawn(`docker version ${args}`, execOptions);
 };
 
+/**
+ * @param {import('./api').DockerContextOptions} options
+ * @param {import('../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const context = async (options, execOptions = {}) => {
+    const {
+        format,
+        formatToJSON
+    } = options;
+
+    const formatArg = !formatToJSON && format
+        ? `--format=${format}`
+        : formatToJSON && '--format=\'{{json .}}\'';
+    const args = [
+        formatArg
+    ].filter(Boolean).join(' ');
+
+    if (formatToJSON) {
+        const result = await execAsyncSpawn(`docker context ls ${args}`, execOptions);
+        if (result.startsWith('[')) {
+            return JSON.parse(result);
+        }
+
+        return JSON.parse(`[${result.split('\n').join(', ')}]`);
+    }
+
+    return execAsyncSpawn(`docker context ls ${args}`, execOptions);
+};
+
 module.exports = {
-    version
+    version,
+    context
 };

package/lib/tasks/docker/containers/container-api.d.ts

@@ -130,3 +130,17 @@ export interface ContainerRunOptions {
 export function run(containerOptions: ContainerRunOptions, execOptions?: ExecAsyncSpawnOptions<false>): Promise<false>
 
 export function runCommand(options: ContainerRunOptions): string[]
+
+export interface ContainerLogsOptions<T = never> {
+    name: string
+    details?: boolean
+    follow?: boolean
+    since?: string
+    tail?: string
+    timestamps?: boolean
+    until?: string
+    parser?: (line: string) => T
+}
+
+export function logs(options?: ContainerLogsOptions, execOptions?: ExecAsyncSpawnOptions<false>): Promise<string>
+export function logs<T>(options?: ContainerLogsOptions<T>, execOptions?: ExecAsyncSpawnOptions<false>): Promise<T[]>

package/lib/tasks/docker/containers/container-api.js

@@ -149,15 +149,64 @@ const ls = async (options = {}, execOptions = {}) => {
 
     if (formatToJSON) {
         const result = await execAsyncSpawn(`docker container ls ${args}`, execOptions);
+        if (result.startsWith('[')) {
+            return JSON.parse(result);
+        }
+
         return JSON.parse(`[${result.split('\n').join(', ')}]`);
     }
 
     return execAsyncSpawn(`docker container ls ${args}`, execOptions);
 };
 
+/**
+ * @param {import('./container-api').ContainerLogsOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions<false>} execOptions
+ */
+const logs = async (options = {}, execOptions = {}) => {
+    const {
+        name,
+        details = false,
+        follow = false,
+        since = '',
+        tail = '',
+        timestamps = false,
+        until = '',
+        parser
+    } = options;
+    const detailsArg = details && '--details';
+    const followArg = follow && '--follow';
+    const sinceArg = since && `--since=${since}`;
+    const tailArg = tail && `--tail=${tail}`;
+    const timestampsArg = timestamps && '--timestamps';
+    const untilArg = until && `--until=${until}`;
+
+    const logsCommand = [
+        'docker',
+        'container',
+        'logs',
+        detailsArg,
+        followArg,
+        sinceArg,
+        tailArg,
+        timestampsArg,
+        untilArg,
+        name
+    ].filter(Boolean).join(' ');
+
+    if (parser) {
+        const result = await execAsyncSpawn(logsCommand, execOptions);
+
+        return result.split('\n').map((line) => parser(line));
+    }
+
+    return execAsyncSpawn(logsCommand, execOptions);
+};
+
 module.exports = {
     run,
     runCommand,
     exec,
-    ls
+    ls,
+    logs
 };

package/lib/tasks/docker/containers/tasks.js

@@ -26,8 +26,39 @@ const remoteImageReducer = (acc, val) => {
  */
 const pullImages = () => ({
     title: 'Pulling container images',
-    task: async ({ config: { docker } }, task) => {
+    task: async ({ config: { docker }, pullImages }, task) => {
         const containers = Object.values(docker.getContainers());
+
+        if (pullImages) {
+            return task.newListr(
+                containers
+                    .reduce(remoteImageReducer, [])
+                    .map((image) => {
+                        const [repo, tag = 'latest'] = image.split(':');
+
+                        return { repo, tag };
+                    })
+                    .reduce(
+                        (acc, val) => acc.concat(
+                            acc.some(
+                                (c) => c.repo === val.repo
+                                && c.tag === val.tag
+                            )
+                                ? []
+                                : val
+                        ),
+                        []
+                    )
+                    .map(({ repo, tag }) => ({
+                        title: `Pulling ${ logger.style.file(`${repo}:${tag}`) } image`,
+                        task: () => pull(`${repo}:${tag}`)
+                    })), {
+                    concurrent: true,
+                    exitOnError: true
+                }
+            );
+        }
+
         const imagesFilter = containers
             .reduce(remoteImageReducer, [])
             .map((image) => `reference='${image}'`);

package/lib/tasks/docker/index.js

@@ -1,5 +1,7 @@
 const containers = require('./containers');
 const network = require('./network');
+const volume = require('./volume');
+const dockerApi = require('./api');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -19,13 +21,16 @@ const startServices = () => ({
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const stopServices = () => ({
+    title: 'Stopping Docker services',
     task: (ctx, task) => task.newListr([
         containers.stopContainers(),
+        volume.removeLocalVolumes(),
         network.tasks.removeNetwork()
     ])
 });
 
 module.exports = {
     startServices,
-    stopServices
+    stopServices,
+    dockerApi
 };