From b9fd5ef831c6e18b8ca8ac60bb8683a7f905e107 Mon Sep 17 00:00:00 2001 From: soridalac Date: Wed, 14 May 2025 16:37:57 -0700 Subject: [PATCH 1/3] fix: remove the 'eslint-disable/messages' line --- src/bulkIngest.ts | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/bulkIngest.ts b/src/bulkIngest.ts index ff2f709e..84f1dc85 100644 --- a/src/bulkIngest.ts +++ b/src/bulkIngest.ts @@ -140,9 +140,7 @@ export async function bulkIngest(opts: { throw messages.createError( 'error.failedRecordDetails', [jobInfo.numberRecordsFailed], - // remove after W-17099874 gets fixed - // eslint-disable-next-line sf-plugin/no-missing-messages - [conn.getUsername(), job.id] + [conn.getUsername(), job.id, conn.getUsername(), job.id] ); } @@ -167,14 +165,16 @@ export async function bulkIngest(opts: { if (jobInfo.state === 'Failed') { stages.error(); - // eslint-disable-next-line sf-plugin/no-missing-messages - throw messages.createError('error.jobFailed', [jobInfo.errorMessage], [conn.getUsername(), job.id]); + throw messages.createError( + 'error.jobFailed', + [jobInfo.errorMessage], + [conn.getUsername(), job.id, conn.getUsername(), job.id] + ); } if (jobInfo.state === 'Aborted') { stages.stop('aborted'); - // eslint-disable-next-line sf-plugin/no-missing-messages - throw messages.createError('error.jobAborted', [], [conn.getUsername(), job.id]); + throw messages.createError('error.jobAborted', [], [conn.getUsername(), job.id, conn.getUsername(), job.id]); } throw err; @@ -247,8 +247,7 @@ export async function bulkIngestResume(opts: { throw messages.createError( 'error.failedRecordDetails', [jobInfo.numberRecordsFailed], - // eslint-disable-next-line sf-plugin/no-missing-messages - [conn.getUsername(), job.id] + [conn.getUsername(), job.id, conn.getUsername(), job.id] ); } @@ -276,16 +275,20 @@ export async function bulkIngestResume(opts: { throw messages.createError( 'error.jobFailed', [jobInfo.errorMessage], - // eslint-disable-next-line sf-plugin/no-missing-messages - [conn.getUsername(), job.id], + [conn.getUsername(), job.id, conn.getUsername(), job.id], err as Error ); } if (jobInfo.state === 'Aborted') { stages.stop('aborted'); - // eslint-disable-next-line sf-plugin/no-missing-messages - throw messages.createError('error.jobAborted', [], [conn.getUsername(), job.id], err as Error); + + throw messages.createError( + 'error.jobAborted', + [], + [conn.getUsername(), job.id, conn.getUsername(), job.id], + err as Error + ); } throw err; From c8c74e772162248d97e221d0577fab44440314d8 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Wed, 14 May 2025 19:05:31 -0600 Subject: [PATCH 2/3] chore: bump to latest core lib --- package.json | 2 +- yarn.lock | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index b6d28eb2..b0b78ed1 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "dependencies": { "@jsforce/jsforce-node": "^3.6.6", "@oclif/multi-stage-output": "^0.8.13", - "@salesforce/core": "^8.10.3", + "@salesforce/core": "^8.11.0", "@salesforce/kit": "^3.2.2", "@salesforce/sf-plugins-core": "^12.2.1", "@salesforce/ts-types": "^2.0.11", diff --git a/yarn.lock b/yarn.lock index 584a9ab5..043013f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1699,10 +1699,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.10.1", "@salesforce/core@^8.10.3", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0", "@salesforce/core@^8.8.5": - version "8.10.3" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.10.3.tgz#3cc2c99d097757cb4b08dab921254cfa3a00c7c1" - integrity sha512-juqbU304TBrrjb8sZGw+QkeAJISKu4+v2XIMTCxGJoEjs4LLhsyI7/drxCUY+7FNye+veAGeJdn/PCxkKhSgcA== +"@salesforce/core@^8.10.1", "@salesforce/core@^8.11.0", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0", "@salesforce/core@^8.8.5": + version "8.11.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.11.0.tgz#23d5ddcc318008230258ab449e70a26f671123c2" + integrity sha512-S4UgHKUy1hykRQVaoYm+LSktQgRhI3ltAUoLGI25/Q8gYokERTa2E7MpPMb+X/kTpjJJvDlnQqelB/sQJs/AKA== dependencies: "@jsforce/jsforce-node" "^3.8.1" "@salesforce/kit" "^3.2.2" @@ -2213,21 +2213,7 @@ "@smithy/types" "^4.2.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.0.2.tgz#363854e946fbc5bc206ff82e79ada5d5c14be640" - integrity sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw== - dependencies: - "@smithy/is-array-buffer" "^4.0.0" - "@smithy/protocol-http" "^5.1.0" - "@smithy/types" "^4.2.0" - "@smithy/util-hex-encoding" "^4.0.0" - "@smithy/util-middleware" "^4.0.2" - "@smithy/util-uri-escape" "^4.0.0" - "@smithy/util-utf8" "^4.0.0" - tslib "^2.6.2" - -"@smithy/signature-v4@^5.1.0": +"@smithy/signature-v4@^5.0.2", "@smithy/signature-v4@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.0.tgz#2c56e5b278482b04383d84ea2c07b7f0a8eb8f63" integrity sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w== From 072d47578bee62293a739ed3b28d55860f9c52c0 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Wed, 14 May 2025 21:45:24 -0600 Subject: [PATCH 3/3] fix: ensure no static root logger for test --- test/api/data/tree/importPlan.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/api/data/tree/importPlan.test.ts b/test/api/data/tree/importPlan.test.ts index 97cf0e25..d2347064 100644 --- a/test/api/data/tree/importPlan.test.ts +++ b/test/api/data/tree/importPlan.test.ts @@ -105,6 +105,10 @@ describe('importPlan', () => { }); }); describe('plan validation', () => { + // ensure no static rootLogger + // @ts-expect-error private stuff + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + Logger.rootLogger = undefined; const logger = new Logger({ name: 'importPlanTest', useMemoryLogger: true }); afterEach(() => { // @ts-expect-error private stuff