@contentstack/cli-cm-bulk-publish 0.1.1-beta.1 → 0.1.1-beta.4

package/src/commands/cm/bulk-publish/clear.js

@@ -5,11 +5,11 @@ const {getLogsDirPath} = require('../../../util/logger.js')
 
 class ClearCommand extends Command {
   async run() {
-    const {flags} = this.parse(ClearCommand)
+    const clearFlags = this.parse(ClearCommand).flags
   	let dirPath = getLogsDirPath()
-    if (flags.list) {
+    if (clearFlags.list) {
     	this.listFiles(dirPath)
-    } else if (flags.yes) {
+    } else if (clearFlags.yes) {
     	this.rmDir(dirPath, false)
     } else {
 	    const confirmation = await cli.prompt('Proceed to delete all log files (y/n)?')
@@ -21,8 +21,9 @@ class ClearCommand extends Command {
 
 	rmDir(dirPath, removeSelf) {
 		if (fs.existsSync(dirPath)) {
-			if (removeSelf === undefined)
+			if (removeSelf === undefined) {
 		    removeSelf = true;
+			}
 		  try { var files = fs.readdirSync(dirPath); }
 		  catch(e) { return; }
 		  if (files.length > 0)
@@ -33,13 +34,14 @@ class ClearCommand extends Command {
 		      else
 		        rmDir(filePath);
 		    }
-		  if (removeSelf)
+		  if (removeSelf) {
 		    fs.rmdirSync(dirPath);
+			}
 		  this.log('Log files have been cleared')
 		} else {
 			this.error(`The log directory doesn't exist.`)
 		}
-	};
+	}
 
 	listFiles(dirPath) {
 		if (fs.existsSync(dirPath)) {

package/src/commands/cm/bulk-publish/configure.js

@@ -2,21 +2,19 @@ const {Command, flags} = require('@oclif/command')
 const {cli} = require('cli-ux')
 const fs = require('fs')
 const path = require('path')
-const defaults = require('../../../config/defaults.json')
-const store = require('../../../util/store.js')
 let config = require('../../../config/index.js')
 
 class ConfigureCommand extends Command {
 
   async run() {
-    const {flags} = this.parse(ConfigureCommand)
+    const configureFlags = this.parse(ConfigureCommand).flags
 
-    if (!flags.alias) {
-      flags.alias = await cli.prompt('Please enter the management token alias to be used')
+    if (!configureFlags.alias) {
+      configureFlags.alias = await cli.prompt('Please enter the management token alias to be used')
     }
 
-    await this.config.runHook('validateManagementTokenAlias', {alias: flags.alias})
-    this.setConfig(flags)
+    await this.config.runHook('validateManagementTokenAlias', {alias: configureFlags.alias})
+    this.setConfig(configureFlags)
     this.log('The configuration has been saved successfully.')
   }
 

package/src/commands/cm/bulk-publish/cross-publish.js

@@ -10,10 +10,10 @@ let config
 
 class CrossPublishCommand extends Command {
   async run() {
-    const {flags} = this.parse(CrossPublishCommand)
+    const crossPublishFlags = this.parse(CrossPublishCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
+      updatedFlags = (crossPublishFlags.config) ? store.updateMissing(configKey, crossPublishFlags) : crossPublishFlags
     } catch(error) {
       this.error(error.message, {exit: 2})
     }
@@ -29,10 +29,11 @@ class CrossPublishCommand extends Command {
         }
         updatedFlags.bulkPublish = (updatedFlags.bulkPublish === 'false') ? false : true
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
-        config = { 
+        config = {
           alias: updatedFlags.alias,
           host: this.config.userConfig.getRegion().cma,
           cda: this.config.userConfig.getRegion().cda,
+          branch: crossPublishFlags.branch,
         }
         stack = getStack(config)
       }
@@ -42,19 +43,6 @@ class CrossPublishCommand extends Command {
       }
 
       if (await this.confirmFlags(updatedFlags)) {
-        updatedFlags.filter = {}
-        updatedFlags.filter.locale = updatedFlags.locale
-        delete updatedFlags.locale
-
-        if (updatedFlags.contentType && updatedFlags.contentType.length > 0) {
-          updatedFlags.filter.content_type_uid = updatedFlags.contentType
-          delete updatedFlags.contentType
-        }
-
-        if (updatedFlags.environment && updatedFlags.environment.length > 0) {
-          updatedFlags.filter.environment = updatedFlags.environment
-          delete updatedFlags.environment
-        }
         try {
           if (!updatedFlags.retryFailed) {
             await start(updatedFlags, stack, config)
@@ -71,12 +59,20 @@ class CrossPublishCommand extends Command {
     }
   }
 
-  validate({environment, retryFailed, contentType, destEnv, locale}) {
+  validate({environment, retryFailed, destEnv, onlyAssets, contentType, onlyEntries, locale}) {
     let missing = []
     if (retryFailed) {
       return true
     }
 
+    if (onlyAssets && onlyEntries) {
+      this.error(`The flags onlyAssets and onlyEntries need not be used at the same time. Unpublish command unpublishes entries and assts at the same time by default`)
+    }
+
+    if (onlyAssets && contentType) {
+      this.error(`Specifying content-type and onlyAssets together will have unexpected results. Please do not use these 2 flags together. Thank you.`)
+    }
+
     if (!environment) {
       missing.push('Environment')
     }
@@ -85,10 +81,6 @@ class CrossPublishCommand extends Command {
       missing.push('Destination Environment')
     }
 
-    if (!contentType) {
-      missing.push('ContentType')
-    }
-
     if (!locale) {
       missing.push('Locale')
     }
@@ -100,9 +92,9 @@ class CrossPublishCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {
-    prettyPrint(flags)
-    if(flags.yes) {
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if (data.yes) {
       return true
     }
     const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
@@ -127,7 +119,10 @@ CrossPublishCommand.flags = {
   deliveryToken: flags.string({char: 'x', description: 'Delivery Token for source environment'}),
   destEnv: flags.string({char: 'd', description: 'Destination Environments', multiple: true}),
   config: flags.string({char: 'c', description: 'Path to config file to be used'}),
-  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration' }),
+  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
+  onlyAssets: flags.boolean({description: 'Unpublish only assets', default: false}),
+  onlyEntries: flags.boolean({description: 'Unpublish only entries', default: false}),
 }
 
 CrossPublishCommand.examples = [
@@ -141,7 +136,10 @@ CrossPublishCommand.examples = [
   '',
   'Using --retryFailed or -r flag',
   'csdx cm:bulk-publish:cross-publish --retryFailed [LOG FILE NAME]',
-  'csdx cm:bulk-publish:cross-publish -r [LOG FILE NAME]'
+  'csdx cm:bulk-publish:cross-publish -r [LOG FILE NAME]',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:cross-publish -t [CONTENT TYPE] -e [SOURCE ENV] -d [DESTINATION ENVIRONMENT] -l [LOCALE] -a [MANAGEMENT TOKEN ALIAS] -x [DELIVERY TOKEN] -B [BRANCH NAME]',
 ]
 
 module.exports = CrossPublishCommand

package/src/commands/cm/bulk-publish/entries.js

@@ -5,41 +5,43 @@ const {start} = require('../../../producer/publish-entries')
 const store = require('../../../util/store.js')
 const {cli} = require('cli-ux')
 const configKey = 'publish_entries'
-const { prettyPrint, formatError } = require('../../../util')
-const { getStack } = require('../../../util/client.js')
+const {prettyPrint, formatError} = require('../../../util')
+const {getStack} = require('../../../util/client.js')
 let config
 
 class EntriesCommand extends Command {
   async run() {
-    const {flags} = this.parse(EntriesCommand)
+    const entriesFlags = this.parse(EntriesCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
-    } catch(error) {
+      updatedFlags = (entriesFlags.config) ? store.updateMissing(configKey, entriesFlags) : entriesFlags
+    } catch (error) {
       this.error(error.message, {exit: 2})
     }
     if (this.validate(updatedFlags)) {
       let stack
       if (!updatedFlags.retryFailed) {
-        if(!updatedFlags.alias) {
+        if (!updatedFlags.alias) {
           updatedFlags.alias = await cli.prompt('Provide the alias of the management token to use')
         }
-        updatedFlags.bulkPublish = (updatedFlags.bulkPublish === 'false') ? false : true
+        updatedFlags.bulkPublish = updatedFlags.bulkPublish !== 'false'
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
         config = {
           alias: updatedFlags.alias,
-          host: this.config.userConfig.getRegion().cma
+          host: this.config.userConfig.getRegion().cma,
+          branch: entriesFlags.branch,
         }
         stack = getStack(config)
       }
       if (await this.confirmFlags(updatedFlags)) {
         try {
+          // eslint-disable-next-line no-negated-condition
           if (!updatedFlags.retryFailed) {
             await start(updatedFlags, stack, config)
           } else {
             await start(updatedFlags)
           }
-        } catch(error) {
+        } catch (error) {
           let message = formatError(error)
           this.error(message, {exit: 2})
         }
@@ -49,7 +51,7 @@ class EntriesCommand extends Command {
     }
   }
 
-  validate({contentTypes, locales, environments, retryFailed, publishAllContentTypes }) {
+  validate({contentTypes, locales, environments, retryFailed, publishAllContentTypes}) {
     let missing = []
     if (retryFailed) {
       return true
@@ -78,13 +80,13 @@ class EntriesCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {  
-    prettyPrint(flags)
-    if(flags.yes) { 
-      return true 
-    } 
-    const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]') 
-    return confirmation 
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if (data.yes) {
+      return true
+    }
+    const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
+    return confirmation
   }
 }
 
@@ -102,10 +104,11 @@ EntriesCommand.flags = {
   bulkPublish: flags.string({char: 'b', description: 'This flag is set to true by default. It indicates that contentstack\'s bulkpublish API will be used for publishing the entries', default: 'true'}),
   publishAllContentTypes: flags.boolean({char: 'o', description: 'Publish all content-types (optional, cannot be set when contentTypes flag is set)'}),
   contentTypes: flags.string({char: 't', description: 'The Content-types from which entries need to be published', multiple: true}),
-  locales: flags.string({char: 'l', description: 'Locales to which entries need to be published', multiple: true }),
+  locales: flags.string({char: 'l', description: 'Locales to which entries need to be published', multiple: true}),
   environments: flags.string({char: 'e', description: 'Environments to which entries need to be published', multiple: true}),
   config: flags.string({char: 'c', description: 'Path for the external config file to be used (A new config file can be generated at the current working directory using `csdx cm:bulk-publish:configure -a [ALIAS]`)'}),
   yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
 }
 
 EntriesCommand.examples = [
@@ -119,7 +122,10 @@ EntriesCommand.examples = [
   '',
   'Using --retryFailed or -r flag',
   'csdx cm:bulk-publish:entries --retryFailed [LOG FILE NAME]',
-  'csdx cm:bulk-publish:entries -r [LOG FILE NAME]'
+  'csdx cm:bulk-publish:entries -r [LOG FILE NAME]',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:entries -t [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] -l [LOCALE 1] [LOCALE 2] -a [MANAGEMENT TOKEN ALIAS] -B [BRANCH NAME]',
 ]
 
-module.exports = EntriesCommand
+module.exports = EntriesCommand

package/src/commands/cm/bulk-publish/entry-edits.js

@@ -1,43 +1,45 @@
 const {Command, flags} = require('@oclif/command')
 const {start} = require('../../../producer/publish-edits')
 const store = require('../../../util/store.js')
+// eslint-disable-next-line node/no-extraneous-require
 const {cli} = require('cli-ux')
 const configKey = 'publish_edits_on_env'
-const { prettyPrint, formatError } = require('../../../util')
-const { getStack } = require('../../../util/client.js')
+const {prettyPrint, formatError} = require('../../../util')
+const {getStack} = require('../../../util/client.js')
 let config
 
 class EntryEditsCommand extends Command {
   async run() {
-    const {flags} = this.parse(EntryEditsCommand)
+    const entryEditsFlags = this.parse(EntryEditsCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
-    } catch(error) {
+      updatedFlags = (entryEditsFlags.config) ? store.updateMissing(configKey, entryEditsFlags) : entryEditsFlags
+    } catch (error) {
       this.error(error.message, {exit: 2})
     }
     if (this.validate(updatedFlags)) {
       let stack
-      if (!updatedFlags.retryFailed) { 
-        if(!updatedFlags.alias) {
+      if (!updatedFlags.retryFailed) {
+        if (!updatedFlags.alias) {
           updatedFlags.alias = await cli.prompt('Please enter the management token alias to be used')
         }
-        updatedFlags.bulkPublish = (updatedFlags.bulkPublish === 'false') ? false : true
+        updatedFlags.bulkPublish = updatedFlags.bulkPublish !== 'false'
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
-        config = { 
+        config = {
           alias: updatedFlags.alias,
-          host: this.config.userConfig.getRegion().cma
+          host: this.config.userConfig.getRegion().cma,
+          branch: entryEditsFlags.branch,
         }
         stack = getStack(config)
       }
-      if(await this.confirmFlags(updatedFlags)) {
+      if (await this.confirmFlags(updatedFlags)) {
         try {
           if (!updatedFlags.retryFailed) {
             await start(updatedFlags, stack, config)
           } else {
             await start(updatedFlags)
           }
-        } catch(error) {
+        } catch (error) {
           let message = formatError(error)
           this.error(message, {exit: 2})
         }
@@ -76,9 +78,9 @@ class EntryEditsCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {
-    prettyPrint(flags)
-    if(flags.yes) {
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if (data.yes) {
       return true
     }
     const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
@@ -103,7 +105,8 @@ EntryEditsCommand.flags = {
   locales: flags.string({char: 'l', description: 'Locales to which edited entries need to be published', multiple: true}),
   environments: flags.string({char: 'e', description: 'Destination environments', multiple: true}),
   config: flags.string({char: 'c', description: 'Path to config file to be used'}),
-  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration' }), 
+  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
 }
 
 EntryEditsCommand.examples = [
@@ -117,7 +120,10 @@ EntryEditsCommand.examples = [
   '',
   'Using --retryFailed or -r flag',
   'csdx cm:bulk-publish:entry-edits --retryFailed [LOG FILE NAME]',
-  'csdx cm:bulk-publish:entry-edits -r [LOG FILE NAME]'
+  'csdx cm:bulk-publish:entry-edits -r [LOG FILE NAME]',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:entry-edits -t [CONTENT TYPE 1] [CONTENT TYPE 2] -s [SOURCE_ENV] -e [ENVIRONMENT 1] [ENVIRONMENT 2] -l [LOCALE 1] [LOCALE 2] -a [MANAGEMENT TOKEN ALIAS] -B [BRANCH NAME]',
 ]
 
 module.exports = EntryEditsCommand

package/src/commands/cm/bulk-publish/nonlocalized-field-changes.js

@@ -9,10 +9,10 @@ let config
 
 class NonlocalizedFieldChangesCommand extends Command {
   async run() {
-    const {flags} = this.parse(NonlocalizedFieldChangesCommand)
+    const nonlocalizedFieldChangesFlags = this.parse(NonlocalizedFieldChangesCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
+      updatedFlags = (nonlocalizedFieldChangesFlags.config) ? store.updateMissing(configKey, nonlocalizedFieldChangesFlags) : nonlocalizedFieldChangesFlags
     } catch(error) {
       this.error(error.message, {exit: 2})
     }
@@ -24,7 +24,8 @@ class NonlocalizedFieldChangesCommand extends Command {
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
         config = { 
           alias: updatedFlags.alias,
-          host: this.config.userConfig.getRegion().cma
+          host: this.config.userConfig.getRegion().cma,
+          branch: nonlocalizedFieldChangesFlags.branch,
         }
         stack = getStack(config)
       }
@@ -70,9 +71,9 @@ class NonlocalizedFieldChangesCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {
-    prettyPrint(flags)
-    if(flags.yes) {
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if(data.yes) {
       return true
     }
     const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
@@ -96,12 +97,13 @@ NonlocalizedFieldChangesCommand.flags = {
   contentTypes: flags.string({char: 't', description: 'The Content-Types from which entries need to be published', multiple: true}),
   environments: flags.string({char: 'e', description: 'Destination environments', multiple: true}),
   config: flags.string({char: 'c', description: 'Path to config file to be used'}),
-  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration' }),
+  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
 }
 
 NonlocalizedFieldChangesCommand.examples = [
   'General Usage',
-  'csdx cm:bulk-publish:nonlocalized-field-changes -t [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] -l [LOCALE 1] [LOCALE 2] -a [MANAGEMENT TOKEN ALIAS]',
+  'csdx cm:bulk-publish:nonlocalized-field-changes -t [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] -l [LOCALE 1] [LOCALE 2] -a [MANAGEMENT TOKEN ALIAS] -s [SOURCE ENV]',
   '',
   'Using --config or -c flag',
   'Generate a config file at the current working directory using `csdx cm:bulk-publish:configure -a [ALIAS]`',
@@ -110,7 +112,10 @@ NonlocalizedFieldChangesCommand.examples = [
   '',
   'Using --retryFailed or -r flag',
   'csdx cm:bulk-publish:nonlocalized-field-changes --retryFailed [LOG FILE NAME]',
-  'csdx cm:bulk-publish:nonlocalized-field-changes -r [LOG FILE NAME]'
+  'csdx cm:bulk-publish:nonlocalized-field-changes -r [LOG FILE NAME]',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:nonlocalized-field-changes -t [CONTENT TYPE 1] [CONTENT TYPE 2] -e [ENVIRONMENT 1] [ENVIRONMENT 2] -l [LOCALE 1] [LOCALE 2] -a [MANAGEMENT TOKEN ALIAS] -B [BRANCH NAME] -s [SOURCE ENV]',
 ]
 
 module.exports = NonlocalizedFieldChangesCommand

package/src/commands/cm/bulk-publish/revert.js

@@ -10,10 +10,10 @@ let config
 
 class RevertCommand extends Command {
   async run() {
-    const {flags} = this.parse(RevertCommand)
+    const revertFlags = this.parse(RevertCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
+      updatedFlags = (revertFlags.config) ? store.updateMissing(configKey, revertFlags) : revertFlags
     } catch(error) {
       this.error(error.message, {exit: 2})
     }
@@ -48,9 +48,9 @@ class RevertCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {
-    prettyPrint(flags)
-    if(flags.yes) {
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if(data.yes) {
       return true
     }
     const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')

package/src/commands/cm/bulk-publish/unpublish.js

@@ -11,11 +11,11 @@ let config
 
 class UnpublishCommand extends Command {
   async run() {
-    const {flags} = this.parse(UnpublishCommand)
+    const unpublishFlags = this.parse(UnpublishCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
-    } catch(error) {
+      updatedFlags = (unpublishFlags.config) ? store.updateMissing(configKey, unpublishFlags) : unpublishFlags
+    } catch (error) {
       this.error(error.message, {exit: 2})
     }
 
@@ -30,10 +30,11 @@ class UnpublishCommand extends Command {
         }
         updatedFlags.bulkUnpublish = (updatedFlags.bulkUnpublish === 'false') ? false : true
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
-        config = { 
+        config = {
           alias: updatedFlags.alias,
           host: this.config.userConfig.getRegion().cma,
           cda: this.config.userConfig.getRegion().cda,
+          branch: unpublishFlags.branch,
         }
         stack = getStack(config)
       }
@@ -48,7 +49,7 @@ class UnpublishCommand extends Command {
           } else {
             await start(updatedFlags)
           }
-        } catch(error) {
+        } catch (error) {
           let message = formatError(error)
           this.error(message, {exit: 2})
         }
@@ -58,7 +59,7 @@ class UnpublishCommand extends Command {
     }
   }
 
-  validate({environment, retryFailed, locale, onlyAssets, onlyEntries}) {
+  validate({environment, retryFailed, locale, contentType, onlyAssets, onlyEntries}) {
     let missing = []
     if (retryFailed) {
       return true
@@ -68,6 +69,10 @@ class UnpublishCommand extends Command {
       this.error(`The flags onlyAssets and onlyEntries need not be used at the same time. Unpublish command unpublishes entries and assts at the same time by default`)
     }
 
+    if (onlyAssets && contentType) {
+      this.error(`Specifying content-type and onlyAssets together will have unexpected results. Please do not use these 2 flags together. Thank you.`)
+    }
+
     if (!environment) {
       missing.push('Environment')
     }
@@ -90,19 +95,19 @@ class UnpublishCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {  
+  async confirmFlags(data) {
     let confirmation
-    prettyPrint(flags)
-    if(flags.yes) { 
-      return true 
-    } 
+    prettyPrint(data)
+    if (data.yes) {
+      return true
+    }
 
-    if(!flags.contentType && !flags.onlyAssets) {
+    if (!data.contentType && !data.onlyAssets) {
       confirmation = await cli.confirm('Do you want to continue with this configuration. This will unpublish all the entries from all content types? [yes or no]')
     } else {
-      confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]') 
+      confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
     }
-    return confirmation 
+    return confirmation
   }
 }
 
@@ -131,6 +136,7 @@ UnpublishCommand.flags = {
   yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
   onlyAssets: flags.boolean({description: 'Unpublish only assets', default: false}),
   onlyEntries: flags.boolean({description: 'Unpublish only entries', default: false}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
 }
 
 UnpublishCommand.examples = [
@@ -155,6 +161,9 @@ UnpublishCommand.examples = [
   'Using --onlyEntries',
   'csdx cm:bulk-publish:unpublish --environment [SOURCE ENV] --locale [LOCALE] --onlyEntries (Will unpublish only entries, all entries, from the source environment)',
   'csdx cm:bulk-publish:unpublish --contentType [CONTENT TYPE] --environment [SOURCE ENV] --locale [LOCALE] --onlyEntries (Will unpublish only entries, (from CONTENT TYPE) from the source environment)',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:unpublish -b -t [CONTENT TYPE] -e [SOURCE ENV] -l [LOCALE] -a [MANAGEMENT TOKEN ALIAS] -x [DELIVERY TOKEN] -B [BRANCH NAME]',
 ]
 
-module.exports = UnpublishCommand
+module.exports = UnpublishCommand

package/src/commands/cm/bulk-publish/unpublished-entries.js

@@ -9,24 +9,25 @@ let config
 
 class UnpublishedEntriesCommand extends Command {
   async run() {
-    const {flags} = this.parse(UnpublishedEntriesCommand)
+    const unpublishedEntriesFlags = this.parse(UnpublishedEntriesCommand).flags
     let updatedFlags
     try {
-      updatedFlags = (flags.config) ? store.updateMissing(configKey, flags) : flags
-    } catch(error) {
+      updatedFlags = (unpublishedEntriesFlags.config) ? store.updateMissing(configKey, unpublishedEntriesFlags) : unpublishedEntriesFlags
+    } catch (error) {
       this.error(error.message, {exit: 2})
     }
     if (this.validate(updatedFlags)) {
       let stack
       if (!updatedFlags.retryFailed) {
-        if(!updatedFlags.alias) {
+        if (!updatedFlags.alias) {
           updatedFlags.alias = await cli.prompt('Please enter the management token alias to be used')
         }
         updatedFlags.bulkPublish = (updatedFlags.bulkPublish === 'false') ? false : true
         await this.config.runHook('validateManagementTokenAlias', {alias: updatedFlags.alias})
-        config = { 
+        config = {
           alias: updatedFlags.alias,
-          host: this.config.userConfig.getRegion().cma
+          host: this.config.userConfig.getRegion().cma,
+          branch: unpublishedEntriesFlags.branch,
         }
         stack = getStack(config)
       }
@@ -76,9 +77,9 @@ class UnpublishedEntriesCommand extends Command {
     }
   }
 
-  async confirmFlags(flags) {
-    prettyPrint(flags)
-    if(flags.yes) {
+  async confirmFlags(data) {
+    prettyPrint(data)
+    if(data.yes) {
       return true
     }
     const confirmation = await cli.confirm('Do you want to continue with this configuration ? [yes or no]')
@@ -102,12 +103,13 @@ UnpublishedEntriesCommand.flags = {
   locale: flags.string({char: 'l', description: 'Source locale'}),
   environments: flags.string({char: 'e', description: 'Destination environments', multiple: true}),
   config: flags.string({char: 'c', description: 'Path to config file to be used'}),
-  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration' }),
+  yes: flags.boolean({char: 'y', description: 'Agree to process the command with the current configuration'}),
+  branch: flags.string({char: 'B', default: 'main', description: 'Specify the branch to fetch the content from (default is main branch)'}),
 }
 
 UnpublishedEntriesCommand.examples = [
   'General Usage',
-  'csdx cm:bulk-publish:unpublished-entries -b -t [CONTENT TYPES] -e [ENVIRONMENTS] -l LOCALE -a [MANAGEMENT TOKEN ALIAS]',
+  'csdx cm:bulk-publish:unpublished-entries -b -t [CONTENT TYPES] -e [ENVIRONMENTS] -l LOCALE -a [MANAGEMENT TOKEN ALIAS] -s [SOURCE ENV]',
   '',
   'Using --config or -c flag',
   'Generate a config file at the current working directory using `csdx cm:bulk-publish:configure -a [ALIAS]`',
@@ -116,7 +118,10 @@ UnpublishedEntriesCommand.examples = [
   '',
   'Using --retryFailed or -r flag',
   'csdx cm:bulk-publish:unpublished-entries --retryFailed [LOG FILE NAME]',
-  'csdx cm:bulk-publish:unpublished-entries -r [LOG FILE NAME]'
+  'csdx cm:bulk-publish:unpublished-entries -r [LOG FILE NAME]',
+  '',
+  'Using --branch or -B flag',
+  'csdx cm:bulk-publish:unpublished-entries -b -t [CONTENT TYPES] -e [ENVIRONMENTS] -l LOCALE -a [MANAGEMENT TOKEN ALIAS] -B [BRANCH NAME] -s [SOURCE ENV]',
 ]
 
 module.exports = UnpublishedEntriesCommand