Merge branch 'main' into main-to-stage

contentstack · Feb 5, 2024 · d70129c · d70129c
2 parents da22e57 + 638939e
commit d70129c
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.17",
-    "@contentstack/cli-config": "~1.6.0",
+    "@contentstack/cli-config": "~1.6.1",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^1.2.6",

diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@contentstack/cli-cm-export": "~1.10.4",
-    "@contentstack/cli-cm-import": "~1.13.2",
+    "@contentstack/cli-cm-import": "~1.13.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "@colors/colors": "^1.5.0",

diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",

diff --git a/packages/contentstack-config/src/commands/config/set/region.ts b/packages/contentstack-config/src/commands/config/set/region.ts
@@ -88,7 +88,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
         this.logger.error('failed to set the region', error);
         cliux.error(`Failed to set region due to: ${error.message}`);
       }
-    } else if (['NA', 'EU', 'AZURE-NA', 'AZURE-EU'].includes(selectedRegion)) {
+    } else if (['NA', 'EU', 'AZURE-NA', 'AZURE-EU', 'GCP-NA'].includes(selectedRegion)) {
       const regionDetails: Region = regionHandler.setRegion(selectedRegion);
       await authHandler.setConfigData('logout'); //Todo: Handle this logout flow well through logout command call
       cliux.success(`Region has been set to ${regionDetails.name}`);

diff --git a/packages/contentstack-config/src/utils/interactive.ts b/packages/contentstack-config/src/utils/interactive.ts
@@ -11,6 +11,7 @@ export const askRegions = async (): Promise<string> => {
       { name: 'EU', value: 'EU' },
       { name: 'AZURE-NA', value: 'AZURE-NA' },
       { name: 'AZURE-EU', value: 'AZURE-EU' },
+      { name: 'GCP-NA', value: 'GCP-NA' },
       { name: 'Custom', value: 'custom' },
       { name: 'exit', value: 'exit' },
     ],

diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.17",
-    "@contentstack/cli-config": "~1.6.0",
+    "@contentstack/cli-config": "~1.6.1",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
     "@oclif/test": "^2.5.6",

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts
@@ -141,7 +141,7 @@ export default class ImportCommand extends Command {
         'success',
       );
     } catch (error) {
-      log({ data: backupDir } as ImportConfig, `Failed to import stack content - ${formatError(error)}`, 'error');
+      log({ data: backupDir ?? path.join(backupDir || __dirname, 'logs', 'import') } as ImportConfig, `Failed to import stack content - ${formatError(error)}`, 'error');
       log(
         { data: backupDir } as ImportConfig,
         `The log has been stored at ${

diff --git a/packages/contentstack-import/src/utils/import-config-handler.ts b/packages/contentstack-import/src/utils/import-config-handler.ts
@@ -35,7 +35,7 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
 
   if (managementTokenAlias) {
-    const { token, apiKey } = configHandler.get(`tokens.${managementTokenAlias}`);
+    const { token, apiKey } = configHandler.get(`tokens.${managementTokenAlias}`) ?? {};
     config.management_token = token;
     config.apiKey = apiKey;
     if (!config.management_token) {

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.13.2",
+    "@contentstack/cli-cm-import": "~1.13.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.11",
     "inquirer": "8.2.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -30,11 +30,11 @@
     "@contentstack/cli-cm-clone": "~1.9.0",
     "@contentstack/cli-cm-export": "~1.10.4",
     "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-    "@contentstack/cli-cm-import": "~1.13.2",
+    "@contentstack/cli-cm-import": "~1.13.3",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",
-    "@contentstack/cli-config": "~1.6.0",
+    "@contentstack/cli-config": "~1.6.1",
     "@contentstack/cli-launch": "~1.0.15",
     "@contentstack/cli-migration": "~1.4.2",
     "@contentstack/cli-utilities": "~1.5.11",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml