Merge pull request #1246 from salesforcecli/sl/W-18522032

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

Author: shetzel

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",

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;

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

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==