@contentstack/cli-cm-import 0.1.1-beta.10 → 0.1.1-beta.13

package/README.md

@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-import/0.1.1-beta.10 linux-x64 node-v12.22.7
+@contentstack/cli-cm-import/0.1.1-beta.13 linux-x64 node-v12.22.7
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -29,12 +29,15 @@ USAGE
 
 ## `csdx cm:import`
 
+Import script for importing the content into new stack
+
 ```
 USAGE
   $ csdx cm:import
 
 OPTIONS
   -A, --auth-token                                     to use auth token
+  -B, --branch=branch                                  [optional] branch name
   -a, --management-token-alias=management-token-alias  alias of the management token
   -b, --backup-dir=backup-dir                          [optional] backup directory name when using specific module
   -c, --config=config                                  [optional] path of config file
@@ -55,7 +58,9 @@ EXAMPLES
   csdx cm:import -a <management_token_alias>
   csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>
   csdx cm:import -a <management_token_alias> -c <path/of/config/file>
+  csdx cm:import -A -m <single module name>
+  csdx cm:import -A -B <branch name>
 ```
 
-_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.10/packages/contentstack-import/src/commands/cm/import.js)_
+_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.13/packages/contentstack-import/src/commands/cm/import.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.1.1-beta.10","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>"],"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"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","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"}},"args":[]}}}
+{"version":"0.1.1-beta.13","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>","csdx cm:import -A -m <single module name>","csdx cm:import -A -B <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"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","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"}},"args":[]}}}

package/package.json

@@ -1,18 +1,18 @@
 {
 	"name": "@contentstack/cli-cm-import",
 	"description": "Contentstack CLI plugin to import content into stack",
-	"version": "0.1.1-beta.10",
+	"version": "0.1.1-beta.13",
 	"author": "Contentstack",
 	"bugs": "https://github.com/contentstack/cli/issues",
 	"dependencies": {
-		"@contentstack/cli-command": "0.1.0-beta",
-		"@contentstack/management": "^1.2.1",
+		"@contentstack/cli-command": "0.1.1-beta.6",
+		"@contentstack/management": "^1.3.0",
 		"@oclif/command": "^1.6.1",
 		"@oclif/config": "^1.15.1",
 		"axios": "^0.21.1",
 		"bluebird": "3.5.1",
 		"configstore": "^5.0.1",
-		"debug": "4.1.0",
+		"debug": "^4.1.0",
 		"lodash": "^4.17.20",
 		"marked": "0.7.0",
 		"mkdirp": "^1.0.4",

package/src/app.js

@@ -11,18 +11,15 @@ let path = require('path')
 const chalk = require('chalk')
 const helper = require('./lib/util/fs')
 let _ = require('lodash')
-
 let login = require('./lib/util/login')
 let util = require('./lib/util/index')
-
-
 let { addlogs } = require('./lib/util/log')
 
 exports.initial = function (configData) {
   return new Promise(function (resolve, reject) {
     let config = util.initialization(configData)
     config.oldPath = config.data
-    if (config && config !== undefined) {
+    if (config) {
       login(config)
         .then(function () {
           if (fs.existsSync(config.data)) {
@@ -36,7 +33,7 @@ exports.initial = function (configData) {
             })
               .then(() => {
                 let types = config.modules.types
-                if (config.moduleName && config.moduleName !== undefined) {
+                if (config.moduleName) {
                   singleImport(config.moduleName, types, config).then(() => {
                     return resolve()
                   })
@@ -89,7 +86,7 @@ let singleImport = async (moduleName, types, config) => {
         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()
+        return reject(error)
       })
     } else {
       addlogs(config, 'Please provide valid module name.', 'error')
@@ -125,7 +122,7 @@ let allImport = async (config, types) => {
       addlogs(config, chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'), 'error')
       addlogs(config, error, 'error')
       addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error')
-      return reject()
+      return reject(error)
     }
   })
 }

package/src/commands/cm/import.js

@@ -14,29 +14,31 @@ const {configWithMToken,
 class ImportCommand extends Command {
   async run() {
     let self = this
-    const {flags} = self.parse(ImportCommand)
-    const extConfig = flags.config
-    let targetStack = flags['stack-uid']
-    const data = flags.data
-    const moduleName = flags.module
-    const backupdir = flags["backup-dir"]
-    const alias = flags['management-token-alias']
-    const authToken = flags['auth-token']
+    const importCommandFlags = self.parse(ImportCommand).flags
+    const extConfig = importCommandFlags.config
+    let targetStack = importCommandFlags['stack-uid']
+    const data = importCommandFlags.data
+    const moduleName = importCommandFlags.module
+    const backupdir = importCommandFlags["backup-dir"]
+    const alias = importCommandFlags['management-token-alias']
+    const authToken = importCommandFlags['auth-token']
     let _authToken = credStore.get('authtoken')
+    let branchName = importCommandFlags.branch
     let host = self.cmaHost
     
   return new Promise(function (resolve, reject) {  
-    if (alias && alias !== undefined) {
+    if (alias) {
       let managementTokens = self.getToken(alias)
 
-      if (managementTokens && managementTokens !== undefined) {
-        if (extConfig && extConfig !== undefined && _authToken) {
+      if (managementTokens) {
+        if (extConfig && _authToken) {
           configWithMToken(
             extConfig,
             managementTokens,
             moduleName,
             host,
             _authToken,
+            branchName,
             backupdir
           )
           .then(() => {
@@ -49,6 +51,7 @@ class ImportCommand extends Command {
             moduleName,
             host,
             _authToken,
+            branchName,
             backupdir
           )
           .then(() => {
@@ -60,6 +63,7 @@ class ImportCommand extends Command {
             moduleName,
             host,
             _authToken,
+            branchName,
             backupdir
           )
           .then(() => {
@@ -69,13 +73,14 @@ class ImportCommand extends Command {
       } else {
         console.log('management Token is not present please add managment token first')
       }
-    } else if (authToken && authToken !== undefined && _authToken && _authToken !== undefined) {
-      if (extConfig && extConfig !== undefined) {
+    } else if (authToken && _authToken) {
+      if (extConfig) {
         configWithAuthToken(
           extConfig,
           _authToken,
           moduleName,
           host,
+          branchName,
           backupdir
         )
         .then(() => {
@@ -88,7 +93,8 @@ class ImportCommand extends Command {
           data,
           moduleName,
           host,
-          backupdir
+          backupdir,
+          branchName
         )
         .then(() => {
           return resolve()
@@ -98,7 +104,8 @@ class ImportCommand extends Command {
           _authToken,
           moduleName,
           host,
-          backupdir
+          backupdir,
+          branchName
         )
         .then(() => {
           return resolve()
@@ -124,6 +131,8 @@ ImportCommand.examples = [
   `csdx cm:import -a <management_token_alias>`,
   `csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>`,
   `csdx cm:import -a <management_token_alias> -c <path/of/config/file>`,
+  `csdx cm:import -A -m <single module name>`,
+  `csdx cm:import -A -B <branch name>`,
 ]
 ImportCommand.flags = {
   config: flags.string({
@@ -153,7 +162,11 @@ ImportCommand.flags = {
   "backup-dir": flags.string({
     char: 'b', 
     description: '[optional] backup directory name when using specific module'
+  }),
+  'branch': flags.string({
+    char: 'B', 
+    description: '[optional] branch name'
   })
 }
 
-module.exports = ImportCommand
+module.exports = ImportCommand

package/src/lib/import/assets.js

@@ -142,11 +142,11 @@ importAssets.prototype = {
           }
           // TODO: if there are failures, retry
           return resolve()
-        }).catch(function () {
-          return reject()
+        }).catch(function (error) {
+          return reject(error)
         })
       }).catch(function (error) {
-        return reject()
+        return reject(error)
       })
     })
   },

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

@@ -36,7 +36,6 @@ let client
 let stack = {}
 
 function importContentTypes() {
-  let self = this
   this.contentTypes = []
   this.schemaTemplate = require('../util/schemaTemplate')
   this.requestOptions = {
@@ -180,7 +179,7 @@ importContentTypes.prototype = {
           return resolve()
         }).catch(err => {
           addlogs(config, err, 'error')
-          return reject()
+          return reject(err)
         })
       }, 1000)
     })
@@ -191,7 +190,6 @@ importContentTypes.prototype = {
     return new Promise(function (resolve, reject) {
       // eslint-disable-next-line no-undef
       return Promise.map(globalFieldPendingPath, function (globalfield) {
-        let lenGlobalField = (self.globalfields).length
         let Obj = _.find(self.globalfields, {uid: globalfield})
         let globalFieldObj = stack.globalField(globalfield)
         Object.assign(globalFieldObj, _.cloneDeep(Obj))

package/src/lib/import/entries.js

@@ -448,14 +448,6 @@ importEntries.prototype = {
               return
             }
 
-            let requestObject = {
-              qs: {
-                locale: lang,
-              },
-              json: {
-                entry: entry,
-              },
-            }
             let promiseResult = new Promise((resolve, reject) => {
               let entryResponse = client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(entry.uid)
               Object.assign(entryResponse, entry)
@@ -482,7 +474,7 @@ importEntries.prototype = {
                   locale: lang,
                   error: error,
                 })
-                return reject()
+                return reject(error)
               })
             })
             await promiseResult
@@ -615,7 +607,6 @@ importEntries.prototype = {
     })
   },
   unSuppressFields: function () {
-    let self = this
     return new Promise(function (resolve, reject) {
       let modifiedSchemas = helper.readFile(modifiedSchemaPath)
       let modifiedSchemasUids = []
@@ -719,7 +710,6 @@ importEntries.prototype = {
     })
   },
   field_rules_update: function (schema) {
-    let self = this
     return new Promise(function (resolve, reject) {
       if (schema.field_rules) {
         let fieldRuleLength = schema.field_rules.length

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

@@ -26,6 +26,7 @@ let globalfieldsUidMapperPath
 let globalfieldsSuccessPath
 let globalfieldsFailsPath
 let client
+let globalFieldsPending
 
 
 global._globalField_pending = []

package/src/lib/import/workflows.js

@@ -74,8 +74,13 @@ importWorkflows.prototype = {
             }
           }
 
+          if(workflow.admin_users !== undefined) {
+            addlogs(config, chalk.yellow('We are skipping import of `Workflow superuser(s)` from workflow'), 'info');
+            delete workflow.admin_users;
+          }
+
           let requestOption = {
-            workflow: workflow
+            workflow
           };
 
           return client.stack({ api_key: config.target_stack, management_token: config.management_token }).workflow().create(requestOption)

package/src/lib/util/contentstack-management-sdk.js

@@ -22,7 +22,12 @@ exports.Client = function (config) {
     retryDelayOptions: {
       base: 1000,
     },
-  };
-  const client = contentstacksdk.client(option);
-  return client;
-};
+  }
+  if (typeof config.branchName === 'string') {
+    option.headers = {
+      branch: config.branchName,
+    }
+  }
+  const client = contentstacksdk.client(option)
+  return client
+}

package/src/lib/util/import-flags.js

@@ -9,10 +9,11 @@ let _ = require('lodash')
 const { cli } = require('cli-ux')
 let message = require('../../../messages/index.json')
 
-exports.configWithMToken = function (config, managementTokens, moduleName, host, _authToken, backupdir) {
+exports.configWithMToken = function (config, managementTokens, moduleName, host, _authToken, backupdir, branchName) {
   return new Promise(async function (resolve, reject) {
     let externalConfig = require(config)
     defaultConfig.management_token = managementTokens.token
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName
     }
@@ -26,16 +27,17 @@ exports.configWithMToken = function (config, managementTokens, moduleName, host,
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }
 
-exports.parameterWithMToken = function (managementTokens, data, moduleName, host, _authToken, backupdir) {
+exports.parameterWithMToken = function (managementTokens, data, moduleName, host, _authToken, backupdir, branchName) {
   return new Promise(async function (resolve, reject) {
     defaultConfig.management_token = managementTokens.token
     defaultConfig.target_stack = managementTokens.apiKey
     defaultConfig.auth_token = _authToken
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName
     }
@@ -48,18 +50,19 @@ exports.parameterWithMToken = function (managementTokens, data, moduleName, host
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }
 
 // using ManagemetToken
-exports.withoutParameterMToken = async (managementTokens, moduleName, host, _authToken, backupdir) => {
+exports.withoutParameterMToken = async (managementTokens, moduleName, host, _authToken, backupdir, branchName) => {
   return new Promise(async function (resolve, reject) {
     const exporteddata = await cli.prompt(message.promptMessageList.promptPathStoredData)
     defaultConfig.management_token = managementTokens.token
     defaultConfig.target_stack = managementTokens.apiKey
     defaultConfig.auth_token = _authToken
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName
     }
@@ -72,15 +75,16 @@ exports.withoutParameterMToken = async (managementTokens, moduleName, host, _aut
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }
 
-exports.configWithAuthToken = function (config, _authToken, moduleName, host, backupdir) {
+exports.configWithAuthToken = function (config, _authToken, moduleName, host, backupdir, branchName) {
   return new Promise(async function (resolve, reject) {
     let externalConfig = require(config)
     defaultConfig.auth_token = _authToken
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined) {
       defaultConfig.moduleName = moduleName
     }
@@ -99,15 +103,16 @@ exports.configWithAuthToken = function (config, _authToken, moduleName, host, ba
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }
 
-exports.parametersWithAuthToken = function (_authToken, targetStack, data, moduleName, host, backupdir) {
+exports.parametersWithAuthToken = function (_authToken, targetStack, data, moduleName, host, backupdir, branchName) {
   return new Promise(async function (resolve, reject) {
     defaultConfig.auth_token = _authToken
     defaultConfig.target_stack = targetStack
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined && backupdir === undefined) {
       defaultConfig.moduleName = moduleName
     } else if (moduleName && moduleName !== undefined && backupdir !== undefined) {
@@ -121,18 +126,19 @@ exports.parametersWithAuthToken = function (_authToken, targetStack, data, modul
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }
 
-exports.withoutParametersWithAuthToken = async (_authToken, moduleName, host, backupdir) => {
+exports.withoutParametersWithAuthToken = async (_authToken, moduleName, host, backupdir, branchName) => {
   return new Promise(async function (resolve, reject) {
     const stackUid = await cli.prompt(message.promptMessageList.promptTargetStack)
     const exporteddata = await cli.prompt(message.promptMessageList.promptPathStoredData)
     defaultConfig.auth_token = _authToken
     defaultConfig.target_stack = stackUid
     defaultConfig.data = exporteddata
+    defaultConfig.branchName = branchName
     if (moduleName && moduleName !== undefined && backupdir === undefined) {
       defaultConfig.moduleName = moduleName
     } else if (moduleName && moduleName !== undefined && backupdir !== undefined) {
@@ -146,7 +152,7 @@ exports.withoutParametersWithAuthToken = async (_authToken, moduleName, host, ba
       .then(() => {
         return resolve()
       }).catch((error) => {
-        return reject()
+        return reject(error)
       })
   })
 }

package/src/lib/util/index.js

@@ -24,40 +24,40 @@ exports.initialization = function(configData) {
   }
 }
 
-exports.validateConfig = function (config) {
-  if (config.email && config.password && !config.target_stack) {
-    addlogs(config, chalk.red('Kindly provide api_token'), 'error')
+exports.validateConfig = function (importConfig) {
+  if (importConfig.email && importConfig.password && !importConfig.target_stack) {
+    addlogs(importConfig, chalk.red('Kindly provide api_token'), 'error')
     return 'error' 
-  } if(!config.email && !config.password && !config.management_token && config.target_stack && !config.auth_token) {
-    addlogs(config, chalk.red('Kindly provide management_token or email and password'), 'error')
+  } else if(!importConfig.email && !importConfig.password && !importConfig.management_token && importConfig.target_stack && !importConfig.auth_token) {
+    addlogs(importConfig, chalk.red('Kindly provide management_token or email and password'), 'error')
     return 'error'
-  } else if(!config.email && !config.password && config.preserveStackVersion) {
-    addlogs(config, chalk.red('Kindly provide Email and password for old version stack'), 'error')
+  } else if(!importConfig.email && !importConfig.password && importConfig.preserveStackVersion) {
+    addlogs(importConfig, chalk.red('Kindly provide Email and password for old version stack'), 'error')
     return 'error'
-  } else if(config.email && !config.password || !config.email && config.password) {
-    addlogs(config, chalk.red('Kindly provide Email and password'), 'error')
+  } else if(importConfig.email && !importConfig.password || !importConfig.email && importConfig.password) {
+    addlogs(importConfig, chalk.red('Kindly provide Email and password'), 'error')
     return 'error'
   }
-  //  if(!config.languagesCode.includes(config.master_locale.code)) {
-  //   addlogs(config, chalk.red('Kindly provide valid master_locale code'), 'error')
+  //  if(!importConfig.languagesCode.includes(importConfig.master_locale.code)) {
+  //   addlogs(importConfig, chalk.red('Kindly provide valid master_locale code'), 'error')
   //   return 'error'
   // }
 }
 
-exports.buildAppConfig = function (config) {
-  config = _.merge(defaultConfig, config)
-  return config
+exports.buildAppConfig = function (importConfig) {
+  importConfig = _.merge(defaultConfig, importConfig)
+  return importConfig
 };
 
-exports.sanitizeStack = function (config) {
-  if (typeof config.preserveStackVersion !== 'boolean' || !config.preserveStackVersion) {
+exports.sanitizeStack = function (importConfig) {
+  if (typeof importConfig.preserveStackVersion !== 'boolean' || !importConfig.preserveStackVersion) {
     return Promise.resolve()
   }
-  addlogs(config, 'Running script to maintain stack version.', 'success')
+  addlogs(importConfig, 'Running script to maintain stack version.', 'success')
   var getStackOptions = {
-    url: config.host + config.apis.stacks,
+    url: importConfig.host + importConfig.apis.stacks,
     method: 'GET',
-    headers: config.headers,
+    headers: importConfig.headers,
     json: true
   }
 
@@ -67,7 +67,7 @@ exports.sanitizeStack = function (config) {
         if (stackDetails.body && stackDetails.body.stack && stackDetails.body.stack.settings) {
           const newStackVersion = stackDetails.body.stack.settings.version
           const newStackDate = new Date(newStackVersion).toString()
-          const stackFilePath = path.join(config.data, config.modules.stack.dirName, config.modules.stack.fileName)
+          const stackFilePath = path.join(importConfig.data, importConfig.modules.stack.dirName, importConfig.modules.stack.fileName)
 
           const oldStackDetails = fs.readFile(stackFilePath)
           if (!oldStackDetails || !oldStackDetails.settings || !oldStackDetails.settings.hasOwnProperty('version')) {
@@ -78,15 +78,15 @@ exports.sanitizeStack = function (config) {
           if (oldStackDate > newStackDate) {
             throw new Error('Migration Error. You cannot migrate data from new stack onto old. Kindly contact support@contentstack.com for more details.')
           } else if (oldStackDate === newStackDate) {
-            addlogs(config, 'The version of both the stacks are same.', 'success')
+            addlogs(importConfig, 'The version of both the stacks are same.', 'success')
             return Promise.resolve()
           }
-          addlogs(config, 'Updating stack version.', 'success')
+          addlogs(importConfig, 'Updating stack version.', 'success')
           // Update the new stack
           var updateStackOptions = {
-            url: config.host + config.apis.stacks + 'settings/set-version',
+            url: importConfig.host + importConfig.apis.stacks + 'settings/set-version',
             method: 'PUT',
-            headers: config.headers,
+            headers: importConfig.headers,
             body: {
               stack_settings: {
                 version: '2017-10-14' // This can be used as a variable
@@ -96,7 +96,7 @@ exports.sanitizeStack = function (config) {
 
           return request(updateStackOptions)
             .then((response) => {
-              addlogs(config, `Stack version preserved successfully!\n${JSON.stringify(response.body)}`, 'success')
+              addlogs(importConfig, `Stack version preserved successfully!\n${JSON.stringify(response.body)}`, 'success')
               return;
             })
         } 
@@ -125,9 +125,9 @@ exports.masterLocalDetails = function(credentialConfig) {
   })
 };
 
-exports.field_rules_update = function(config, ctPath) {
+exports.field_rules_update = function(importConfig, ctPath) {
   return new Promise(function (resolve, reject) {
-    let client = stack.Client(config)
+    let client = stack.Client(importConfig)
     
     fs.readFile(path.join(ctPath + '/field_rules_uid.json'), async (err, data) => {
       if (err) {
@@ -145,7 +145,7 @@ exports.field_rules_update = function(config, ctPath) {
               let fieldRuleConditionLength = schema.field_rules[k].conditions.length
               for (let i = 0; i < fieldRuleConditionLength; i++) {
                 if (schema.field_rules[k].conditions[i].operand_field === 'reference') {
-                  let entryMapperPath = path.resolve(config.data, 'mapper', 'entries')
+                  let entryMapperPath = path.resolve(importConfig.data, 'mapper', 'entries')
                   let entryUidMapperPath = path.join(entryMapperPath, 'uid-mapping.json')
                   let fieldRulesValue = schema.field_rules[k].conditions[i].value
                   let fieldRulesArray = fieldRulesValue.split('.')
@@ -163,7 +163,7 @@ exports.field_rules_update = function(config, ctPath) {
                 }
               }
             }
-            let ctObj = client.stack({ api_key: config.target_stack, management_token: config.management_token }).contentType(schema.uid)
+            let ctObj = client.stack({ api_key: importConfig.target_stack, management_token: importConfig.management_token }).contentType(schema.uid)
             Object.assign(ctObj, _.cloneDeep(schema))
             ctObj.update()
               .then(() => {

package/src/lib/util/login.js

@@ -44,10 +44,10 @@ module.exports = function (config) {
         let errorstack_key = error.errors.api_key       
         if(error.errors.api_key) {
           addlogs(config, chalk.red("Stack Api key " + errorstack_key[0], "Please enter valid Key"), 'error')
-          return reject()
+          return reject(error)
         }
         addlogs(config, error.errorMessage, 'error')
-        return reject()
+        return reject(error)
       })
     }
   });

package/src/lib/util/removeReferenceFields.js

@@ -4,7 +4,7 @@ var _ = require('lodash');
 
 /* eslint-disable no-empty */
 var removeReferenceFields = module.exports = function (schema, flag) {
-  for (var i in schema) {
+  for (let i = 0; i < schema.length; i++) {
     if (schema[i].data_type === 'group') {
       removeReferenceFields(schema[i].schema, flag);
     } else if (schema[i].data_type === 'blocks') {
@@ -13,10 +13,8 @@ var removeReferenceFields = module.exports = function (schema, flag) {
       }
     } else if(schema[i].data_type === 'reference') {
       flag.supressed = true;
-      _.remove(schema, function(c) {
-        return c.data_type === 'reference';
-      });
-      
+      schema.splice(i, 1);
+      --i;
       if(schema.length < 1) {
         schema.push({
           'data_type': 'text',