clean up transfer command

packages/core/strapi/lib/commands/transfer/transfer.js

@@ -17,8 +17,7 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
 } = require('./utils');
-
+const { exitWith } = require('../utils/helpers');
-const logger = console;
 
 /**
  * @typedef TransferCommandOptions Options given to the CLI transfer command
@@ -39,8 +38,7 @@ const logger = console;
 module.exports = async (opts) => {
   // Validate inputs from Commander
   if (!isObject(opts)) {
-    logger.error('Could not parse command arguments');
+    exitWith(1, 'Could not parse command arguments');
-    process.exit(1);
   }
 
   const strapi = await createStrapiInstance();
@@ -49,8 +47,7 @@ module.exports = async (opts) => {
   let destination;
 
   if (!opts.from && !opts.to) {
-    logger.error('At least one source (from) or destination (to) option must be provided');
+    exitWith(1, 'At least one source (from) or destination (to) option must be provided');
-    process.exit(1);
   }
 
   // if no URL provided, use local Strapi
@@ -61,8 +58,7 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote source provider
   else {
-    logger.error(`Remote Strapi source provider not yet implemented`);
+    exitWith(1, `Remote Strapi source provider not yet implemented`);
-    process.exit(1);
   }
 
   // if no URL provided, use local Strapi
@@ -73,6 +69,10 @@ module.exports = async (opts) => {
   }
   // if URL provided, set up a remote destination provider
   else {
+    if (!opts.toToken) {
+      exitWith(1, 'Missing token for remote destination');
+    }
+
     destination = createRemoteStrapiDestinationProvider({
       url: opts.to,
       auth: {
@@ -87,8 +87,7 @@ module.exports = async (opts) => {
   }
 
   if (!source || !destination) {
-    logger.error('Could not create providers');
+    exitWith(1, 'Could not create providers');
-    process.exit(1);
   }
 
   const engine = createTransferEngine(source, destination, {
@@ -117,18 +116,15 @@ module.exports = async (opts) => {
 
   engine.diagnostics.onDiagnostic(formatDiagnostic('transfer'));
 
+  let results;
   try {
-    logger.log(`Starting transfer...`);
+    console.log(`Starting transfer...`);
-
+    results = await engine.transfer();
-    const results = await engine.transfer();
-
-    const table = buildTransferTable(results.engine);
-    logger.log(table.toString());
-
-    logger.log(`${chalk.bold('Transfer process has been completed successfully!')}`);
-    process.exit(0);
   } catch (e) {
-    logger.error('Transfer process failed.');
+    exitWith(1, 'Transfer process failed.');
-    process.exit(1);
   }
+
+  const table = buildTransferTable(results.engine);
+  console.log(table.toString());
+  exitWith(0, `${chalk.bold('Transfer process has been completed successfully!')}`);
 };

packages/core/strapi/lib/commands/utils/helpers.js

@@ -36,22 +36,29 @@ const readableBytes = (bytes, decimals = 1, padStart = 0) => {
  *
  * @param {number} code Code to exit process with
  * @param {string | Array} message Message(s) to display before exiting
+ * @param {Object} options
+ * @param {console} options.logger - logger object, defaults to console
+ * @param {process} options.prc - process object, defaults to process
+ *
  */
-const exitWith = (code, message = undefined) => {
+const exitWith = (code, message = undefined, options = {}) => {
-  const logger = (message) => {
+  const { logger = console, prc = process } = options;
+
+  const log = (message) => {
     if (code === 0) {
-      console.log(chalk.green(message));
+      logger.log(chalk.green(message));
     } else {
-      console.error(chalk.red(message));
+      logger.error(chalk.red(message));
     }
   };
 
   if (isString(message)) {
-    logger(message);
+    log(message);
   } else if (isArray(message)) {
-    message.forEach((msg) => logger(msg));
+    message.forEach((msg) => log(msg));
   }
-  process.exit(code);
+
+  prc.exit(code);
 };
 
 /**