Skip to content

fix: remove the 'eslint-disable/messages' line - W-18522032 #1246

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

Merged
shetzel merged 3 commits into from
May 15, 2025
Merged

fix: remove the 'eslint-disable/messages' line - W-18522032 #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9fd5ef
fix: remove the 'eslint-disable/messages' line
soridalac May 14, 2025
c8c74e7
chore: bump to latest core lib
shetzel May 15, 2025
072d475
fix: ensure no static root logger for test
shetzel May 15, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
29 changes: 16 additions & 13 deletions src/bulkIngest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
);
}

Expand All @@ -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;
Expand Down Expand Up @@ -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]
);
}

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions test/api/data/tree/importPlan.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 5 additions & 19 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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==
Expand Down
Loading