@contentstack/cli-cm-import 1.1.0 → 1.2.1

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-import/1.1.0 darwin-arm64 node-v16.17.0
+@contentstack/cli-cm-import/1.2.1 darwin-arm64 node-v18.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -67,6 +67,7 @@ OPTIONS
   -d, --data-dir=data-dir                  path and location where data is stored
   -k, --stack-api-key=stack-api-key        API key of the target stack
   -m, --module=module                      [optional] specific module name
+  -y, --yes                                [optional] Override marketplace prompts
   --import-webhook-status=disable|current  [default: disable] Webhook state
 
 DESCRIPTION
@@ -85,8 +86,8 @@ EXAMPLES
   csdx cm:stacks:import --alias <management_token_alias>
   csdx cm:stacks:import --alias <management_token_alias> --data-dir <path/of/export/destination/dir>
   csdx cm:stacks:import --alias <management_token_alias> --config <path/of/config/file>
-  csdx cm:stacks:import --branch <branch name>
+  csdx cm:stacks:import --branch <branch name>  --yes
 ```
 
-_See code: [src/commands/cm/stacks/import.js](https://github.com/contentstack/cli/blob/v1.1.0/packages/contentstack-import/src/commands/cm/stacks/import.js)_
+_See code: [src/commands/cm/stacks/import.js](https://github.com/contentstack/cli/blob/main/packages/contentstack-import/src/commands/cm/stacks/import.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.1.0","commands":{"cm:stacks:import":{"id":"cm:stacks:import","description":"Import script for importing the content into the new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:stacks:import command.\n","usage":"cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":["cm:import"],"examples":["csdx cm:stacks:import --stack-api-key <stack_api_key> --data-dir <path/of/export/destination/dir>","csdx cm:stacks:import --config <path/of/config/dir>","csdx cm:stacks:import --module <single module name>","csdx cm:stacks:import --module <single module name> --backup-dir <backup dir>","csdx cm:stacks:import --alias <management_token_alias>","csdx cm:stacks:import --alias <management_token_alias> --data-dir <path/of/export/destination/dir>","csdx cm:stacks:import --alias <management_token_alias> --config <path/of/config/file>","csdx cm:stacks:import --branch <branch name>"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack","hidden":true},"stack-api-key":{"name":"stack-api-key","type":"option","char":"k","description":"API key of the target stack"},"data":{"name":"data","type":"option","description":"path and location where data is stored","hidden":true},"data-dir":{"name":"data-dir","type":"option","char":"d","description":"path and location where data is stored"},"alias":{"name":"alias","type":"option","char":"a","description":"alias of the management token"},"management-token-alias":{"name":"management-token-alias","type":"option","description":"alias of the management token","hidden":true},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","hidden":true,"allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"},"import-webhook-status":{"name":"import-webhook-status","type":"option","description":"Webhook state","required":false,"options":["disable","current"],"default":"disable"}},"args":[]}}}
+{"version":"1.2.1","commands":{"cm:stacks:import":{"id":"cm:stacks:import","description":"Import script for importing the content into the new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:stacks:import command.\n","usage":"cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":["cm:import"],"examples":["csdx cm:stacks:import --stack-api-key <stack_api_key> --data-dir <path/of/export/destination/dir>","csdx cm:stacks:import --config <path/of/config/dir>","csdx cm:stacks:import --module <single module name>","csdx cm:stacks:import --module <single module name> --backup-dir <backup dir>","csdx cm:stacks:import --alias <management_token_alias>","csdx cm:stacks:import --alias <management_token_alias> --data-dir <path/of/export/destination/dir>","csdx cm:stacks:import --alias <management_token_alias> --config <path/of/config/file>","csdx cm:stacks:import --branch <branch name>  --yes"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack","hidden":true},"stack-api-key":{"name":"stack-api-key","type":"option","char":"k","description":"API key of the target stack"},"data":{"name":"data","type":"option","description":"path and location where data is stored","hidden":true},"data-dir":{"name":"data-dir","type":"option","char":"d","description":"path and location where data is stored"},"alias":{"name":"alias","type":"option","char":"a","description":"alias of the management token"},"management-token-alias":{"name":"management-token-alias","type":"option","description":"alias of the management token","hidden":true},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","hidden":true,"allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"},"import-webhook-status":{"name":"import-webhook-status","type":"option","description":"Webhook state","required":false,"options":["disable","current"],"default":"disable"},"yes":{"name":"yes","type":"boolean","char":"y","description":"[optional] Override marketplace prompts","required":false,"allowNo":false}},"args":[]}}}

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.0.1",
+    "@contentstack/cli-command": "^1.0.2",
     "@contentstack/management": "^1.3.0",
-    "@contentstack/cli-utilities": "^1.0.2",
-    "@contentstack/cli-cm-export": "^1.1.0",
+    "@contentstack/cli-utilities": "^1.0.3",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
-    "bluebird": "3.5.1",
+    "big-json": "^3.2.0",
+    "bluebird": "^3.7.2",
     "debug": "^4.1.0",
     "lodash": "^4.17.20",
     "marked": "^4.0.17",
     "mkdirp": "^1.0.4",
-    "ncp": "2.0.0",
+    "ncp": "^2.0.0",
+    "promise-limit": "^2.7.0",
     "winston": "^3.7.2"
   },
   "devDependencies": {
@@ -65,7 +66,7 @@
     "devPlugins": [
       "@oclif/plugin-help"
     ],
-    "repositoryPrefix": "<%- repo %>/blob/v<%- version %>/packages/contentstack-import/<%- commandPath %>"
+    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-import/<%- commandPath %>"
   },
   "repository": "https://github.com/contentstack/cli"
 }

package/src/app.js

@@ -10,9 +10,11 @@ let _ = require('lodash');
 let path = require('path');
 const chalk = require('chalk');
 let util = require('./lib/util/index');
+let { formatError } = require('./lib/util');
 let login = require('./lib/util/login');
 let { addlogs } = require('./lib/util/log');
 const { HttpClient } = require('@contentstack/cli-utilities');
+const stack = require('./lib/util/contentstack-management-sdk');
 
 exports.initial = function (configData) {
   return new Promise(async function (resolve, reject) {
@@ -20,10 +22,9 @@ exports.initial = function (configData) {
     config.oldPath = config.data;
 
     if (configData.branchName) {
-      await validateIfBranchExist(configData, configData.branchName)
-        .catch(() => {
-          process.exit()
-        })
+      await validateIfBranchExist(configData, configData.branchName).catch(() => {
+        process.exit();
+      });
     }
 
     const backupAndImportData = async () => {
@@ -33,21 +34,21 @@ exports.initial = function (configData) {
           .then((basePath) => {
             config.data = basePath;
             return util.sanitizeStack(config);
-          }).then(() => {
-            let importRes
-            const types = config.modules.types
+          })
+          .then(() => {
+            let importRes;
+            const types = config.modules.types;
 
             if (config.moduleName) {
-              importRes = singleImport(config.moduleName, types, config)
+              importRes = singleImport(config.moduleName, types, config);
             } else {
-              importRes = allImport(config, types)
+              importRes = allImport(config, types);
             }
 
-            importRes
-              .then(resolve)
-              .catch(reject)
-          }).catch((e) => {
-            console.error(e);
+            importRes.then(resolve).catch(reject);
+          })
+          .catch((error) => {
+            addlogs(config, `Failed to import contents ${formatError(error)}`, 'error');
             reject(e);
             process.exit(1);
           });
@@ -55,25 +56,24 @@ exports.initial = function (configData) {
         let filename = path.basename(config.data);
         addlogs(config, chalk.red(filename + ' Folder does not Exist'), 'error');
       }
-    }
+    };
 
     if (config) {
-      if (
-        (config.email && config.password) ||
-        (config.auth_token)
-      ) {
-        login(config)
-          .then(backupAndImportData)
-          .catch(reject);
+      if ((config.email && config.password) || config.auth_token) {
+        login(config).then(backupAndImportData).catch(reject);
       } else if (config.management_token) {
-        await backupAndImportData()
+        await backupAndImportData();
       }
     }
   });
 };
 
 let singleImport = async (moduleName, types, config) => {
-  return new Promise(async (resolve, reject) => {
+  try {
+    const stackClient = stack
+      .Client(config)
+      .stack({ api_key: config.target_stack, management_token: config.management_token });
+
     if (types.indexOf(moduleName) > -1) {
       if (!config.master_locale) {
         try {
@@ -81,88 +81,75 @@ let singleImport = async (moduleName, types, config) => {
           let master_locale = { code: masterLocalResponse.code };
           config['master_locale'] = master_locale;
         } catch (error) {
-          console.log('Error to fetch the stack details' + error);
+          addlogs(config, `Failed to get master locale detail from the stack ${formatError(error)}`, 'error');
         }
       }
-      let exportedModule = require('./lib/import/' + moduleName);
-      exportedModule
-        .start(config)
-        .then(async function (data) {
-          if (moduleName === 'content-types') {
-            let ctPath = path.resolve(config.data, config.modules.content_types.dirName);
-            let fieldPath = path.join(ctPath + '/field_rules_uid.json');
-            if (fieldPath) {
-              await util.field_rules_update(config, ctPath);
-            }
-          }
-          if (!(data && data.empty)) {
-            addlogs(config, moduleName + ' imported successfully!', 'success');
-          }
-          addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success');
-          return resolve();
-        })
-        .catch(function (error) {
-          addlogs(config, 'Failed to migrate ' + moduleName, 'error');
-          addlogs(config, error, 'error');
-          addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error');
-          return reject(error);
-        });
+      let ImportModule = require('./lib/import/' + moduleName);
+      const importResponse = await new ImportModule(config, stackClient).start(config);
+      if (moduleName === 'content-types') {
+        let ctPath = path.resolve(config.data, config.modules.content_types.dirName);
+        let fieldPath = path.join(ctPath + '/field_rules_uid.json');
+        if (fieldPath) {
+          await util.field_rules_update(config, ctPath);
+        }
+      }
+      if (!(importResponse && importResponse.empty)) {
+        addlogs(config, moduleName + ' imported successfully!', 'success');
+      }
+      addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success');
+      return true;
     } else {
       addlogs(config, 'Please provide valid module name.', 'error');
-      return reject();
     }
-  });
+  } catch (error) {
+    addlogs(config, 'Failed to migrate ' + moduleName, 'error');
+    addlogs(config, formatError(error), 'error');
+    addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error');
+  }
 };
 
 let allImport = async (config, types) => {
-  return new Promise(async (resolve, reject) => {
-    try {
-      for (let i = 0; i < types.length; i++) {
-        let type = types[i];
-        let exportedModule = require('./lib/import/' + type);
-        if (i === 0 && !config.master_locale) {
-          let masterLocalResponse = await util.masterLocalDetails(config);
-          let master_locale = { code: masterLocalResponse.code };
-          config['master_locale'] = master_locale;
-        }
-        await exportedModule.start(config).then((_result) => {
-          return
-        }).catch(function (error) {
-          addlogs(config, 'Failed to migrate ' + type, 'error');
-          addlogs(config, error, 'error');
-          addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error');
-          return reject(error);
-        });
+  try {
+    const stackClient = stack
+      .Client(config)
+      .stack({ api_key: config.target_stack, management_token: config.management_token });
+    for (let i = 0; i < types.length; i++) {
+      let type = types[i];
+      if (i === 0 && !config.master_locale) {
+        let masterLocalResponse = await util.masterLocalDetails(config);
+        let master_locale = { code: masterLocalResponse.code };
+        config['master_locale'] = master_locale;
       }
-      if (config.target_stack && config.source_stack) {
-        addlogs(
-          config,
-          chalk.green(
-            'The data of the ' +
+      let ImportModule = require('./lib/import/' + type);
+      await new ImportModule(config, stackClient).start(config);
+    }
+    if (config.target_stack && config.source_stack) {
+      addlogs(
+        config,
+        chalk.green(
+          'The data of the ' +
             (config.sourceStackName || config.source_stack) +
             ' stack has been imported into ' +
             (config.destinationStackName || config.target_stack) +
             ' stack successfully!',
-          ),
-          'success',
-        );
-        addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'import'), 'success');
-      } else {
-        addlogs(config, chalk.green('Stack: ' + config.target_stack + ' has been imported succesfully!'), 'success');
-        addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success');
-      }
-      return resolve();
-    } catch (error) {
-      addlogs(
-        config,
-        chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'),
-        'error',
+        ),
+        'success',
       );
-      addlogs(config, error, 'error');
-      addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error');
-      return reject(error);
+      addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'import'), 'success');
+    } else {
+      addlogs(config, chalk.green('Stack: ' + config.target_stack + ' has been imported succesfully!'), 'success');
+      addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success');
     }
-  });
+    return true;
+  } catch (error) {
+    addlogs(
+      config,
+      chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'),
+      'error',
+    );
+    addlogs(config, formatError(error), 'error');
+    addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error');
+  }
 };
 
 function createBackup(backupDirPath, config) {
@@ -191,32 +178,29 @@ function createBackup(backupDirPath, config) {
 
 const validateIfBranchExist = async (config, branch) => {
   return new Promise(async function (resolve, reject) {
-    const headers = { api_key: config.target_stack, authtoken: config.auth_token }
-    const httpClient = new HttpClient().headers(headers)
+    const headers = { api_key: config.target_stack, authtoken: config.auth_token };
+    const httpClient = new HttpClient().headers(headers);
     const result = await httpClient
       .get(`https://${config.host}/v3/stacks/branches/${branch}`)
       .then(({ data }) => {
         if (data.error_message) {
           addlogs(config, chalk.red(data.error_message), 'error');
           addlogs(config, chalk.red('No branch found with the name ' + branch), 'error');
-          reject()
+          reject();
         }
 
-        return data
-      }).catch((err) => {
-        console.log(err)
-        addlogs(config, chalk.red('No branch found with the name ' + branch), 'error');
-        reject()
+        return data;
       })
+      .catch((err) => {
+        console.log(err);
+        addlogs(config, chalk.red('No branch found with the name ' + branch), 'error');
+        reject();
+      });
 
-    if (
-      result &&
-      typeof result === 'object' &&
-      typeof result.branch === 'object'
-    ) {
-      resolve(result.branch)
+    if (result && typeof result === 'object' && typeof result.branch === 'object') {
+      resolve(result.branch);
     } else {
-      reject({ message: 'No branch found with the name ' + branch })
+      reject({ message: 'No branch found with the name ' + branch });
     }
   });
 };

package/src/commands/cm/stacks/import.js

@@ -34,6 +34,8 @@ class ImportCommand extends Command {
         defaultConfig.data = data;
       }
 
+      defaultConfig.forceMarketplaceAppsImport = importCommandFlags.yes
+
       if (alias) {
         let managementTokens = self.getToken(alias);
 
@@ -114,7 +116,7 @@ ImportCommand.examples = [
   `csdx cm:stacks:import --alias <management_token_alias>`,
   `csdx cm:stacks:import --alias <management_token_alias> --data-dir <path/of/export/destination/dir>`,
   `csdx cm:stacks:import --alias <management_token_alias> --config <path/of/config/file>`,
-  `csdx cm:stacks:import --branch <branch name>`,
+  `csdx cm:stacks:import --branch <branch name>  --yes`,
 ];
 ImportCommand.flags = {
   config: flags.string({
@@ -176,6 +178,11 @@ ImportCommand.flags = {
     required: false,
     default: 'disable',
   }),
+  yes: flags.boolean({
+    char: 'y',
+    required: false,
+    description: '[optional] Override marketplace prompts'
+  })
 };
 
 ImportCommand.aliases = ['cm:import'];

package/src/config/default.js

@@ -13,7 +13,7 @@ module.exports = {
     'https://api.contentstack.io': 'https://developerhub-api.contentstack.com',
     'https://eu-api.contentstack.com': 'https://eu-developerhub-api.contentstack.com',
     'https://azure-na-api.contentstack.com': 'https://azure-na-developerhub-api.contentstack.com',
-    'https://stag-api.csnonprod.com': 'https://stag-developerhub-api.csnonprod.com'
+    'https://stag-api.csnonprod.com': 'https://stag-developerhub-api.csnonprod.com',
   },
   modules: {
     types: [
@@ -74,6 +74,8 @@ module.exports = {
       host: 'https://api.contentstack.io',
       validKeys: ['uid', 'filename', 'url', 'status'],
       assetBatchLimit: 1,
+      uploadAssetsConcurrency: 1,
+      importFoldersConcurrency: 1,
     },
     content_types: {
       dirName: 'content_types',
@@ -100,8 +102,8 @@ module.exports = {
     },
     marketplace_apps: {
       dirName: 'marketplace_apps',
-      fileName: 'marketplace_apps.json'
-    }
+      fileName: 'marketplace_apps.json',
+    },
   },
   languagesCode: [
     'af-za',
@@ -331,6 +333,9 @@ module.exports = {
   preserveStackVersion: false,
   entriesPublish: true,
   concurrency: 1,
-  //  ,useBackedupDir: '_backup_397'
+  importConcurrency: 5,
+  fetchConcurrency: 5,
+  writeConcurrency: 5,
+  // useBackedupDir: '',
   // backupConcurrency: 10,
 };