diff --git a/package-lock.json b/package-lock.json index 6bee072c09..1caf10be1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26663,7 +26663,7 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.37.0", + "version": "1.38.0", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.9.0", @@ -26672,17 +26672,17 @@ "@contentstack/cli-cm-branches": "~1.3.0", "@contentstack/cli-cm-bulk-publish": "~1.7.3", "@contentstack/cli-cm-clone": "~1.13.2", - "@contentstack/cli-cm-export": "~1.15.0", + "@contentstack/cli-cm-export": "~1.15.1", "@contentstack/cli-cm-export-to-csv": "~1.7.3", - "@contentstack/cli-cm-import": "~1.20.0", - "@contentstack/cli-cm-import-setup": "1.1.0", + "@contentstack/cli-cm-import": "~1.20.1", + "@contentstack/cli-cm-import-setup": "1.1.1", "@contentstack/cli-cm-migrate-rte": "~1.4.21", "@contentstack/cli-cm-seed": "~1.10.2", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-config": "~1.10.0", "@contentstack/cli-launch": "^1.6.0", "@contentstack/cli-migration": "~1.6.5", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/cli-variants": "~1.1.5", "@contentstack/management": "~1.18.4", "@oclif/core": "^3.27.0", @@ -26739,7 +26739,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/plugin-help": "^5.2.20", "@oclif/plugin-plugins": "^5.4.34", "chalk": "^4.1.2", @@ -26812,7 +26812,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4" + "@contentstack/cli-utilities": "~1.9.0" }, "devDependencies": { "@fancy-test/nock": "^0.1.1", @@ -26958,7 +26958,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.10.2", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "inquirer": "8.2.6", "mkdirp": "^1.0.4", "tar": "^6.2.1 " @@ -27037,7 +27037,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/core": "^3.27.0", "chalk": "^4.1.2", "just-diff": "^6.0.2", @@ -27069,7 +27069,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "chalk": "^4.1.2", "dotenv": "^16.4.7", "inquirer": "8.2.6", @@ -27098,7 +27098,7 @@ "@contentstack/cli-cm-export": "~1.15.0", "@contentstack/cli-cm-import": "~1.20.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "chalk": "^4.1.2", "inquirer": "8.2.6", "lodash": "^4.17.21", @@ -27199,7 +27199,7 @@ "version": "1.3.3", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "contentstack": "^3.22.1" }, "devDependencies": { @@ -27272,7 +27272,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "lodash": "^4.17.21" }, "devDependencies": { @@ -27576,11 +27576,11 @@ }, "packages/contentstack-export": { "name": "@contentstack/cli-cm-export", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/cli-variants": "~1.1.5", "@oclif/core": "^3.27.0", "async": "^3.2.6", @@ -27623,7 +27623,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "fast-csv": "^4.3.6", "inquirer": "8.2.6", "inquirer-checkbox-plus-prompt": "1.4.2", @@ -27928,12 +27928,12 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.20.0", + "version": "1.20.1", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.9.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/cli-variants": "~1.1.5", "@contentstack/management": "~1.18.4", "@oclif/core": "^3.27.0", @@ -27975,11 +27975,11 @@ }, "packages/contentstack-import-setup": { "name": "@contentstack/cli-cm-import-setup", - "version": "1.1.0", + "version": "1.1.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/core": "^3.27.0", "big-json": "^3.2.0", "chalk": "^4.1.2", @@ -28019,7 +28019,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/json-rte-serializer": "~2.0.11", "chalk": "^4.1.2", "collapse-whitespace": "^1.1.7", @@ -28049,7 +28049,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "async": "^3.2.6", "callsites": "^3.1.0", "cardinal": "^2.1.1", @@ -28078,7 +28078,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.20.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/management": "~1.18.4", "inquirer": "8.2.6", "mkdirp": "^1.0.4", @@ -28155,7 +28155,7 @@ }, "packages/contentstack-utilities": { "name": "@contentstack/cli-utilities", - "version": "1.8.4", + "version": "1.9.0", "license": "MIT", "dependencies": { "@contentstack/management": "~1.18.4", @@ -28216,7 +28216,7 @@ "version": "1.1.5", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.17.0" diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md index 390fdaa6b5..28fd1010d3 100644 --- a/packages/contentstack-audit/README.md +++ b/packages/contentstack-audit/README.md @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli-audit/1.9.0 darwin-arm64 node-v23.6.0 +@contentstack/cli-audit/1.9.0 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index a0243e5e54..339f8c2b62 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/plugin-help": "^5.2.20", "@oclif/plugin-plugins": "^5.4.34", "chalk": "^4.1.2", diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index d8dbd92d12..ddb6cb3398 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4" + "@contentstack/cli-utilities": "~1.9.0" }, "devDependencies": { "@fancy-test/nock": "^0.1.1", diff --git a/packages/contentstack-bootstrap/README.md b/packages/contentstack-bootstrap/README.md index 4287876fb6..662cc9dcde 100644 --- a/packages/contentstack-bootstrap/README.md +++ b/packages/contentstack-bootstrap/README.md @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bootstrap/1.13.2 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-bootstrap/1.13.2 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index 9fa9fa41cb..21620cddc6 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -19,7 +19,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.10.2", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "inquirer": "8.2.6", "mkdirp": "^1.0.4", "tar": "^6.2.1 " diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md index 3da34db135..64dad643f4 100755 --- a/packages/contentstack-branches/README.md +++ b/packages/contentstack-branches/README.md @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-branches/1.3.0 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-branches/1.3.0 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 2bcd4fd734..b23ea3d829 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/core": "^3.27.0", "chalk": "^4.1.2", "just-diff": "^6.0.2", diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index fb2ba6a6ea..ed98eb49ac 100644 --- a/packages/contentstack-bulk-publish/README.md +++ b/packages/contentstack-bulk-publish/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bulk-publish/1.7.3 darwin-arm64 node-v23.6.0 +@contentstack/cli-cm-bulk-publish/1.7.3 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index 2a902b694f..7c0ec7bbcd 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "chalk": "^4.1.2", "dotenv": "^16.4.7", "inquirer": "8.2.6", diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md index 686896ee40..15655626c3 100644 --- a/packages/contentstack-clone/README.md +++ b/packages/contentstack-clone/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-clone/1.13.2 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-clone/1.13.2 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index e926043db6..22b22fbbaa 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -9,7 +9,7 @@ "@contentstack/cli-cm-export": "~1.15.0", "@contentstack/cli-cm-import": "~1.20.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "chalk": "^4.1.2", "inquirer": "8.2.6", "lodash": "^4.17.21", diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json index 96d1300648..d64f729703 100644 --- a/packages/contentstack-command/package.json +++ b/packages/contentstack-command/package.json @@ -17,7 +17,7 @@ "format": "eslint src/**/*.ts --fix" }, "dependencies": { - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "contentstack": "^3.22.1" }, "devDependencies": { diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md index 3198786fef..bdb3c9cc89 100644 --- a/packages/contentstack-config/README.md +++ b/packages/contentstack-config/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-config/1.10.0 darwin-x64 node-v22.14.0 +@contentstack/cli-config/1.10.0 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index dbef8db73d..53b58a5c47 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json index 7519a59181..7e065ed596 100644 --- a/packages/contentstack-export-to-csv/package.json +++ b/packages/contentstack-export-to-csv/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "fast-csv": "^4.3.6", "inquirer": "8.2.6", "inquirer-checkbox-plus-prompt": "1.4.2", diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md index 6063bf8919..93115cf6e3 100755 --- a/packages/contentstack-export/README.md +++ b/packages/contentstack-export/README.md @@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-export/1.15.0 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-export/1.15.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 3afdf64a33..716c9a8e2b 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -1,13 +1,13 @@ { "name": "@contentstack/cli-cm-export", "description": "Contentstack CLI plugin to export content from stack", - "version": "1.15.0", + "version": "1.15.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-variants": "~1.1.5", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/core": "^3.27.0", "async": "^3.2.6", "big-json": "^3.2.0", diff --git a/packages/contentstack-export/src/utils/logger.ts b/packages/contentstack-export/src/utils/logger.ts index d38fba76ab..f3628ee244 100644 --- a/packages/contentstack-export/src/utils/logger.ts +++ b/packages/contentstack-export/src/utils/logger.ts @@ -8,7 +8,7 @@ import * as winston from 'winston'; import * as path from 'path'; import mkdirp from 'mkdirp'; import { ExportConfig } from '../types'; -import { sanitizePath } from '@contentstack/cli-utilities'; +import { sanitizePath, redactObject } from '@contentstack/cli-utilities'; const slice = Array.prototype.slice; const ansiRegexPattern = [ @@ -23,7 +23,10 @@ function returnString(args: unknown[]) { .map(function (item) { if (item && typeof item === 'object') { try { - return JSON.stringify(item).replace(/authtoken\":\d"blt................/g, 'authtoken":"blt....'); + const redactedObject = redactObject(item); + if(redactedObject && typeof redactedObject === 'object') { + return JSON.stringify(redactedObject); + } } catch (error) {} return item; } diff --git a/packages/contentstack-import-setup/README.md b/packages/contentstack-import-setup/README.md index ceecf39bbe..548f4c3166 100644 --- a/packages/contentstack-import-setup/README.md +++ b/packages/contentstack-import-setup/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import-setup/1.1.0 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-import-setup/1.1.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json index fcf9476afc..b1370961a5 100644 --- a/packages/contentstack-import-setup/package.json +++ b/packages/contentstack-import-setup/package.json @@ -1,12 +1,12 @@ { "name": "@contentstack/cli-cm-import-setup", "description": "Contentstack CLI plugin to setup the mappers and configurations for the import command", - "version": "1.1.0", + "version": "1.1.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@oclif/core": "^3.27.0", "big-json": "^3.2.0", "chalk": "^4.1.2", diff --git a/packages/contentstack-import-setup/src/utils/logger.ts b/packages/contentstack-import-setup/src/utils/logger.ts index 782e07c2c3..4ee10dcaba 100644 --- a/packages/contentstack-import-setup/src/utils/logger.ts +++ b/packages/contentstack-import-setup/src/utils/logger.ts @@ -8,7 +8,7 @@ import * as winston from 'winston'; import * as path from 'path'; import mkdirp from 'mkdirp'; import { ImportConfig } from '../types'; -import { sanitizePath } from '@contentstack/cli-utilities'; +import { sanitizePath, redactObject } from '@contentstack/cli-utilities'; const slice = Array.prototype.slice; @@ -24,7 +24,10 @@ function returnString(args: any[]) { .map(function (item) { if (item && typeof item === 'object') { try { - return JSON.stringify(item).replace(/authtoken\":\d"blt................/g, 'authtoken":"blt....'); + const redactedObject = redactObject(item); + if(redactedObject && typeof redactedObject === 'object') { + return JSON.stringify(redactedObject); + } } catch (error) {} return item; } diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md index 817c99d410..7f2fcc2aa7 100644 --- a/packages/contentstack-import/README.md +++ b/packages/contentstack-import/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import/1.20.0 darwin-x64 node-v22.14.0 +@contentstack/cli-cm-import/1.20.1 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND @@ -96,9 +96,9 @@ FLAGS --personalize-project-name= (optional) Provide a unique name for the Personalize project. --replace-existing Replaces the existing module in the target stack. --skip-app-recreation (optional) Skips the recreation of private apps if they already exist. - --skip-assets-publish Skips the assets from being published during an import process. + --skip-assets-publish Skips asset publishing during the import process. --skip-audit Skips the audit fix that occurs during an import operation. - --skip-entries-publish Skips the entries from being published during an import process. + --skip-entries-publish Skips entry publishing during the import process --skip-existing Skips the module exists warning messages. DESCRIPTION @@ -160,9 +160,9 @@ FLAGS --personalize-project-name= (optional) Provide a unique name for the Personalize project. --replace-existing Replaces the existing module in the target stack. --skip-app-recreation (optional) Skips the recreation of private apps if they already exist. - --skip-assets-publish Skips the assets from being published during an import process. + --skip-assets-publish Skips asset publishing during the import process. --skip-audit Skips the audit fix that occurs during an import operation. - --skip-entries-publish Skips the entries from being published during an import process. + --skip-entries-publish Skips entry publishing during the import process --skip-existing Skips the module exists warning messages. DESCRIPTION diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index a66c701bb0..9961cf4bee 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -1,13 +1,13 @@ { "name": "@contentstack/cli-cm-import", "description": "Contentstack CLI plugin to import content into stack", - "version": "1.20.0", + "version": "1.20.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-audit": "~1.9.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/management": "~1.18.4", "@contentstack/cli-variants": "~1.1.5", "@oclif/core": "^3.27.0", diff --git a/packages/contentstack-import/src/utils/logger.ts b/packages/contentstack-import/src/utils/logger.ts index 782e07c2c3..4ee10dcaba 100644 --- a/packages/contentstack-import/src/utils/logger.ts +++ b/packages/contentstack-import/src/utils/logger.ts @@ -8,7 +8,7 @@ import * as winston from 'winston'; import * as path from 'path'; import mkdirp from 'mkdirp'; import { ImportConfig } from '../types'; -import { sanitizePath } from '@contentstack/cli-utilities'; +import { sanitizePath, redactObject } from '@contentstack/cli-utilities'; const slice = Array.prototype.slice; @@ -24,7 +24,10 @@ function returnString(args: any[]) { .map(function (item) { if (item && typeof item === 'object') { try { - return JSON.stringify(item).replace(/authtoken\":\d"blt................/g, 'authtoken":"blt....'); + const redactedObject = redactObject(item); + if(redactedObject && typeof redactedObject === 'object') { + return JSON.stringify(redactedObject); + } } catch (error) {} return item; } diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json index f5cd46db07..1afbebafc6 100644 --- a/packages/contentstack-migrate-rte/package.json +++ b/packages/contentstack-migrate-rte/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/json-rte-serializer": "~2.0.11", "collapse-whitespace": "^1.1.7", "chalk": "^4.1.2", diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json index 17970d3b3f..cf28ed8a73 100644 --- a/packages/contentstack-migration/package.json +++ b/packages/contentstack-migration/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "async": "^3.2.6", "callsites": "^3.1.0", "cardinal": "^2.1.1", diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 7c626c784d..a81cf4a7c2 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.20.0", "@contentstack/cli-command": "~1.3.3", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/management": "~1.18.4", "inquirer": "8.2.6", "mkdirp": "^1.0.4", diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json index 1b2344296f..7b18ae20e6 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-utilities", - "version": "1.8.4", + "version": "1.9.0", "description": "Utilities for contentstack projects", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts index 47d5e1112c..454bac8dd1 100644 --- a/packages/contentstack-utilities/src/helpers.ts +++ b/packages/contentstack-utilities/src/helpers.ts @@ -1,4 +1,5 @@ import { checkSync } from 'recheck'; +import traverse from 'traverse'; import authHandler from './auth-handler'; import { HttpClient, cliux, configHandler } from '.'; export const isAuthenticated = () => authHandler.isAuthenticated(); @@ -133,3 +134,48 @@ export const formatError = function (error: any) { return message; }; + +/** + * The function checks if a given key string matches any of the sensitive keys defined in an array. + * @param {string} keyStr - The parameter `keyStr` is a string that represents a key. + * @returns a boolean value. It returns true if the keyStr matches any of the regular expressions in + * the sensitiveKeys array, and false otherwise. + */ +const isSensitiveKey = function (keyStr: string) { + if (keyStr && typeof keyStr === 'string') { + return sensitiveKeys.some((regex) => regex.test(keyStr)); + } +}; + +/** + * The function redactObject takes an object as input and replaces any sensitive keys with the string + * '[REDACTED]'. + * @param {any} obj - The `obj` parameter is an object that you want to redact sensitive information + * from. + */ +export const redactObject = function (obj: any) { + traverse(obj).forEach(function redactor() { + // Check if the current key is sensitive + if (isSensitiveKey(this.key)) { + // Update the current value with '[REDACTED]' + this.update('[REDACTED]'); + } + }); + + return obj; +}; + +/* The `sensitiveKeys` array is used to store regular expressions that match sensitive keys. These + keys are used to redact sensitive information from log messages. When logging an object, any keys + that match the regular expressions in the `sensitiveKeys` array will be replaced with the string + '[REDACTED]'. This helps to prevent sensitive information from being logged or displayed. */ +const sensitiveKeys = [ + /authtoken/i, + /^email$/, + /^password$/i, + /secret/i, + /token/i, + /api[-._]?key/i, + /management[-._]?token/i, + /delivery[-._]?token/i, +]; diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index b7a86e1a40..e28d939fdf 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -26,7 +26,7 @@ "typescript": "^5.7.3" }, "dependencies": { - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.17.0" diff --git a/packages/contentstack-variants/src/utils/logger.ts b/packages/contentstack-variants/src/utils/logger.ts index ed71d80961..643080a905 100644 --- a/packages/contentstack-variants/src/utils/logger.ts +++ b/packages/contentstack-variants/src/utils/logger.ts @@ -1,7 +1,7 @@ import * as winston from 'winston'; import * as path from 'path'; import mkdirp from 'mkdirp'; -import { sanitizePath } from '@contentstack/cli-utilities'; +import { sanitizePath, redactObject } from '@contentstack/cli-utilities'; import { ExportConfig, ImportConfig } from '../types'; const slice = Array.prototype.slice; @@ -18,7 +18,10 @@ function returnString(args: unknown[]) { .map(function (item) { if (item && typeof item === 'object') { try { - return JSON.stringify(item).replace(/authtoken\":\d"blt................/g, 'authtoken":"blt....'); + const redactedObject = redactObject(item); + if(redactedObject && typeof redactedObject === 'object') { + return JSON.stringify(redactedObject); + } } catch (error) {} return item; } diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md index 99add0d3d2..05bb8c5ed3 100644 --- a/packages/contentstack/README.md +++ b/packages/contentstack/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli/1.37.0 darwin-arm64 node-v23.6.0 +@contentstack/cli/1.37.0 darwin-arm64 node-v22.14.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 8e74bfa1ed..7380354e61 100755 --- 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.37.0", + "version": "1.38.0", "author": "Contentstack", "bin": { "csdx": "./bin/run.js" @@ -28,17 +28,17 @@ "@contentstack/cli-cm-branches": "~1.3.0", "@contentstack/cli-cm-bulk-publish": "~1.7.3", "@contentstack/cli-cm-clone": "~1.13.2", - "@contentstack/cli-cm-export": "~1.15.0", + "@contentstack/cli-cm-export": "~1.15.1", "@contentstack/cli-cm-export-to-csv": "~1.7.3", - "@contentstack/cli-cm-import": "~1.20.0", - "@contentstack/cli-cm-import-setup": "1.1.0", + "@contentstack/cli-cm-import": "~1.20.1", + "@contentstack/cli-cm-import-setup": "1.1.1", "@contentstack/cli-cm-migrate-rte": "~1.4.21", "@contentstack/cli-cm-seed": "~1.10.2", "@contentstack/cli-command": "~1.3.3", "@contentstack/cli-config": "~1.10.0", "@contentstack/cli-launch": "^1.6.0", "@contentstack/cli-migration": "~1.6.5", - "@contentstack/cli-utilities": "~1.8.4", + "@contentstack/cli-utilities": "~1.9.0", "@contentstack/cli-variants": "~1.1.5", "@contentstack/management": "~1.18.4", "@oclif/core": "^3.27.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a384a5f75..23d538a03f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,17 +16,17 @@ importers: '@contentstack/cli-cm-branches': ~1.3.0 '@contentstack/cli-cm-bulk-publish': ~1.7.3 '@contentstack/cli-cm-clone': ~1.13.2 - '@contentstack/cli-cm-export': ~1.15.0 + '@contentstack/cli-cm-export': ~1.15.1 '@contentstack/cli-cm-export-to-csv': ~1.7.3 - '@contentstack/cli-cm-import': ~1.20.0 - '@contentstack/cli-cm-import-setup': 1.1.0 + '@contentstack/cli-cm-import': ~1.20.1 + '@contentstack/cli-cm-import-setup': 1.1.1 '@contentstack/cli-cm-migrate-rte': ~1.4.21 '@contentstack/cli-cm-seed': ~1.10.2 '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-config': ~1.10.0 '@contentstack/cli-launch': ^1.6.0 '@contentstack/cli-migration': ~1.6.5 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@contentstack/cli-variants': ~1.1.5 '@contentstack/management': ~1.18.4 '@oclif/core': ^3.27.0 @@ -130,7 +130,7 @@ importers: packages/contentstack-audit: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/plugin-help': ^5.2.20 '@oclif/plugin-plugins': ^5.4.34 '@oclif/test': ^4.1.11 @@ -189,7 +189,7 @@ importers: packages/contentstack-auth: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@fancy-test/nock': ^0.1.1 '@oclif/plugin-help': ^5.2.20 '@oclif/test': ^4.1.6 @@ -237,7 +237,7 @@ importers: specifiers: '@contentstack/cli-cm-seed': ~1.10.2 '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 '@types/inquirer': ^9.0.7 '@types/mkdirp': ^1.0.2 @@ -284,7 +284,7 @@ importers: specifiers: '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/core': ^3.27.0 '@oclif/plugin-help': ^5.2.20 '@types/flat': ^5.0.5 @@ -328,7 +328,7 @@ importers: packages/contentstack-bulk-publish: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 chai: ^4.5.0 chalk: ^4.1.2 @@ -364,7 +364,7 @@ importers: '@contentstack/cli-cm-export': ~1.15.0 '@contentstack/cli-cm-import': ~1.20.0 '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 chai: ^4.5.0 chalk: ^4.1.2 @@ -407,7 +407,7 @@ importers: packages/contentstack-command: specifiers: - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 '@types/mkdirp': ^1.0.2 '@types/mocha': ^8.2.3 @@ -439,7 +439,7 @@ importers: packages/contentstack-config: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 '@types/chai': ^4.3.20 '@types/mocha': ^8.2.3 @@ -508,7 +508,7 @@ importers: '@contentstack/cli-command': ~1.3.3 '@contentstack/cli-config': ~1.10.0 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@contentstack/cli-variants': ~1.1.5 '@oclif/core': ^3.27.0 '@oclif/plugin-help': ^5.2.20 @@ -572,7 +572,7 @@ importers: packages/contentstack-export-to-csv: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.9 '@types/chai': ^4.3.20 '@types/mocha': ^10.0.10 @@ -610,7 +610,7 @@ importers: specifiers: '@contentstack/cli-audit': ~1.9.0 '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@contentstack/cli-variants': ~1.1.5 '@contentstack/management': ~1.18.4 '@oclif/core': ^3.27.0 @@ -684,7 +684,7 @@ importers: packages/contentstack-import-setup: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/core': ^3.27.0 '@types/big-json': ^3.2.5 '@types/bluebird': ^3.5.42 @@ -745,7 +745,7 @@ importers: packages/contentstack-migrate-rte: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@contentstack/json-rte-serializer': ~2.0.11 '@oclif/test': ^4.1.6 chai: ^4.5.0 @@ -786,7 +786,7 @@ importers: packages/contentstack-migration: specifiers: '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.6 async: ^3.2.6 callsites: ^3.1.0 @@ -824,7 +824,7 @@ importers: specifiers: '@contentstack/cli-cm-import': ~1.20.0 '@contentstack/cli-command': ~1.3.3 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@contentstack/management': ~1.18.4 '@types/inquirer': ^9.0.7 '@types/jest': ^26.0.24 @@ -963,7 +963,7 @@ importers: packages/contentstack-variants: specifiers: '@contentstack/cli-dev-dependencies': ^1.2.4 - '@contentstack/cli-utilities': ~1.8.4 + '@contentstack/cli-utilities': ~1.9.0 '@oclif/test': ^4.1.9 '@types/node': ^20.17.17 lodash: ^4.17.21