Merge branch 'development' into fix/DX-8587

Author: naman-contentstack

.github/workflows/issues-jira.yml

@@ -1,6 +1,74 @@
 fileignoreconfig:
-  - filename: pnpm-lock.yaml
-    checksum: 07642e8dd04d580185a459e5b088d8a1bb4e91be4e04f4842bf4fe4775205bf6
-  - filename: packages/contentstack-export/src/config/index.ts
-    checksum: 6fa4bba2174bbf33f5611098f49a02bf2fc789f59634e99be58de7e370f5fcd3
+- filename: pnpm-lock.yaml
+  checksum: cb3710ff4c9d3b8f45a8f0b3ff868d49451872ac6d085ae3ccf83d31055cf50d
+- filename: packages/contentstack-bulk-operations/src/messages/index.ts
+  checksum: 097f7ed876622aed6edc3f12995a92e219f96c3d053ec078d45c762f7ebe085e
+- filename: packages/contentstack-bulk-operations/test/unit/base-bulk-command.test.ts
+  checksum: 522b91a2d4bb6a73ebe5ab92c0111e74d567c4360470beefd6a7ca8d30a6e311
+- filename: packages/contentstack-import/test/unit/import/modules/assets.test.ts
+  checksum: 64e3af1e307d0f001370870267fa4cedd2ae81d0f3c38c2e184e69a9a68b2b30
+- filename: packages/contentstack-query-export/test/unit/common-helper.test.ts
+  checksum: a0aa399a2ec15760fe25f7e952d64792b55d3c38d2281858a48e64f0f9081344
+- filename: packages/contentstack-import/test/unit/utils/interactive.test.ts
+  checksum: dad20e229e02e847b5e939fdaf987b1a6c9ff4e1529b6d96a51130f7293285a9
+- filename: packages/contentstack-import/test/unit/utils/common-helper.test.ts
+  checksum: 12c8161a1cb313fa98b612d72e605f6e5190b9f9561d6e73c269c7d106e1a196
+- filename: packages/contentstack-apps-cli/src/messages/index.ts
+  checksum: 5d7991adb5056a14359c5a43db995460a72234916138dbc5ec14f726faf0054b
+- filename: packages/contentstack-import/test/unit/utils/marketplace-app-helper.test.ts
+  checksum: 878be77164311c0ab86629fe18fd3d1be7ff187447e4e5ab65a241b3be0a8d24
+- filename: packages/contentstack-import/test/unit/import/modules/global-fields.test.ts
+  checksum: 4bd86f40b28433470eea876acc9254042c3b24556acdfdb7b15375a948acc094
+- filename: packages/contentstack-import/test/unit/import/modules/base-class.test.ts
+  checksum: 7616f13a4c908eead76c1625cb146320a8a23f31732acb2ea8472e2e0a8b2692
+- filename: packages/contentstack-import/test/unit/import/modules/entries.test.ts
+  checksum: 02332fc203e92039b5fcab6e2e14d14ea5444a4cba2be853009b4c4994692637
+- filename: packages/contentstack-import/test/unit/import/modules/index.test.ts
+  checksum: 6c2bc4bb09dc750532e84a2d6a8198e145bd142bc21ce0d97ae0c8da55dea723
+- filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
+  checksum: a52fbd82e4296734d5eb5b06cc9a10d7e2c1fe7b58d15a44d3246f0f2762d5a1
+- filename: packages/contentstack-migrate-rte/test/utils/index.js
+  checksum: f67235e607a446e5b2dd624046966a1ac5af7bce128aa080ec3c420c48b8bddc
+- filename: packages/contentstack-bulk-operations/test/unit/utils/config-builder.test.ts
+  checksum: e5891257999e9e940956ca77f5a7834be35d259edccd41c06f77736194ad7454
+- filename: packages/contentstack-import/test/unit/import/modules/content-types.test.ts
+  checksum: cd47b1694cb1edffb11fed0f2024fac631b0279ebf55113510d9121c4b957ab1
+- filename: packages/contentstack-bulk-operations/test/unit/utils/bulk-operation-log-handler.test.ts
+  checksum: 8698f77bbb828df10ddc3a94726076a262fbf47d2468233c7e10e66cac42f97d
+- filename: packages/contentstack-migrate-rte/test/commands/json-migration.test.js
+  checksum: 0d18641a32f7cf33d013a5a7c447c1067ba77022513b42304a727f873c741e99
+- filename: packages/contentstack-export/test/unit/utils/interactive.test.ts
+  checksum: 0ea47db305f576c8c9da8cb34ae915f6b01992208ff1c4380cb7ffd93f538e5d
+- filename: packages/contentstack-clone/test/lib/helpers/command-helpers.test.ts
+  checksum: 32d385a677a76faa54cb3ddfe92fb1f1f53cfab878a78e2792c823a363956bd2
+- filename: packages/contentstack-export-to-csv/src/messages/index.ts
+  checksum: 54cbfb3fb83d06ce46766897066ace927c190b2383154b45423e668f63fa4392
+- filename: packages/contentstack-clone/test/commands/stack-clone.test.ts
+  checksum: 4547ba010cc3c9954de49e2b2bef45288dd070c4ad000b6ae3e9a8c9bb1ad296
+- filename: packages/contentstack-content-type/tests/utils/index.test.ts
+  checksum: 8510fedf5eb6078c27d6a0d65d8bff4aa2d41b545246aed220d1a6a643188ad8
+- filename: packages/contentstack-bulk-operations/test/unit/utils/revert-retry-handler.test.ts
+  checksum: c34a4bdea186f4ce48171d90b8ab0f1c94162e441acb23e3a0e00cb9f9f9255f
+- filename: packages/contentstack-export-to-csv/test/unit/utils/error-handler.test.ts
+  checksum: 7216dd610334e6f4a0e2701712408a273a5a2bd4a5ec30b6d6aae043e2b53cc8
+- filename: packages/contentstack-export/test/unit/utils/marketplace-app-helper.test.ts
+  checksum: 3734c4cf7145ef32ad424ccbc160ea8be9b38157762aa66ade51879ab369cee9
+- filename: packages/contentstack-import-setup/test/unit/common-helper.test.ts
+  checksum: 7ac4645401fd3629347a8a182f8a320f177de545a96b8027422bd68040513068
+- filename: packages/contentstack-export/test/unit/utils/common-helper.test.ts
+  checksum: 928f173ca03855a516ac468dba84092fd5f66d2e41b0100bb548e0af364a4ef5
+- filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
+  checksum: 0e7777f73da4f41f4e01e768dba1f3f62ab36778c4f9cd0b519fd1e3bb5c410f
+- filename: packages/contentstack-clone/test/lib/util/clone-handler.branch.test.ts
+  checksum: db8c090aaada21d3952c5bc382228a0a11cebb63926512a5e2581bdaf5f4c2f6
+- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
+  checksum: fa7cb2aeb0873e5650beed42096ef4a8edd012a7217818ab0cab2ba6c4611934
+- filename: packages/contentstack-import/test/unit/import/modules/marketplace-apps.test.ts
+  checksum: 42f4d0a15080a69423d4e82b11a6a1933c5f72930cdc4a55b86f27fdc980aeea
+- filename: packages/contentstack-import/test/unit/utils/login-handler.test.ts
+  checksum: 49dd751f846f50fe00d60e7f02b5bd237d36480048bf5e06a24f1cf9fe752a1b
+- filename: packages/contentstack-content-type/tests/core/command.test.ts
+  checksum: 81da32fc47083a3421f5f1d9c04149ab313cb238d6416d3182f8b6d64dc8827d
+- filename: packages/contentstack-content-type/tests/core/contentstack/client.test.ts
+  checksum: da15b04aa0a7ab0e48f70b847e68c05372943279e51c22f8539b01bb48033183
 version: '1.0'

.talismanrc

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/apps-cli",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "App ClI",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli-plugins/tree/main/packages/contentstack-apps-cli",

packages/contentstack-apps-cli/package.json

@@ -26,7 +26,7 @@ export default class Install extends AppCLIBaseCommand {
       description: commonMsg.APP_UID,
     }),
     "stack-api-key": flags.string({
-      description: commonMsg.STACK_API_KEY,
+      description: commonMsg.STACK_API_KEY_placeholder,
     }),
     ...AppCLIBaseCommand.baseFlags,
   };
@@ -88,7 +88,7 @@ export default class Install extends AppCLIBaseCommand {
       // in case a stack app is selected and no stack-api-key is provided
       if (appType === "stack" && !this.flags["stack-api-key"]) {
         this.log(
-          $t(installAppMsg.MISSING_STACK_API_KEY, {
+          $t(installAppMsg.MISSING_STACK_API_KEY_placeholder, {
             app: app?.name || app?.uid,
           }),
           "warn"

packages/contentstack-apps-cli/src/commands/app/install.ts

@@ -25,7 +25,7 @@ export default class Reinstall extends AppCLIBaseCommand {
       description: commonMsg.APP_UID,
     }),
     "stack-api-key": flags.string({
-      description: commonMsg.STACK_API_KEY,
+      description: commonMsg.STACK_API_KEY_placeholder,
     }),
     ...AppCLIBaseCommand.baseFlags,
   };
@@ -84,7 +84,7 @@ export default class Reinstall extends AppCLIBaseCommand {
         appType = "stack";
 
         this.log(
-          $t(reinstallAppMsg.MISSING_STACK_API_KEY, {
+          $t(reinstallAppMsg.MISSING_STACK_API_KEY_placeholder, {
             app: app?.name || app?.uid,
           }),
           "warn"

packages/contentstack-apps-cli/src/commands/app/reinstall.ts

@@ -38,7 +38,7 @@ const commonMsg = {
   APP_UID: "Provide the app UID of an existing app.",
   APP_TYPE_DESCRIPTION: "Type of app",
   CONTACT_SUPPORT: "Contact the support team for help.",
-  STACK_API_KEY: "API key of the stack where the app operation is to be performed.",
+  STACK_API_KEY_placeholder: "API key of the stack where the app operation is to be performed.",
   USER_TERMINATION: "Process terminated by the user.",
   CLI_APP_CLI_LOGIN_FAILED: "You're not logged in. Run $ csdx auth:login to continue."
 };
@@ -97,7 +97,7 @@ const installAppMsg = {
   CHOOSE_A_STACK: "Please select a stack",
   APP_INSTALLED_SUCCESSFULLY: "{app} installed successfully in {target}.",
   INSTALL_ORG_APP_TO_STACK: "{app} is an organization app. It cannot be installed to a stack. Do you want to proceed?",
-  MISSING_STACK_API_KEY: "As {app} is a stack app, it can only be installed in a stack. Please select a stack.",
+  MISSING_STACK_API_KEY_placeholder: "As {app} is a stack app, it can only be installed in a stack. Please select a stack.",
   INSTALLING_APP_NOTICE: "Installing {app} on {type} {target}.",
   APP_ALREADY_INSTALLED: "Please use $ csdx app:reinstall to reinstall the app.",
 }
@@ -115,7 +115,7 @@ const reinstallAppMsg = {
   CHOOSE_A_STACK: "Please select a stack",
   APP_REINSTALLED_SUCCESSFULLY: "{app} reinstalled successfully in {target}.",
   REINSTALL_ORG_APP_TO_STACK: "{app} is an organization app. It cannot be reinstalled to a stack. Do you want to proceed?",
-  MISSING_STACK_API_KEY: "As {app} is a stack app, it can only be reinstalled in a stack. Please select a stack.",
+  MISSING_STACK_API_KEY_placeholder: "As {app} is a stack app, it can only be reinstalled in a stack. Please select a stack.",
   REINSTALLING_APP_NOTICE: "Reinstalling {app} on {type} {target}.",
   APP_UID: "Provide the app UID of an existing app to be reinstalled.",
   APP_ALREADY_LATEST_VERSION: "The application is already up to date; no new version is available.",

packages/contentstack-apps-cli/src/messages/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-bulk-operations",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Contentstack CLI plugin for bulk operations",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli-plugins/tree/main/packages/contentstack-bulk-operations",

packages/contentstack-bulk-operations/package.json

@@ -61,7 +61,7 @@ export abstract class BaseBulkCommand extends Command {
     }),
     'stack-api-key': flags.string({
       char: 'k',
-      description: messages.STACK_API_KEY,
+      description: messages.STACK_API_KEY_placeholder,
     }),
     operation: flags.string({
       description: messages.OPERATION,

packages/contentstack-bulk-operations/src/base-bulk-command.ts

@@ -291,7 +291,7 @@ const interactiveMsg = {
   ENTER_ENVIRONMENTS: 'Enter target environments (comma-separated):',
   ENTER_LOCALES: 'Enter locales (comma-separated):',
   SELECT_ALIAS: 'Select alias:',
-  ENTER_API_KEY: 'Enter stack API key:',
+  ENTER_API_KEY_placeholder: 'Enter stack API key:',
   ENTER_SOURCE_ENV: 'Enter source environment name:',
   SELECT_SOURCE_ALIAS: 'Select delivery token alias for source environment:',
 
@@ -322,7 +322,8 @@ const flagDescriptions = {
   // Common flags
   ALIAS:
     'Uses the name of a saved Management Token to authenticate the command. The command can only access the branches allowed for that token. This option can be used as an alternative to` --stack-api-key.`',
-  STACK_API_KEY: 'API key of the source stack. You must use either the --stack-api-key flag or the --alias flag.',
+  STACK_API_KEY_placeholder:
+    'API key of the source stack. You must use either the --stack-api-key flag or the --alias flag.',
   OPERATION: 'Specifies whether to `publish` or `unpublish` content.',
   ENVIRONMENTS:
     'Specifies one or more environments where the entries or assets should be published. Separate multiple environments with spaces.',

packages/contentstack-bulk-operations/src/messages/index.ts

@@ -62,7 +62,7 @@ async function promptForStackCredentials(): Promise<{ alias?: string; apiKey?: s
     const apiKey = await cliux.inquire<string>({
       type: 'input',
       name: 'apiKey',
-      message: messages.ENTER_API_KEY,
+      message: messages.ENTER_API_KEY_placeholder,
       validate: (value) => {
         if (!value || value.trim().length === 0) {
           return messages.API_KEY_REQUIRED;
@@ -97,7 +97,7 @@ async function promptForStackCredentials(): Promise<{ alias?: string; apiKey?: s
   const apiKey = await cliux.inquire<string>({
     type: 'input',
     name: 'apiKey',
-    message: messages.ENTER_API_KEY,
+    message: messages.ENTER_API_KEY_placeholder,
     validate: (value) => {
       if (!value || value.trim().length === 0) {
         return messages.API_KEY_REQUIRED;