Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/CS-43721-Adding the GCP changes #1277

Merged
merged 4 commits into from
Feb 5, 2024
Merged

Release/CS-43721-Adding the GCP changes #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f62f10
added gcp-na in options to select region and as args. Version bump
cs-raj Jan 31, 2024
07f753d
Merge pull request #1273 from contentstack/fix/CS-43728
cs-raj Jan 31, 2024
42808ef
handled the case when invalid management token alias is passed and ve…
cs-raj Jan 25, 2024
8536acc
core version bump
cs-raj Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
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-clone/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/package.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/contentstack-config/src/commands/config/set/region.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-import/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/src/commands/cm/stacks/import.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ${
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/src/utils/import-config-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-seed/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading