@contentstack/cli-cm-clone 1.1.3 → 1.1.5

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-clone/1.1.3 darwin-arm64 node-v18.11.0
+@contentstack/cli-cm-clone/1.1.5 linux-x64 node-v16.18.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -49,14 +49,14 @@ OPTIONS
   -n, --stack-name=stack-name                                              Name for the new stack to store the cloned
                                                                            content.
 
-  -y, --yes                                                                [optional] Override marketplace prompts
+  -y, --yes                                                                [Optional] Override marketplace prompts
 
   --destination-management-token-alias=destination-management-token-alias  Source API key of the target stack token
                                                                            alias.
 
   --destination-stack-api-key=destination-stack-api-key                    Destination stack API Key
 
-  --import-webhook-status=disable|current                                  [default: disable] Webhook state
+  --import-webhook-status=disable|current                                  [default: disable] [Optional] Webhook state
 
   --source-branch=source-branch                                            Branch of the source stack.
 

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.1.3","commands":{"cm:stacks:clone":{"id":"cm:stacks:clone","description":"Clone data (structure/content or both) of a stack into another stack\nUse this plugin to automate the process of cloning a stack in few steps.\n","usage":"cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]","pluginName":"@contentstack/cli-cm-clone","pluginType":"core","aliases":["cm:stack-clone"],"examples":["csdx cm:stacks:clone","csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name> --yes","csdx cm:stacks:clone --source-stack-api-key <apiKey> --destination-stack-api-key <apiKey>","csdx cm:stacks:clone --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias> --type <value a or b>"],"flags":{"source-branch":{"name":"source-branch","type":"option","description":"Branch of the source stack.","required":false},"target-branch":{"name":"target-branch","type":"option","description":"Branch of the target stack.","required":false},"source-management-token-alias":{"name":"source-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"destination-management-token-alias":{"name":"destination-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"stack-name":{"name":"stack-name","type":"option","char":"n","description":"Name for the new stack to store the cloned content.","required":false},"type":{"name":"type","type":"option","description":"Type of data to clone\na) Structure (all modules except entries & assets)\nb) Structure with content (all modules including entries & assets)\n    ","required":false,"options":["a","b"]},"source-stack-api-key":{"name":"source-stack-api-key","type":"option","description":"Source stack API Key"},"destination-stack-api-key":{"name":"destination-stack-api-key","type":"option","description":"Destination stack API Key"},"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":[]}}}
+{"version":"1.1.5","commands":{"cm:stacks:clone":{"id":"cm:stacks:clone","description":"Clone data (structure/content or both) of a stack into another stack\nUse this plugin to automate the process of cloning a stack in few steps.\n","usage":"cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]","pluginName":"@contentstack/cli-cm-clone","pluginType":"core","aliases":["cm:stack-clone"],"examples":["csdx cm:stacks:clone","csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name> --yes","csdx cm:stacks:clone --source-stack-api-key <apiKey> --destination-stack-api-key <apiKey>","csdx cm:stacks:clone --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias> --type <value a or b>"],"flags":{"source-branch":{"name":"source-branch","type":"option","description":"Branch of the source stack.","required":false},"target-branch":{"name":"target-branch","type":"option","description":"Branch of the target stack.","required":false},"source-management-token-alias":{"name":"source-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"destination-management-token-alias":{"name":"destination-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"stack-name":{"name":"stack-name","type":"option","char":"n","description":"Name for the new stack to store the cloned content.","required":false},"type":{"name":"type","type":"option","description":"Type of data to clone\na) Structure (all modules except entries & assets)\nb) Structure with content (all modules including entries & assets)\n    ","required":false,"options":["a","b"]},"source-stack-api-key":{"name":"source-stack-api-key","type":"option","description":"Source stack API Key"},"destination-stack-api-key":{"name":"destination-stack-api-key","type":"option","description":"Destination stack API Key"},"import-webhook-status":{"name":"import-webhook-status","type":"option","description":"[Optional] 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,22 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "^1.2.1",
-    "@contentstack/cli-cm-import": "^1.2.1",
-    "@contentstack/cli-command": "^1.0.2",
-    "@contentstack/cli-utilities": "^1.0.3",
-    "@contentstack/management": "^1.3.0",
+    "@contentstack/cli-cm-export": "^1.2.2",
+    "@contentstack/cli-cm-import": "^1.2.3",
+    "@contentstack/cli-command": "^1.0.3",
+    "@contentstack/cli-utilities": "^1.0.4",
+    "@contentstack/management": "^1.6.0",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
     "chalk": "^4.1.0",
     "async": "^3.2.4",
     "child_process": "^1.0.2",
     "fancy-test": "^1.4.10",
-    "inquirer": "^8.2.4",
+    "inquirer": "8.2.4",
     "ora": "^5.1.0",
     "rimraf": "^3.0.2",
     "winston": "^3.7.2"
@@ -31,7 +31,7 @@
     "globby": "^10.0.2",
     "jest": "^26.6.3",
     "mocha": "^10.0.0",
-    "nyc": "^14.1.1",
+    "nyc": "^15.1.0",
     "sinon": "^9.2.4"
   },
   "engines": {

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

@@ -29,7 +29,7 @@ class StackCloneCommand extends Command {
       const handleClone = async () => {
         const listOfTokens = configHandler.get('tokens');
 
-        config.forceMarketplaceAppsImport = yes;
+        config.forceStopMarketplaceAppsPrompt = yes;
 
         if (cloneType) {
           config.cloneType = cloneType;
@@ -232,7 +232,7 @@ b) Structure with content (all modules including entries & assets)
     description: 'Destination stack API Key',
   }),
   'import-webhook-status': flags.string({
-    description: 'Webhook state',
+    description: '[Optional] Webhook state',
     options: ['disable', 'current'],
     required: false,
     default: 'disable',
@@ -240,7 +240,7 @@ b) Structure with content (all modules including entries & assets)
   yes: flags.boolean({
     char: 'y',
     required: false,
-    description: '[optional] Override marketplace prompts',
+    description: '[Optional] Override marketplace prompts',
   }),
 };
 

package/src/lib/util/clone-handler.js

@@ -12,8 +12,15 @@ const defaultConfig = require('@contentstack/cli-cm-export/src/config/default');
 const { CustomAbortController } = require('./abort-controller');
 
 const {
-  HandleOrgCommand, HandleStackCommand, HandleDestinationStackCommand, HandleExportCommand,
-  SetBranchCommand, CreateNewStackCommand, CloneTypeSelectionCommand, Clone, HandleBranchCommand
+  HandleOrgCommand,
+  HandleStackCommand,
+  HandleDestinationStackCommand,
+  HandleExportCommand,
+  SetBranchCommand,
+  CreateNewStackCommand,
+  CloneTypeSelectionCommand,
+  Clone,
+  HandleBranchCommand,
 } = require('../helpers/command-helpers');
 
 let client = {};
@@ -85,7 +92,7 @@ class CloneHandler {
     let keyPressHandler;
     return new Promise(async (resolve, reject) => {
       try {
-        const { org = {}, msg = '', isSource = true, stackAbortController } = options || {}
+        const { org = {}, msg = '', isSource = true, stackAbortController } = options || {};
 
         keyPressHandler = async function (_ch, key) {
           if (key.name === 'left' && key.shift) {
@@ -97,7 +104,7 @@ class CloneHandler {
         };
         process.stdin.addListener('keypress', keyPressHandler);
 
-        const stackList = await this.getStack(org, msg, isSource).catch(reject)
+        const stackList = await this.getStack(org, msg, isSource).catch(reject);
 
         if (stackList) {
           const ui = new inquirer.ui.BottomBar();
@@ -117,7 +124,7 @@ class CloneHandler {
             config.destinationStackName = selectedStack.stack;
           }
 
-          resolve(selectedStack)
+          resolve(selectedStack);
         }
       } catch (error) {
         return reject(error);
@@ -130,48 +137,42 @@ class CloneHandler {
   }
 
   handleBranchSelection = async (options) => {
-    const { api_key, isSource = true, returnBranch = false } = options
-    const baseUrl = defaultConfig.host.startsWith('http')
-      ? defaultConfig.host
-      : `https://${defaultConfig.host}/v3`;
+    const { api_key, isSource = true, returnBranch = false } = options;
+    const baseUrl = defaultConfig.host.startsWith('http') ? defaultConfig.host : `https://${defaultConfig.host}/v3`;
 
     return new Promise(async (resolve, reject) => {
       try {
-        const headers = { api_key }
+        const headers = { api_key };
 
         if (config.auth_token) {
-          headers['authtoken'] = config.auth_token
+          headers['authtoken'] = config.auth_token;
         } else if (config.management_token) {
-          headers['authorization'] = config.management_token
+          headers['authorization'] = config.management_token;
         }
 
         // NOTE validate if source branch is exist
         if (isSource && config.sourceStackBranch) {
-          await this.validateIfBranchExist(headers, true)
-          return resolve()
+          await this.validateIfBranchExist(headers, true);
+          return resolve();
         }
 
         // NOTE Validate target branch is exist
         if (!isSource && config.targetStackBranch) {
-          await this.validateIfBranchExist(headers, false)
-          return resolve()
+          await this.validateIfBranchExist(headers, false);
+          return resolve();
         }
 
         const spinner = ora('Fetching Branches').start();
         const result = await new HttpClient()
           .headers(headers)
           .get(`${baseUrl}/stacks/branches`)
-          .then(({ data: { branches } }) => branches)
+          .then(({ data: { branches } }) => branches);
 
-        const condition = (
-          result &&
-          Array.isArray(result) &&
-          result.length > 0
-        )
+        const condition = result && Array.isArray(result) && result.length > 0;
 
         // NOTE if want to get only list of branches (Pass param -> returnBranch = true )
         if (returnBranch) {
-          resolve(condition ? result : [])
+          resolve(condition ? result : []);
         } else {
           // NOTE list options to use to select branch
           if (condition) {
@@ -180,30 +181,30 @@ class CloneHandler {
               type: 'list',
               name: 'branch',
               message: 'Choose a branch',
-              choices: result.map(row => row.uid),
+              choices: result.map((row) => row.uid),
             });
 
             if (isSource) {
-              config.sourceStackBranch = branch
+              config.sourceStackBranch = branch;
             } else {
-              config.targetStackBranch = branch
+              config.targetStackBranch = branch;
             }
           } else {
             spinner.succeed('No branches found.!');
           }
 
-          resolve()
+          resolve();
         }
       } catch (e) {
         spinner.fail();
-        console.log(e && e.message)
-        resolve()
+        console.log(e && e.message);
+        resolve();
       }
-    })
-  }
+    });
+  };
 
   async validateIfBranchExist(headers, isSource) {
-    const branch = isSource ? config.sourceStackBranch : config.targetStackBranch
+    const branch = isSource ? config.sourceStackBranch : config.targetStackBranch;
     const spinner = ora(`Validation if ${isSource ? 'source' : 'target'} branch exist.!`).start();
     const isBranchExist = await HttpClient.create()
       .headers(headers)
@@ -211,15 +212,15 @@ class CloneHandler {
       .then(({ data }) => data);
 
     const completeSpinner = (msg, method = 'succeed') => {
-      spinner[method](msg)
-      spinner.stop()
-    }
+      spinner[method](msg);
+      spinner.stop();
+    };
 
     if (isBranchExist && typeof isBranchExist === 'object' && typeof isBranchExist.branch === 'object') {
-      completeSpinner(`${isSource ? 'Source' : 'Target'} branch verified.!`)
+      completeSpinner(`${isSource ? 'Source' : 'Target'} branch verified.!`);
     } else {
-      completeSpinner(`${isSource ? 'Source' : 'Target'} branch not found.!`, 'fail')
-      process.exit()
+      completeSpinner(`${isSource ? 'Source' : 'Target'} branch not found.!`, 'fail');
+      process.exit();
     }
   }
 
@@ -236,12 +237,12 @@ class CloneHandler {
 
           const org = await cloneCommand.execute(new HandleOrgCommand({ msg: orgMsg, isSource: true }, this));
           if (org) {
-            const sourceStack = await cloneCommand.execute(new HandleStackCommand({ org, isSource: true, msg: stackMsg, stackAbortController }, this));
+            const sourceStack = await cloneCommand.execute(
+              new HandleStackCommand({ org, isSource: true, msg: stackMsg, stackAbortController }, this),
+            );
 
             if (config.source_stack) {
-              await cloneCommand.execute(
-                new HandleBranchCommand({ api_key: config.source_stack }, this)
-              );
+              await cloneCommand.execute(new HandleBranchCommand({ api_key: config.source_stack }, this));
             }
 
             if (stackAbortController.signal.aborted) {
@@ -256,7 +257,9 @@ class CloneHandler {
         await cloneCommand.execute(new SetBranchCommand(null, this));
 
         if (exportRes) {
-          this.executeDestination().catch(() => { reject(); });
+          this.executeDestination().catch(() => {
+            reject();
+          });
         }
         return resolve();
       } catch (error) {
@@ -288,13 +291,17 @@ class CloneHandler {
 
             if (org) {
               const stackMsg = 'Choose the destination stack:';
-              await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, stackAbortController, isSource: false }, this));
+              await cloneCommand.execute(
+                new HandleDestinationStackCommand({ org, msg: stackMsg, stackAbortController, isSource: false }, this),
+              );
             }
           }
 
           // NOTE GET list of branches if branches enabled
           if (config.target_stack) {
-            await cloneCommand.execute(new HandleBranchCommand({ isSource: false, api_key: config.target_stack }, this));
+            await cloneCommand.execute(
+              new HandleBranchCommand({ isSource: false, api_key: config.target_stack }, this),
+            );
           }
         } else {
           const orgMsg = 'Choose an organization where you want to create a stack: ';
@@ -316,7 +323,7 @@ class CloneHandler {
           });
         }
       }
-    })
+    });
   }
 
   async setBranch() {
@@ -327,7 +334,7 @@ class CloneHandler {
         if (branches && branches.items && branches.items.length) {
           config.sourceStackBranch = 'main';
         }
-      } catch (_error) { }
+      } catch (_error) {}
     }
   }
 
@@ -353,7 +360,7 @@ class CloneHandler {
         return reject(e);
       }
     });
-  };
+  }
 
   async getStack(answer, stkMessage) {
     return new Promise(async (resolve, reject) => {
@@ -386,7 +393,7 @@ class CloneHandler {
         return reject(e);
       }
     });
-  };
+  }
 
   async createNewStack(options) {
     let keyPressHandler;
@@ -494,6 +501,8 @@ class CloneHandler {
         cmd.push('--branch', config.sourceStackBranch);
       }
 
+      if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
+
       let exportData = exportCmd.run(cmd);
       exportData.then(() => resolve(true)).catch(reject);
     });
@@ -516,7 +525,7 @@ class CloneHandler {
         cmd.push('--import-webhook-status', config.importWebhookStatus);
       }
 
-      if (config.forceMarketplaceAppsImport) cmd.push('-y')
+      if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
       await importCmd.run(cmd);
       return resolve();