Skip to content

Commit

Permalink
Merge branch 'release/CS-43721' into bugfix/CS-43668
Browse files Browse the repository at this point in the history
  • Loading branch information
cs-raj authored Jan 31, 2024
2 parents 9829ca6 + 07f753d commit c4c483c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/contentstack-branches/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down
1 change: 1 addition & 0 deletions packages/contentstack-config/src/utils/interactive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
],
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-export/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@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",
Expand Down
6 changes: 3 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c4c483c

Please sign in to comment.