Merge pull request #2095 from contentstack/fix/clone-bug

DX - 3484 - Fixed Clone command flow and Import flow for checking the branch enabled stack

Author: cs-raj

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 5e581216413057e2c391cd81ab255d80814c552714e778695c5cf01e30977c0a
+  checksum: e18f2c44cd17fe67afa33290fc6e3ebd8e77be4cd85541b967792a03ea6b4279
 - filename: pnpm-lock.yaml
-  checksum: 0ff0cc1297c355f24d6942c01a7699b5c1ac8759d0b8c3073825241c8366a999
+  checksum: 8ac9a74de5b8971d85a0471444233205d66fdc90ab8f68ab74053582bbb274f7
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -75,4 +75,10 @@ fileignoreconfig:
   checksum: c435ceaa709a7504da303a6ea674e07a89030d8ad4152e7917cd17e7f3e58052
 - filename: packages/contentstack-bootstrap/src/config.ts
   checksum: 65d300dc729fb84f5446c0b14921555db01fe5c90be3d297e3d0418a37b3696a
-version: "1.0"
+- filename: packages/contentstack-clone/src/commands/cm/stacks/clone.js
+  checksum: 433a84a882ea3f12b27127d47d289dfc64dda6b6fc956369f5851daaa57ae493
+- filename: packages/contentstack-clone/src/lib/util/clone-handler.js
+  checksum: 89215a2549276407db2dbd25506acabdeb6f9bc53984a7c8b4456cd4df77cf43
+- filename: packages/contentstack-bulk-publish/src/util/generate-bulk-publish-url.js
+  checksum: 5f7c1e2fac3e7fab21e861d609c54ca7191ee09fd076dd0adc66604043bf7a43
+version: "1.0"

packages/contentstack-clone/src/commands/cm/stacks/clone.js

@@ -82,6 +82,8 @@ class StackCloneCommand extends Command {
           config.importWebhookStatus = importWebhookStatus;
         }
 
+        const managementAPIClient = await managementSDKClient(config);
+
         await this.removeContentDirIfNotEmptyBeforeClone(pathdir); // NOTE remove if folder not empty before clone
         this.registerCleanupOnInterrupt(pathdir);
 
@@ -90,7 +92,6 @@ class StackCloneCommand extends Command {
         config.cdn = this.cdaHost;
         config.pathDir = pathdir;
         const cloneHandler = new CloneHandler(config);
-        const managementAPIClient = await managementSDKClient(config);
         cloneHandler.setClient(managementAPIClient);
         cloneHandler.execute().catch((error) => {
           console.log(error);
@@ -123,6 +124,8 @@ class StackCloneCommand extends Command {
     }
   }
 
+
+
   async removeContentDirIfNotEmptyBeforeClone(dir) {
     try {
       const dirNotEmpty = readdirSync(dir).length;

packages/contentstack-clone/src/lib/util/clone-handler.js

@@ -8,7 +8,7 @@ let { default: importCmd } = require('@contentstack/cli-cm-import');
 const { CustomAbortController } = require('./abort-controller');
 const prompt = require('prompt');
 const colors = require('@colors/colors/safe');
-const cloneDeep = require("lodash/cloneDeep")
+const cloneDeep = require('lodash/cloneDeep');
 
 const {
   HandleOrgCommand,
@@ -21,7 +21,7 @@ const {
   Clone,
   HandleBranchCommand,
 } = require('../helpers/command-helpers');
-const { configHandler } = require('@contentstack/cli-utilities')
+const { configHandler, getBranchFromAlias } = require('@contentstack/cli-utilities');
 
 let client = {};
 let config;
@@ -137,20 +137,26 @@ class CloneHandler {
       let spinner;
       try {
         const stackAPIClient = client.stack({
-          api_key: config.target_stack ? config.target_stack : config.source_stack,
+          api_key: isSource ? config.source_stack : config.target_stack,
           management_token: config.management_token,
         });
 
         // NOTE validate if source branch is exist
         if (isSource && config.sourceStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, true);
           return resolve();
+        } else if(isSource && config.sourceStackBranchAlias) {
+          await this.resolveBranchAliases(true);
+          return resolve();
         }
 
         // NOTE Validate target branch is exist
         if (!isSource && config.targetStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, false);
           return resolve();
+        } else if (!isSource && config.targetStackBranchAlias) {
+          await this.resolveBranchAliases();
+          return resolve();
         }
         spinner = ora('Fetching Branches').start();
         const result = await stackAPIClient
@@ -272,6 +278,8 @@ class CloneHandler {
             return reject('Org not found.');
           }
         } else {
+          this.setExectingCommand(2);
+          await this.handleBranchSelection({ api_key: config.sourceStack });
           const exportRes = await cloneCommand.execute(new HandleExportCommand(null, this));
           await cloneCommand.execute(new SetBranchCommand(null, this));
 
@@ -471,7 +479,7 @@ class CloneHandler {
         } else {
           organizations = await client.organization().fetchAll({ limit: 100 });
         }
-        
+
         spinner.succeed('Fetched Organization');
         for (const element of organizations.items || [organizations]) {
           orgUidList[element.name] = element.uid;
@@ -579,6 +587,20 @@ class CloneHandler {
     });
   }
 
+  async resolveBranchAliases(isSource = false) {
+    try {
+      if (isSource) {
+        const sourceStack = client.stack({ api_key: config.source_stack });
+        config.sourceStackBranch = await getBranchFromAlias(sourceStack, config.sourceStackBranchAlias);
+      } else {
+        const targetStack = client.stack({ api_key: config.target_stack });
+        config.targetStackBranch = await getBranchFromAlias(targetStack, config.targetStackBranchAlias);
+      }
+    } catch (error) {
+      throw error;
+    }
+  }
+
   async cloneTypeSelection() {
     console.clear();
     return new Promise(async (resolve, reject) => {
@@ -618,7 +640,7 @@ class CloneHandler {
   async cmdExport() {
     return new Promise((resolve, reject) => {
       // Creating export specific config by merging external configurations
-      let exportConfig = Object.assign({}, cloneDeep(config), {...config?.export});
+      let exportConfig = Object.assign({}, cloneDeep(config), { ...config?.export });
       delete exportConfig.import;
       delete exportConfig.export;
 
@@ -634,10 +656,6 @@ class CloneHandler {
         cmd.push('--branch', exportConfig.sourceStackBranch);
       }
 
-      if (!exportConfig.sourceStackBranch && exportConfig.sourceStackBranchAlias) {
-        cmd.push('--branch-alias', exportConfig.sourceStackBranchAlias);
-      }
-
       if (exportConfig.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
       cmd.push('-c');
@@ -652,7 +670,7 @@ class CloneHandler {
   async cmdImport() {
     return new Promise(async (resolve, _reject) => {
       // Creating export specific config by merging external configurations
-      let importConfig = Object.assign({}, cloneDeep(config), {...config?.import});
+      let importConfig = Object.assign({}, cloneDeep(config), { ...config?.import });
       delete importConfig.import;
       delete importConfig.export;
 
@@ -667,10 +685,6 @@ class CloneHandler {
       if (importConfig.targetStackBranch) {
         cmd.push('--branch', importConfig.targetStackBranch);
       }
-            
-      if (!importConfig.targetStackBranch && importConfig.targetStackBranchAlias) {
-        cmd.push('--branch-alias', importConfig.targetStackBranchAlias);
-      }
       if (importConfig.importWebhookStatus) {
         cmd.push('--import-webhook-status', importConfig.importWebhookStatus);
       }
@@ -681,7 +695,7 @@ class CloneHandler {
 
       fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(importConfig));
       await importCmd.run(cmd);
-      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify({}))
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify({}));
       return resolve();
     });
   }

packages/contentstack-import/src/utils/setup-branch.ts

@@ -13,6 +13,7 @@ export const setupBranchConfig = async (
 
   if (config.branchAlias) {
     config.branchName = await getBranchFromAlias(stackAPIClient, config.branchAlias);
+    return;
   }
   try {
     const branches = await stackAPIClient