@contentstack/cli-cm-export 1.5.7 → 1.5.9

package/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.5.7 linux-x64 node-v16.20.0
+@contentstack/cli-cm-export/1.5.9 linux-x64 node-v16.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.7",
+  "version": "1.5.9",
   "commands": {
     "cm:stacks:export": {
       "id": "cm:stacks:export",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.7",
-    "@contentstack/cli-utilities": "^1.4.3",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "async": "^3.2.4",
@@ -15,7 +15,7 @@
     "chalk": "^4.1.2",
     "is-valid-path": "^0.1.1",
     "lodash": "^4.17.20",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.3",
     "path": "^0.12.7",
     "progress-stream": "^2.0.0",
     "promise-limit": "^2.7.0",
@@ -23,9 +23,9 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "^1.3.7",
-    "@contentstack/cli-config": "^1.4.5",
-    "@contentstack/cli-dev-dependencies": "^1.2.2",
+    "@contentstack/cli-auth": "^1.3.8",
+    "@contentstack/cli-config": "^1.4.6",
+    "@contentstack/cli-dev-dependencies": "^1.2.3",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",
     "assert": "^2.0.0",
@@ -84,4 +84,4 @@
   },
   "main": "./src/commands/cm/stacks/export.js",
   "repository": "https://github.com/contentstack/cli"
-}
+}

package/src/app.js

@@ -36,7 +36,7 @@ exports.initial = async (config) => {
               await allExport(APIClient, stackAPIClient, config, types, branch.uid);
             }
           } catch (error) {
-            addlogs(config, `failed export contents ${branch.uid} ${util.formatError(error)}`, 'error');
+            addlogs(config, `failed export contents '${branch.uid}' ${util.formatError(error)}`, 'error');
           }
         }
       } else {
@@ -47,7 +47,7 @@ exports.initial = async (config) => {
             await allExport(APIClient, stackAPIClient, config, types);
           }
         } catch (error) {
-          addlogs(config, `failed export contents ${util.formatError(error)}`, 'error');
+          addlogs(config, `failed export contents. ${util.formatError(error)}`, 'error');
         }
       }
     };
@@ -77,9 +77,8 @@ exports.initial = async (config) => {
           resolve();
         })
         .catch((error) => {
-          console.log('error', error && error.message);
           if (error && error.errors && error.errors.api_key) {
-            addlogs(config, chalk.red('Stack Api key ' + error.errors.api_key[0], 'Please enter valid Key', 'error'));
+            addlogs(config, `Stack Api key '${error.errors.api_key[0]}', Please enter valid Key`, 'error');
             addlogs(config, 'The log for this is stored at ' + config.data + '/export/logs', 'success');
           } else {
             addlogs(config, `${util.formatError(error)}`, 'error');
@@ -112,7 +111,7 @@ const singleExport = async (APIClient, stackAPIClient, moduleName, types, config
           config = _.merge(config, master_locale);
         }
       }
-      addlogs(config, moduleName + ' was exported successfully!', 'success');
+      addlogs(config, `Module '${moduleName}' was exported successfully!`, 'success');
       addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'export'), 'success');
     } else {
       addlogs(config, 'Please provide valid module name.', 'error');
@@ -120,8 +119,8 @@ const singleExport = async (APIClient, stackAPIClient, moduleName, types, config
     return true;
   } catch (error) {
     addlogs(config, `${util.formatError(error)}`, 'error');
-    addlogs(config, 'Failed to migrate ' + moduleName, 'error');
-    addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'export'), 'error');
+    addlogs(config, `Failed to migrate module '${moduleName}'`, 'error');
+    addlogs(config, `The log for this is stored at '${path.join(config.data, 'logs', 'export')}'`, 'error');
   }
 };
 
@@ -149,13 +148,9 @@ const allExport = async (APIClient, stackAPIClient, config, types, branchName) =
     addlogs(config, util.formatError(error), 'error');
     addlogs(
       config,
-      chalk.red(
-        'Failed to migrate stack: ' +
-          (config.sourceStackName || config.source_stack) +
-          '. Please check error logs for more info',
-      ),
+      `Failed to migrate stack '${config.sourceStackName || config.source_stack}'. Please check error logs for more info.`,
       'error',
     );
-    addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'export'), 'error');
+    addlogs(config, `The log for this is stored at '${path.join(config.data, 'logs', 'export')}'`, 'error');
   }
 };

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

@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
 const { Command } = require('@contentstack/cli-command');
-const { printFlagDeprecation, configHandler, flags, isAuthenticated } = require('@contentstack/cli-utilities');
+const { printFlagDeprecation, configHandler, flags, isAuthenticated, cliux } = require('@contentstack/cli-utilities');
 const {
   configWithMToken,
   parameterWithMToken,
@@ -71,10 +71,10 @@ class ExportCommand extends Command {
             exportCommandFlags,
           );
         } else {
-          this.log('Please provide a valid command. Run "csdx cm:export --help" command to view the command usage');
+          cliux.print(`error: Please provide a valid command. Run "csdx cm:export --help" command to view the command usage`, {color: 'red'});
         }
       } else {
-        this.log(alias + ' management token is not present, please add managment token first');
+        cliux.print(`error: ${alias} management token is not present, please add managment token first`, {color: 'red'});
       }
     } else if (isAuthenticated()) {
       if (extConfig) {
@@ -108,10 +108,10 @@ class ExportCommand extends Command {
           exportCommandFlags,
         );
       } else {
-        this.log('Please provide a valid command. Run "csdx cm:export --help" command to view the command usage');
+        cliux.print(`error: Please provide a valid command. Run "csdx cm:export --help" command to view the command usage`, {color: 'red'});
       }
     } else {
-      this.log('Login or provide the alias for management token');
+      cliux.print(`error: Login or provide the alias for management token`, {color: 'red'});
     }
   }
 }

package/src/lib/export/assets.js

@@ -17,6 +17,7 @@ const helper = require('../util/helper');
 const { addlogs } = require('../util/log');
 
 let config = require('../../config/default');
+const { formatError } = require('../util');
 
 module.exports = class ExportAssets {
   config;
@@ -86,7 +87,8 @@ module.exports = class ExportAssets {
                           .catch((error) => {
                             addlogs(
                               self.config,
-                              chalk.red('The following asset failed to download\n' + JSON.stringify(assetJSON)),
+                              `Asset '${assetJSON.uid}' failed to download.\n ${formatError(error)}`,
+                              'error'
                             );
                             addlogs(self.config, error, 'error');
                           });
@@ -98,8 +100,8 @@ module.exports = class ExportAssets {
                           })
                           .catch((err) => {
                             addlogs(
-                              { errorCode: err && err.code, uid: assetJSON.uid },
-                              `Asset download failed - ${assetJSON.uid}`,
+                              self.config,
+                              `Asset '${assetJSON.uid}' download failed. ${formatError(err)}`,
                               'error',
                             );
                             return err;
@@ -113,8 +115,8 @@ module.exports = class ExportAssets {
                       // helper.writeFileSync(this.assetContentsFile, self.assetContents)
                     })
                     .catch((error) => {
-                      console.log('Error fetch/download the asset', error && error.message);
-                      addlogs(self.config, 'Asset batch ' + (batch + 1) + ' failed to download', 'error');
+                      addlogs(self.config, `Asset batch ${batch + 1} failed to download`, 'error');
+                      addlogs(self.config, formatError(error), 'error');
                       addlogs(self.config, error, 'error');
                     });
                 })
@@ -135,7 +137,7 @@ module.exports = class ExportAssets {
                   return resolve();
                 })
                 .catch((error) => {
-                  addlogs(self.config, error, 'success');
+                  addlogs(self.config, error, 'error');
                   reject(error);
                 });
             })
@@ -143,14 +145,15 @@ module.exports = class ExportAssets {
               helper.writeFileSync(self.assetContentsFile, self.assetContents);
               addlogs(
                 self.config,
-                chalk.red('Asset export failed due to the following errors ' + JSON.stringify(error), 'error'),
+                `Asset export failed. ${formatError(error)}`,
+                'error'
               );
-              addlogs(self.config, error, 'success');
+              addlogs(self.config, error, 'error');
               reject(error);
             });
         })
         .catch((error) => {
-          addlogs(self.config, error, 'success');
+          addlogs(self.config, error, 'error');
           reject(error);
         });
     });
@@ -175,7 +178,7 @@ module.exports = class ExportAssets {
               return resolve();
             })
             .catch((error) => {
-              addlogs(self.config, chalk.red('Error while exporting asset-folders!'), 'error');
+              addlogs(self.config, `Error while exporting asset-folders!\n ${formatError(error)}`, 'error');
               return reject(error);
             });
         })
@@ -319,7 +322,6 @@ module.exports = class ExportAssets {
         })
         .catch((error) => {
           addlogs(self.config, error, 'error');
-          console.log('Error on  fetch', error && error.message);
 
           if (error.status === 408) {
             console.log('retrying', uid);
@@ -354,7 +356,7 @@ module.exports = class ExportAssets {
           : asset.url,
       };
 
-      await helper.makeDirectory(assetFolderPath);
+      mkdirp.sync(assetFolderPath);
       const assetFileStream = fs.createWriteStream(assetFilePath);
       self.assetStream.url = encodeURI(self.assetStream.url);
       self.httpClient
@@ -383,6 +385,7 @@ module.exports = class ExportAssets {
           return resolve();
         })
         .on('error', (error) => {
+          addlogs(self.config, `Download ${asset.filename}: ${asset.uid} failed!`, 'error');
           addlogs(self.config, error, 'error');
           reject(error);
         });

package/src/lib/export/content-types.js

@@ -37,7 +37,7 @@ class ContentTypesExport {
       await this.writeContentTypes(this.contentTypes);
       addlogs(this.exportConfig, chalk.green('Content type(s) exported successfully'), 'success');
     } catch (error) {
-      addlogs(this.exportConfig, chalk.red(`Failed to export content types ${formatError(error)}`), 'error');
+      addlogs(this.exportConfig, `Failed to export content types ${formatError(error)}`, 'error');
       throw new Error('Failed to export content types');
     }
   }
@@ -58,7 +58,7 @@ class ContentTypesExport {
       }
       return await this.getContentTypes(skip);
     } else {
-      console.log('No content types returned for the given query');
+      addlogs(this.exportConfig, 'No content types returned for the given query', 'info');
     }
   }
 

package/src/lib/export/custom-roles.js

@@ -45,7 +45,7 @@ module.exports = class ExportCustomRoles {
       );
       self.customRoles = {};
       customRoles.forEach((role) => {
-        addlogs(self.config, role.name + ' role was exported successfully', 'success');
+        addlogs(self.config, `'${role.name}' role was exported successfully`, 'success');
         self.customRoles[role.uid] = role;
       });
       helper.writeFileSync(path.join(rolesFolderPath, self.rolesConfig.fileName), self.customRoles);
@@ -54,13 +54,12 @@ module.exports = class ExportCustomRoles {
       if (error.statusCode === 401) {
         addlogs(
           self.config,
-          chalk.red('You are not allowed to export roles, Unless you provide email and password in config'),
+          'You are not allowed to export roles, Unless you provide email and password in config',
           'error',
         );
         return;
       }
-      addlogs(self.config, 'Error occurred in exporting roles. ' + error && error.message, 'error');
-      addlogs(self.config, formatError(error), 'error');
+      addlogs(self.config, `Error occurred in exporting roles. ${formatError(error)}`, 'error');
       throw error;
     }
   }

package/src/lib/export/entries.js

@@ -32,7 +32,7 @@ class EntriesExport {
       const locales = await fileHelper.readFile(this.localesFilePath);
       const contentTypes = await fileHelper.readFile(this.schemaFilePath);
       if (contentTypes.length === 0) {
-        addlogs(this.exportConfig, 'No content types found to export entries');
+        addlogs(this.exportConfig, 'No content types found to export entries', 'info');
         return;
       }
       const entryRequestOptions = this.createRequestObjects(locales, contentTypes);
@@ -52,13 +52,13 @@ class EntriesExport {
         await fileHelper.writeLargeFile(entriesFilePath, entries);
         addlogs(
           this.exportConfig,
-          `Exported entries of type ${requestOption.content_type} locale ${requestOption.locale}`,
+          `Exported entries of type '${requestOption.content_type}' locale '${requestOption.locale}'`,
           'success',
         );
         if (this.exportConfig.versioning) {
           addlogs(
             this.exportConfig,
-            `Started export versioned entries of type ${requestOption.content_type} locale ${requestOption.locale}`,
+            `Started export versioned entries of type '${requestOption.content_type}' locale '${requestOption.locale}'`,
             'info',
           );
           for (let entry of entries) {
@@ -85,7 +85,7 @@ class EntriesExport {
               await executeTask(versionedEntries, write.bind(this), { concurrency: this.writeConcurrency });
               addlogs(
                 this.exportConfig,
-                `Exported versioned entries of type ${requestOption.content_type} locale ${requestOption.locale}`,
+                `Exported versioned entries of type '${requestOption.content_type}' locale '${requestOption.locale}'`,
                 'success',
               );
             }
@@ -94,7 +94,7 @@ class EntriesExport {
       }
       addlogs(this.exportConfig, chalk.green('Entries exported successfully'), 'success');
     } catch (error) {
-      addlogs(this.exportConfig, chalk.red(`Failed to export entries ${formatError(error)}`), 'error');
+      addlogs(this.exportConfig, `Failed to export entries ${formatError(error)}`, 'error');
       throw new Error('Failed to export entries');
     }
   }

package/src/lib/export/environments.js

@@ -66,7 +66,7 @@ module.exports = class ExportEnvironments {
           }
         })
         .catch((error) => {
-          addlogs(self.config, `Environments export failed ${formatError(error)}`, 'error');
+          addlogs(self.config, `Environments export failed. ${formatError(error)}`, 'error');
           reject(error);
         });
     });

package/src/lib/export/extensions.js

@@ -61,7 +61,7 @@ module.exports = class ExportExtensions {
           resolve();
         })
         .catch((error) => {
-          addlogs(self.config, `Failed to export extensions ${formatError(error)}`, 'error');
+          addlogs(self.config, `Failed to export extensions. ${formatError(error)}`, 'error');
           reject();
         });
     });

package/src/lib/export/global-fields.js

@@ -95,7 +95,7 @@ module.exports = class ExportGlobalFields {
             }
             return self.getGlobalFields(skip, globalFieldConfig).then(resolve).catch(reject);
           } catch (error) {
-            addlogs(globalFieldConfig, chalk.red(`Failed to export global-fields ${formatError(error)}`), 'error');
+            addlogs(globalFieldConfig, `Failed to export global-fields. ${formatError(error)}`, 'error');
             reject(error);
           }
         })

package/src/lib/export/labels.js

@@ -37,7 +37,7 @@ module.exports = class ExportLabels {
         .then((response) => {
           if (response.items.length !== 0) {
             response.items.forEach(function (label) {
-              addlogs(self.config, label.name + ' labels was exported successfully', 'success');
+              addlogs(self.config, `'${label.name}' label was exported successfully`, 'success');
               self.labels[label.uid] = label;
               const deleteItems = self.config.modules.labels.invalidKeys;
               deleteItems.forEach((e) => delete label[e]);
@@ -53,15 +53,13 @@ module.exports = class ExportLabels {
           if (error.statusCode === 401) {
             addlogs(
               self.config,
-              chalk.red(
-                'You are not allowed to export label, Unless you provide email and password in config',
-                'error',
-              ),
+              'You are not allowed to export label, Unless you provide email and password in config',
+              'error'
             );
             return resolve();
           }
 
-          addlogs(self.config, formatError(error), 'error');
+          addlogs(self.config,  `Failed to export labels. ${formatError(error)}`, 'error');
           reject();
         });
     });

package/src/lib/export/locales.js

@@ -33,7 +33,7 @@ class LocaleExport {
       await fileHelper.writeFile(path.join(this.localesPath, this.masterLocaleConfig.fileName), this.masterLocale);
       addlogs(this.exportConfig, 'Completed locale export', 'success');
     } catch (error) {
-      addlogs(this.exportConfig, chalk.red(`Failed to export locales ${formatError(error)}`), 'error');
+      addlogs(this.exportConfig, `Failed to export locales. ${formatError(error)}`, 'error');
       throw new Error('Failed to export locales');
     }
   }

package/src/lib/export/marketplace-apps.js

@@ -107,11 +107,12 @@ module.exports = class ExportMarketplaceApps {
   }
 
   async exportInstalledExtensions() {
+    const client = await managementSDKClient({ host: this.developerHubBaseUrl.split("://").pop() })
     const installedApps = (await this.getAllStackSpecificApps()) || [];
 
     if (!_.isEmpty(installedApps)) {
       for (const [index, app] of _.entries(installedApps)) {
-        await this.getAppConfigurations(installedApps, [+index, app]);
+        await this.getAppConfigurations(client, installedApps, [+index, app]);
       }
 
       await writeFileSync(path.join(this.marketplaceAppPath, this.marketplaceAppConfig.fileName), installedApps);
@@ -149,36 +150,38 @@ module.exports = class ExportMarketplaceApps {
         return listOfApps;
       })
       .catch((error) => {
-        log(this.config, `Failed to export marketplace-apps ${formatError(error)}`, 'error');
+        log(this.config, `Failed to export marketplace-apps. ${formatError(error)}`, 'error');
       });
   }
 
-  getAppConfigurations(installedApps, [index, app]) {
-    const appName = app.manifest.name;
+  async getAppConfigurations(sdkClient, installedApps, [index, appInstallation]) {
+    const appName = appInstallation.manifest.name;
     log(this.config, `Exporting ${appName} app and it's config.`, 'success');
 
-    return this.httpClient
-      .get(`${this.developerHubBaseUrl}/installations/${app.uid}/installationData`)
-      .then(async ({ data: result }) => {
-        const { data, error } = result;
-
-        if (_.has(data, 'server_configuration')) {
-          if (!this.nodeCrypto && _.has(data, 'server_configuration')) {
-            await this.createNodeCryptoInstance();
-          }
-
-          if (!_.isEmpty(data.server_configuration)) {
-            installedApps[index]['server_configuration'] = this.nodeCrypto.encrypt(data.server_configuration);
-            log(this.config, `Exported ${appName} app and it's config.`, 'success');
-          } else {
-            log(this.config, `Exported ${appName} app`, 'success');
-          }
-        } else if (error) {
-          log(this.config, `Error on exporting ${appName} app and it's config.`, 'error');
+    await sdkClient
+    .organization(this.config.org_uid)
+    .app(appInstallation.manifest.uid)
+    .installation(appInstallation.uid)
+    .installationData()
+    .then(async result => {
+      const {data, error} = result;
+      if (_.has(data, 'server_configuration')) {
+        if (!this.nodeCrypto && _.has(data, 'server_configuration')) {
+          await this.createNodeCryptoInstance();
         }
-      })
-      .catch((err) => {
-        log(this.config, `Failed to export ${appName} app config ${formatError(err)}`, 'error');
-      });
+
+        if (!_.isEmpty(data.server_configuration)) {
+          installedApps[index]['server_configuration'] = this.nodeCrypto.encrypt(data.server_configuration);
+          log(this.config, `Exported ${appName} app and it's config.`, 'success');
+        } else {
+          log(this.config, `Exported ${appName} app`, 'success');
+        }
+      } else if (error) {
+        log(this.config, `Error on exporting ${appName} app and it's config.`, 'error');
+      }
+    })
+    .catch(err => {
+      log(this.config, `Failed to export ${appName} app config ${formatError(err)}`, 'error');
+    })
   }
 };

package/src/lib/export/stack.js

@@ -33,7 +33,6 @@ module.exports = class ExportStack {
         .stack({ api_key: self.config.source_stack })
         .fetch()
         .catch((error) => {
-          console.log(error);
         });
 
       if (tempStackData && tempStackData.org_uid) {

package/src/lib/export/webhooks.js

@@ -63,13 +63,13 @@ module.exports = class ExportWebhooks {
           if (error.statusCode === 401) {
             addlogs(
               self.config,
-              chalk.red('You are not allowed to export webhooks, Unless you provide email and password in config'),
+              'You are not allowed to export webhooks, Unless you provide email and password in config',
               'error',
             );
             return resolve();
           }
-          addlogs(self.config, formatError(error), 'error');
-          reject('Failed export webhooks');
+          addlogs(self.config, `Failed to export webhooks. ${formatError(error)}`, 'error');
+          reject('Failed to export webhooks');
         });
     });
   }

package/src/lib/export/workflows.js

@@ -59,10 +59,8 @@ module.exports = class ExportWorkFlows {
           if (error.statusCode === 401) {
             addlogs(
               self.config,
-              chalk.red(
-                'You are not allowed to export workflow, Unless you provide email and password in config',
-                'error',
-              ),
+              'You are not allowed to export workflow, Unless you provide email and password in config',
+              'error',
             );
             return resolve();
           }
@@ -86,8 +84,7 @@ module.exports = class ExportWorkFlows {
         }
       }
     } catch (error) {
-      console.log('Error getting roles', error && error.message);
-      addlogs(self.config, 'Error fetching roles in export workflows task.', 'error');
+      addlogs(self.config, `Error fetching roles in export workflows task. ${formatError(error)}`, 'error');
       throw new Error({ message: 'Error fetching roles in export workflows task.' });
     }
   }
@@ -102,8 +99,7 @@ module.exports = class ExportWorkFlows {
         deleteItems.forEach((e) => delete workflow[e]);
       }
     } catch (error) {
-      console.log('Error getting workflow data', error && error.message);
-      addlogs(self.config, 'Error fetching workflow data in export workflows task.', 'error');
+      addlogs(self.config, `Error fetching workflow data in export workflows task. ${formatError(error)}`, 'error');
       throw error;
     }
   }

package/src/lib/util/log.js

@@ -89,7 +89,10 @@ function init(_logPath) {
     errorLogger = winston.createLogger({
       transports: [
         new winston.transports.File(errorTransport),
-        new winston.transports.Console({ level: 'error', format: winston.format.simple() }),
+        new winston.transports.Console({
+          level: 'error',
+          format: winston.format.combine(winston.format.colorize({ all: true,colors:{ error: 'red'} }), winston.format.simple()),
+        }),
       ],
       levels: { error: 0 },
     });