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.

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

CS-43112- Added GCP-NA support in CLI and removed the option from set:region command till the release happens #1249

Merged
merged 24 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
296221d
added GCP in config and version bump
cs-raj Jan 8, 2024
54d54ef
axios v1.6.4 used
cs-raj Jan 8, 2024
fba211d
added changes for CS-43268
cs-raj Jan 8, 2024
c4bcdd6
cli utilites version bump
cs-raj Jan 8, 2024
ee9dcc3
Merge branch 'development' into feat/CS-43271
cs-raj Jan 9, 2024
de2cd1d
gcp for export
cs-raj Jan 9, 2024
352be96
gcp changes in import
cs-raj Jan 9, 2024
6b2cede
updated patch version
cs-raj Jan 9, 2024
73af90b
changed version bump to patch
cs-raj Jan 10, 2024
8f3f623
Merge pull request #1229 from contentstack/feat/CS-43271
cs-raj Jan 10, 2024
cce1687
Merge pull request #1235 from contentstack/feat/CS-43269
cs-raj Jan 10, 2024
1c45225
Merge branch 'feat/CS-43112-gcp-support' into feat/CS-43270
cs-raj Jan 10, 2024
4238d6e
Merge pull request #1233 from contentstack/feat/CS-43270
cs-raj Jan 10, 2024
b3fd55a
gcp changes in branches plugin
cs-raj Jan 10, 2024
9df4ada
Merge pull request #1238 from contentstack/feat/CS-43272
cs-raj Jan 10, 2024
58b2901
version bump and removed the GCP NA option
cs-raj Jan 17, 2024
5f40922
Merge branch 'development' into feat/CS-43112-gcp-support
cs-raj Jan 17, 2024
8c3eed3
removed gcp-na from readme
cs-raj Jan 17, 2024
a7b6038
removed GCP-NA from args
cs-raj Jan 24, 2024
66583fa
Merge remote-tracking branch 'origin/development' into feat/CS-43112-…
cs-raj Jan 24, 2024
2d287d8
removed GCP-NA from comments and example
cs-raj Jan 24, 2024
d67cc8a
Merge branch 'development' into feat/CS-43112-gcp-support
cs-raj Jan 24, 2024
d980ecb
package-lock update
cs-raj Jan 24, 2024
5ff0f49
version bump after release
cs-raj Jan 24, 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
100 changes: 31 additions & 69 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-audit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"dependencies": {
"@contentstack/cli-command": "~1.2.16",
"@contentstack/cli-utilities": "~1.5.10",
"@contentstack/cli-utilities": "~1.5.11",
"@oclif/plugin-help": "^5",
"@oclif/plugin-plugins": "^4.1.9",
"chalk": "^4.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@contentstack/cli-command": "~1.2.16",
"@contentstack/cli-utilities": "~1.5.10",
"@contentstack/cli-utilities": "~1.5.11",
"chalk": "^4.0.0",
"debug": "^4.1.1",
"inquirer": "8.2.4",
Expand Down Expand Up @@ -96,4 +96,4 @@
}
},
"repository": "contentstack/cli"
}
}
4 changes: 2 additions & 2 deletions packages/contentstack-bootstrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@contentstack/cli-cm-seed": "~1.7.0",
"@contentstack/cli-command": "~1.2.16",
"@contentstack/cli-utilities": "~1.5.10",
"@contentstack/cli-utilities": "~1.5.11",
"inquirer": "8.2.4",
"mkdirp": "^1.0.4",
"tar": "^6.1.13"
Expand Down Expand Up @@ -73,4 +73,4 @@
}
},
"repository": "contentstack/cli"
}
}
8 changes: 4 additions & 4 deletions packages/contentstack-branches/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@contentstack/cli-cm-branches",
"description": "Contentstack CLI plugin to do branches operations",
"version": "1.0.21",
"version": "1.0.22",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.2.16",
"@contentstack/cli-utilities": "~1.5.10",
"@contentstack/cli-utilities": "~1.5.11",
"@oclif/core": "^2.9.3",
"async": "^3.2.4",
"big-json": "^3.2.0",
Expand All @@ -26,7 +26,7 @@
},
"devDependencies": {
"@contentstack/cli-auth": "~1.3.17",
"@contentstack/cli-config": "~1.4.15",
"@contentstack/cli-config": "~1.6.0",
"@contentstack/cli-dev-dependencies": "~1.2.4",
"@oclif/plugin-help": "^5.1.19",
"@oclif/test": "^1.2.6",
Expand Down Expand Up @@ -95,4 +95,4 @@
}
},
"repository": "https://github.com/contentstack/cli"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export function entryCreateScript(contentType) {
text = JSON.stringify(_entry);
}
markdownRegEx = new RegExp(
'(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'g',
);
while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function entryCreateUpdateScript(contentType) {
text = JSON.stringify(_entry);
}
markdownRegEx = new RegExp(
'(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'g',
);
while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function entryUpdateScript(contentType) {
text = JSON.stringify(_entry);
}
markdownRegEx = new RegExp(
'(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
'g',
);
while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-bulk-publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.2.16",
"@contentstack/cli-utilities": "~1.5.10",
"@contentstack/cli-utilities": "~1.5.11",
"bluebird": "^3.7.2",
"chalk": "^4.1.2",
"dotenv": "^16.1.4",
Expand Down Expand Up @@ -99,4 +99,4 @@
"version": "oclif readme && git add README.md",
"clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo"
}
}
}
Loading
Loading