diff --git a/.talismanrc b/.talismanrc index e3d432c8a4..0cb0efda83 100644 --- a/.talismanrc +++ b/.talismanrc @@ -1,8 +1,6 @@ fileignoreconfig: - - filename: packages/contentstack-export-to-csv/src/types/index.ts - checksum: 28c19efb0c13969d40df964f86fa6de444316e320801f19dee7392df7a36851d - - filename: package-lock.json - checksum: 8622177c9f0bd80a3cedcb2e562ee0a9bb24436fea4c96724277b42d8c813496 - - filename: pnpm-lock.yaml - checksum: ace2f01074f779a648ca15f76cde1b88489e2f7f741fb469772ad706209c0fe9 +- filename: package-lock.json + checksum: 9bc80890e9aff310a9288fdc9fbaccb2652594b2e92f95f8b17f5d4a2be45f81 +- filename: pnpm-lock.yaml + checksum: 70c84ad3ad7bcee1ed18cd49d921bce674c25fa4b20dfacd9dc3bd5a20ecee6b version: '1.0' diff --git a/package-lock.json b/package-lock.json index a26bb29fa0..93c246098f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -574,14 +574,14 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.972.2", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.2.tgz", - "integrity": "sha512-Lz1J5IZdTjLYTVIcDP5DVDgi1xlgsF3p1cnvmbfKbjCRhQpftN2e2J4NFfRRvPD54W9+bZ8l5VipPXtTYK7aEg==", + "version": "3.972.3", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.3.tgz", + "integrity": "sha512-iu+JwWHM7tHowKqE+8wNmI3sM6mPEiI9Egscz2BEV7adyKmV95oR9tBO4VIOl72FGDi7X9mXg19VtqIpSkEEsA==", "dev": true, "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-provider-env": "^3.972.2", - "@aws-sdk/credential-provider-http": "^3.972.3", + "@aws-sdk/credential-provider-http": "^3.972.4", "@aws-sdk/credential-provider-ini": "^3.972.2", "@aws-sdk/credential-provider-process": "^3.972.2", "@aws-sdk/credential-provider-sso": "^3.972.2", @@ -8582,9 +8582,9 @@ } }, "node_modules/ci-info": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", - "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", + "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==", "dev": true, "funding": [ { @@ -26809,7 +26809,7 @@ "@contentstack/cli-config": "~1.18.0", "@contentstack/cli-launch": "^1.9.2", "@contentstack/cli-migration": "~1.10.3", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/cli-variants": "~1.3.7", "@contentstack/management": "~1.27.3", "@oclif/core": "^4.3.0", @@ -26866,7 +26866,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "@oclif/plugin-plugins": "^5.4.54", @@ -26940,7 +26940,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "otplib": "^12.0.1" @@ -27092,7 +27092,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.14.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "inquirer": "8.2.7", @@ -27162,7 +27162,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", @@ -27196,7 +27196,7 @@ "dependencies": { "@contentstack/cli-command": "~1.7.2", "@contentstack/cli-config": "~1.18.0", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", @@ -27227,7 +27227,7 @@ "@contentstack/cli-cm-export": "~1.23.1", "@contentstack/cli-cm-import": "~1.31.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", @@ -27341,7 +27341,7 @@ "version": "1.7.2", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "contentstack": "^3.25.3" @@ -27405,7 +27405,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "lodash": "^4.17.21" @@ -27739,7 +27739,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/cli-variants": "~1.3.7", "@oclif/core": "^4.3.3", "async": "^3.2.6", @@ -27788,7 +27788,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.8.0", "@oclif/plugin-help": "^6.2.32", "fast-csv": "^4.3.6", @@ -28004,7 +28004,7 @@ "dependencies": { "@contentstack/cli-audit": "~1.17.1", "@contentstack/cli-command": "~1.7.1", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/cli-variants": "~1.3.7", "@contentstack/management": "~1.27.3", "@oclif/core": "^4.3.0", @@ -28052,7 +28052,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "big-json": "^3.2.0", "chalk": "^4.1.2", @@ -28095,7 +28095,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/json-rte-serializer": "~2.1.0", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", @@ -28127,7 +28127,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "async": "^3.2.6", @@ -28159,7 +28159,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.31.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/management": "~1.27.3", "inquirer": "8.2.7", "mkdirp": "^1.0.4", @@ -28225,7 +28225,7 @@ }, "packages/contentstack-utilities": { "name": "@contentstack/cli-utilities", - "version": "1.17.0", + "version": "1.17.1", "license": "MIT", "dependencies": { "@contentstack/management": "~1.27.3", @@ -28290,7 +28290,7 @@ "version": "1.3.7", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "lodash": "^4.17.21", diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 08a5d91776..da9b229800 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "@oclif/plugin-plugins": "^5.4.54", @@ -85,4 +85,4 @@ "keywords": [ "oclif" ] -} +} \ No newline at end of file diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index 69cf1a2be2..80bd436b93 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "otplib": "^12.0.1" @@ -81,4 +81,4 @@ } }, "repository": "contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index eb7b4d10c9..9e546a503c 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -18,7 +18,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.14.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "inquirer": "8.2.7", @@ -72,4 +72,4 @@ } }, "repository": "contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 61d0e2b9c1..874e349f3b 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -8,7 +8,7 @@ "@contentstack/cli-command": "~1.7.2", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "chalk": "^4.1.2", "just-diff": "^6.0.2", "lodash": "^4.17.21" @@ -79,4 +79,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index d8aeb2d046..b1676ab90a 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-command": "~1.7.2", "@contentstack/cli-config": "~1.18.0", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", @@ -97,4 +97,4 @@ "version": "oclif readme && git add README.md", "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo" } -} +} \ No newline at end of file diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index d1bb28f38e..9ef9fe5566 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -9,7 +9,7 @@ "@contentstack/cli-cm-export": "~1.23.1", "@contentstack/cli-cm-import": "~1.31.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", @@ -82,4 +82,4 @@ "cm:stack-clone": "O-CLN" } } -} +} \ No newline at end of file diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json index c250a9d370..fd2522fc75 100644 --- a/packages/contentstack-command/package.json +++ b/packages/contentstack-command/package.json @@ -19,7 +19,7 @@ "test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\"" }, "dependencies": { - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "contentstack": "^3.25.3", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28" @@ -64,4 +64,4 @@ "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-command/<%- commandPath %>" }, "repository": "contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index af5ac17e96..e902d9c293 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "lodash": "^4.17.21" @@ -80,4 +80,4 @@ } }, "repository": "contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json index 2becc9cf4e..a76b147bea 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.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.8.0", "@oclif/plugin-help": "^6.2.32", "fast-csv": "^4.3.6", @@ -77,4 +77,4 @@ "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"", "version": "oclif readme && git add README.md" } -} +} \ No newline at end of file diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 49faa0d374..988ccbe571 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -8,7 +8,7 @@ "@contentstack/cli-command": "~1.7.2", "@oclif/core": "^4.3.3", "@contentstack/cli-variants": "~1.3.7", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "async": "^3.2.6", "big-json": "^3.2.0", "bluebird": "^3.7.2", @@ -98,4 +98,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json index 23eb9b486c..6a1198a5bc 100644 --- a/packages/contentstack-import-setup/package.json +++ b/packages/contentstack-import-setup/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "big-json": "^3.2.0", "chalk": "^4.1.2", @@ -83,4 +83,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 580d2ec63f..b000eb58d2 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-audit": "~1.17.1", "@contentstack/cli-command": "~1.7.1", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/management": "~1.27.3", "@contentstack/cli-variants": "~1.3.7", "@oclif/core": "^4.3.0", @@ -95,4 +95,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json index 01cbaf5ba3..56cbd90529 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.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/json-rte-serializer": "~2.1.0", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", @@ -66,4 +66,4 @@ "cm:migrate-rte": "O-MGRTRTE" } } -} +} \ No newline at end of file diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json index f274579270..95964d2145 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.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "async": "^3.2.6", @@ -63,4 +63,4 @@ "cm:migration": "O-MGRTN" } } -} +} \ No newline at end of file diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 5847a3a885..8c8929975b 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.31.2", "@contentstack/cli-command": "~1.7.2", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/management": "~1.27.3", "inquirer": "8.2.7", "mkdirp": "^1.0.4", @@ -71,4 +71,4 @@ "version": "oclif readme && git add README.md", "clean": "rm -rf ./node_modules tsconfig.build.tsbuildinfo" } -} +} \ No newline at end of file diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json index d42911e1ab..baecaeaf4c 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-utilities", - "version": "1.17.0", + "version": "1.17.1", "description": "Utilities for contentstack projects", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -81,4 +81,4 @@ "ts-node": "^10.9.2", "typescript": "^4.9.5" } -} +} \ No newline at end of file diff --git a/packages/contentstack-utilities/src/auth-handler.ts b/packages/contentstack-utilities/src/auth-handler.ts index c7157fd33e..cc9c21a2f6 100644 --- a/packages/contentstack-utilities/src/auth-handler.ts +++ b/packages/contentstack-utilities/src/auth-handler.ts @@ -4,7 +4,7 @@ import dotenv from 'dotenv'; import open from 'open'; import http from 'http'; import url from 'url'; -import { LoggerService } from './logger'; +import { handleAndLogError } from './logger/log'; import managementSDKClient, { ContentstackClient } from './contentstack-management-sdk'; import { formatError } from './helpers'; @@ -33,7 +33,6 @@ class AuthHandler { private authorisationTypeOAUTHValue: string; private authorisationTypeAUTHValue: string; private allAuthConfigItems: any; - private logger: any; private oauthHandler: any; private managementAPIClient: ContentstackClient; private isRefreshingToken: boolean = false; // Flag to track if a refresh operation is in progress @@ -98,9 +97,6 @@ class AuthHandler { } return cma; } - initLog() { - this.logger = new LoggerService(process.cwd(), 'cli-log'); - } async setOAuthBaseURL() { if (configHandler.get('region')['uiHost']) { this.OAuthBaseURL = configHandler.get('region')['uiHost'] || ''; @@ -132,12 +128,11 @@ class AuthHandler { */ async oauth(): Promise { try { - this.initLog(); await this.initSDK(); await this.createHTTPServer(); await this.openOAuthURL(); } catch (error) { - this.logger.error('OAuth login failed!', error.message); + handleAndLogError(error, { module: 'auth-handler' }, 'OAuth login failed!'); throw error; } } diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index a0143dfa46..8a63049c4c 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -27,11 +27,11 @@ "typescript": "^5.8.3" }, "dependencies": { - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@oclif/core": "^4.3.0", "@oclif/plugin-help": "^6.2.28", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.17.0" } -} +} \ No newline at end of file diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index facce89359..6b8fc757fd 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -38,7 +38,7 @@ "@contentstack/cli-config": "~1.18.0", "@contentstack/cli-launch": "^1.9.2", "@contentstack/cli-migration": "~1.10.3", - "@contentstack/cli-utilities": "~1.17.0", + "@contentstack/cli-utilities": "~1.17.1", "@contentstack/cli-variants": "~1.3.7", "@contentstack/management": "~1.27.3", "@oclif/core": "^4.3.0", @@ -167,4 +167,4 @@ } }, "repository": "https://github.com/contentstack/cli" -} +} \ No newline at end of file diff --git a/packages/contentstack/src/hooks/prerun/auth-guard.ts b/packages/contentstack/src/hooks/prerun/auth-guard.ts index 94898da40f..e42bc35bef 100644 --- a/packages/contentstack/src/hooks/prerun/auth-guard.ts +++ b/packages/contentstack/src/hooks/prerun/auth-guard.ts @@ -1,13 +1,13 @@ import { cliux, managementSDKClient, - isAuthenticated + isAuthenticated, + log, + handleAndLogError } from '@contentstack/cli-utilities'; -import {LoggerService} from '@contentstack/cli-utilities' // TBD: run region command if region is not there export default async function (opts): Promise { - const newLogger = new LoggerService(process.cwd(),'cli-log'); const { context: { plugin: { config: { protectedCommands = {} } = {} } = {}, region = null } = {} } = this.config; if (opts.Command.id !== 'config:set:region') { if (!region) { @@ -20,7 +20,7 @@ export default async function (opts): Promise { // Auth guard if (protectedCommands[opts.Command.id]) { if (!isAuthenticated()) { - newLogger.error('No auth token found for command.', opts.Command.id); + handleAndLogError(new Error('Authentication required for this command'), { module: 'auth-guard', commandId: opts.Command.id }); cliux.error('Please log in to execute the command'); this.exit(); } @@ -28,13 +28,13 @@ export default async function (opts): Promise { try { const result = await client.getUser(); if (!result) { - newLogger.error('Error in auth validation'); + handleAndLogError(new Error('Error in auth validation'), { module: 'auth-guard' }); cliux.error('Please log in to execute the command'); this.exit(); } - newLogger.debug('Logged-in user', result.data); + log.debug('Logged-in user', { module: 'auth-guard', userData: result.data }); } catch (error) { - newLogger.error('Error in auth validation', error); + handleAndLogError(error, { module: 'auth-guard' }, 'Error in auth validation'); cliux.error('Please log in to execute the command'); process.exit(); } diff --git a/packages/contentstack/src/hooks/prerun/latest-version-warning.ts b/packages/contentstack/src/hooks/prerun/latest-version-warning.ts index 581a695b0e..05a9a80e18 100644 --- a/packages/contentstack/src/hooks/prerun/latest-version-warning.ts +++ b/packages/contentstack/src/hooks/prerun/latest-version-warning.ts @@ -1,4 +1,4 @@ -import { cliux, configHandler, HttpClient, LoggerService } from '@contentstack/cli-utilities'; +import { cliux, configHandler, HttpClient, handleAndLogError } from '@contentstack/cli-utilities'; import * as semver from 'semver'; import { IVersionUpgradeCache, IVersionUpgradeWarningFrequency } from '../../interfaces'; @@ -8,7 +8,6 @@ const versionUpgradeWarningFrequency: IVersionUpgradeWarningFrequency = { export default async function (_opts): Promise { const now = Date.now(); const today = new Date().toISOString().split('T')[0]; - const logger: LoggerService = new LoggerService(process.env.CS_CLI_LOG_PATH || process.cwd(), 'cli-log'); let cache: IVersionUpgradeCache = { lastChecked: 0, lastWarnedDate: '', latestVersion: '' }; // if CLI_VERSION is not set or is not the same as the current version, set it @@ -36,7 +35,7 @@ export default async function (_opts): Promise { const latestVersion = (await httpClient.get(`https://registry.npmjs.org/@contentstack/cli/latest`))?.data ?.version; if (!latestVersion) { - logger.error('Failed to retrieve the latest version from the registry.'); + handleAndLogError(new Error('Failed to retrieve the latest version from the registry.'), { module: 'latest-version-warning' }); return; } cache.latestVersion = latestVersion; @@ -45,7 +44,7 @@ export default async function (_opts): Promise { // Save updated cache configHandler.set('versionUpgradeWarningCache', cache); } catch (error) { - logger.error('Failed to check the latest version', error); + handleAndLogError(error, { module: 'latest-version-warning' }, 'Failed to check the latest version'); return; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80cd5394b0..979dee960c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,7 +28,7 @@ importers: '@contentstack/cli-config': ~1.18.0 '@contentstack/cli-launch': ^1.9.2 '@contentstack/cli-migration': ~1.10.3 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@contentstack/cli-variants': ~1.3.7 '@contentstack/management': ~1.27.3 '@oclif/core': ^4.3.0 @@ -132,7 +132,7 @@ importers: packages/contentstack-audit: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/plugin-plugins': ^5.4.54 @@ -193,7 +193,7 @@ importers: packages/contentstack-auth: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@fancy-test/nock': ^0.1.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 @@ -245,7 +245,7 @@ importers: specifiers: '@contentstack/cli-cm-seed': ~1.14.2 '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -296,7 +296,7 @@ importers: specifiers: '@contentstack/cli-command': ~1.7.2 '@contentstack/cli-dev-dependencies': ~1.3.0 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@types/flat': ^5.0.5 @@ -341,7 +341,7 @@ importers: specifiers: '@contentstack/cli-command': ~1.7.2 '@contentstack/cli-config': ~1.18.0 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -382,7 +382,7 @@ importers: '@contentstack/cli-cm-export': ~1.23.1 '@contentstack/cli-cm-import': ~1.31.2 '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -441,7 +441,7 @@ importers: packages/contentstack-command: specifiers: - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -477,7 +477,7 @@ importers: packages/contentstack-config: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -550,7 +550,7 @@ importers: '@contentstack/cli-command': ~1.7.2 '@contentstack/cli-config': ~1.18.0 '@contentstack/cli-dev-dependencies': ~1.3.1 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@contentstack/cli-variants': ~1.3.7 '@oclif/core': ^4.3.3 '@oclif/plugin-help': ^6.2.28 @@ -626,7 +626,7 @@ importers: packages/contentstack-export-to-csv: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.8.0 '@oclif/plugin-help': ^6.2.32 '@oclif/test': ^4.1.13 @@ -682,7 +682,7 @@ importers: specifiers: '@contentstack/cli-audit': ~1.17.1 '@contentstack/cli-command': ~1.7.1 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@contentstack/cli-variants': ~1.3.7 '@contentstack/management': ~1.27.3 '@oclif/core': ^4.3.0 @@ -760,7 +760,7 @@ importers: packages/contentstack-import-setup: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@types/big-json': ^3.2.5 '@types/bluebird': ^3.5.42 @@ -827,7 +827,7 @@ importers: packages/contentstack-migrate-rte: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@contentstack/json-rte-serializer': ~2.1.0 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 @@ -872,7 +872,7 @@ importers: packages/contentstack-migration: specifiers: '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -916,7 +916,7 @@ importers: specifiers: '@contentstack/cli-cm-import': ~1.31.2 '@contentstack/cli-command': ~1.7.2 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@contentstack/management': ~1.27.3 '@types/inquirer': ^9.0.8 '@types/jest': ^26.0.24 @@ -1063,7 +1063,7 @@ importers: packages/contentstack-variants: specifiers: '@contentstack/cli-dev-dependencies': ^1.3.0 - '@contentstack/cli-utilities': ~1.17.0 + '@contentstack/cli-utilities': ~1.17.1 '@oclif/core': ^4.3.0 '@oclif/plugin-help': ^6.2.28 '@oclif/test': ^4.1.13 @@ -1199,7 +1199,7 @@ packages: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 '@aws-sdk/core': 3.973.4 - '@aws-sdk/credential-provider-node': 3.972.2 + '@aws-sdk/credential-provider-node': 3.972.3 '@aws-sdk/middleware-host-header': 3.972.2 '@aws-sdk/middleware-logger': 3.972.2 '@aws-sdk/middleware-recursion-detection': 3.972.2 @@ -1249,7 +1249,7 @@ packages: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 '@aws-sdk/core': 3.973.4 - '@aws-sdk/credential-provider-node': 3.972.2 + '@aws-sdk/credential-provider-node': 3.972.3 '@aws-sdk/middleware-bucket-endpoint': 3.972.2 '@aws-sdk/middleware-expect-continue': 3.972.2 '@aws-sdk/middleware-flexible-checksums': 3.972.2 @@ -1461,8 +1461,8 @@ packages: - aws-crt dev: true - /@aws-sdk/credential-provider-node/3.972.2: - resolution: {integrity: sha512-Lz1J5IZdTjLYTVIcDP5DVDgi1xlgsF3p1cnvmbfKbjCRhQpftN2e2J4NFfRRvPD54W9+bZ8l5VipPXtTYK7aEg==} + /@aws-sdk/credential-provider-node/3.972.3: + resolution: {integrity: sha512-iu+JwWHM7tHowKqE+8wNmI3sM6mPEiI9Egscz2BEV7adyKmV95oR9tBO4VIOl72FGDi7X9mXg19VtqIpSkEEsA==} engines: {node: '>=20.0.0'} dependencies: '@aws-sdk/credential-provider-env': 3.972.2 @@ -7324,8 +7324,8 @@ packages: engines: {node: '>=8'} dev: true - /ci-info/4.3.1: - resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==} + /ci-info/4.4.0: + resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==} engines: {node: '>=8'} dev: true @@ -8960,7 +8960,7 @@ packages: dependencies: '@babel/helper-validator-identifier': 7.28.5 '@eslint-community/eslint-utils': 4.9.1_eslint@8.57.1 - ci-info: 4.3.1 + ci-info: 4.4.0 clean-regexp: 1.0.0 core-js-compat: 3.48.0 eslint: 8.57.1