Merge remote-tracking branch 'origin/main' into cd/large-bulk-export-nut

.github/workflows/onRelease.yml

@@ -25,7 +25,7 @@ jobs:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
     needs: [getDistTag]
     with:
-      ctc: true
+      # ctc: true
       sign: true
       tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}

.github/workflows/test.yml

@@ -31,6 +31,7 @@ jobs:
           - 'yarn test:nuts:data:record'
           - 'yarn test:nuts:data:search'
           - 'yarn test:nuts:data:tree'
+          - 'yarn test:nuts:force:data:bulk-upsert-delete-status'
       fail-fast: false
     with:
       os: ${{ matrix.os }}

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [4.0.6](https://github.com/salesforcecli/plugin-data/compare/4.0.5...4.0.6) (2025-01-26)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 8.8.0 to 8.8.2 ([ea31bd8](https://github.com/salesforcecli/plugin-data/commit/ea31bd8ce6d0df873d2a6ac66f539b109a217641))
+
+## [4.0.5](https://github.com/salesforcecli/plugin-data/compare/4.0.4...4.0.5) (2025-01-26)
+
+### Bug Fixes
+
+- **deps:** bump ansis from 3.8.1 to 3.9.0 ([fcefcae](https://github.com/salesforcecli/plugin-data/commit/fcefcaeb231250c57dcb3f9c5be43457d6635bdc))
+
+## [4.0.4](https://github.com/salesforcecli/plugin-data/compare/4.0.3...4.0.4) (2025-01-23)
+
+### Bug Fixes
+
+- **bulk-v1:** properly handle +1 job batches ([a791be9](https://github.com/salesforcecli/plugin-data/commit/a791be9daeaf0206c85806d00fa6b609fd890521))
+
 ## [4.0.3](https://github.com/salesforcecli/plugin-data/compare/4.0.2...4.0.3) (2025-01-19)
 
 ### Bug Fixes

README.md

@@ -145,7 +145,7 @@ EXAMPLES
     $ sf data bulk results --job-id 7507i000fake341G --target-org my-scratch
 ```
 
-_See code: [src/commands/data/bulk/results.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/bulk/results.ts)_
+_See code: [src/commands/data/bulk/results.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/bulk/results.ts)_
 
 ## `sf data create file`
 
@@ -194,7 +194,7 @@ EXAMPLES
     $ sf data create file --file path/to/astro.png --parent-id a03fakeLoJWPIA3
 ```
 
-_See code: [src/commands/data/create/file.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/create/file.ts)_
+_See code: [src/commands/data/create/file.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/create/file.ts)_
 
 ## `sf data create record`
 
@@ -250,7 +250,7 @@ EXAMPLES
       TracedEntityId=01p17000000R6bLAAS"
 ```
 
-_See code: [src/commands/data/create/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/create/record.ts)_
+_See code: [src/commands/data/create/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/create/record.ts)_
 
 ## `sf data delete bulk`
 
@@ -311,7 +311,7 @@ FLAG DESCRIPTIONS
     and can be enabled only by a system administrator.
 ```
 
-_See code: [src/commands/data/delete/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/delete/bulk.ts)_
+_See code: [src/commands/data/delete/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/delete/bulk.ts)_
 
 ## `sf data delete record`
 
@@ -372,7 +372,7 @@ EXAMPLES
     $ sf data delete record --use-tooling-api --sobject TraceFlag --record-id 7tf8c
 ```
 
-_See code: [src/commands/data/delete/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/delete/record.ts)_
+_See code: [src/commands/data/delete/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/delete/record.ts)_
 
 ## `sf data delete resume`
 
@@ -411,7 +411,7 @@ EXAMPLES
     $ sf data delete resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [src/commands/data/delete/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/delete/resume.ts)_
+_See code: [src/commands/data/delete/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/delete/resume.ts)_
 
 ## `sf data export bulk`
 
@@ -485,7 +485,7 @@ EXAMPLES
       --result-format json --async
 ```
 
-_See code: [src/commands/data/export/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/export/bulk.ts)_
+_See code: [src/commands/data/export/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/export/bulk.ts)_
 
 ## `sf data export resume`
 
@@ -521,7 +521,7 @@ EXAMPLES
     $ sf data export resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [src/commands/data/export/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/export/resume.ts)_
+_See code: [src/commands/data/export/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/export/resume.ts)_
 
 ## `sf data export tree`
 
@@ -581,7 +581,7 @@ EXAMPLES
       my-scratch
 ```
 
-_See code: [src/commands/data/export/tree.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/export/tree.ts)_
+_See code: [src/commands/data/export/tree.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/export/tree.ts)_
 
 ## `sf data get record`
 
@@ -645,7 +645,7 @@ EXAMPLES
     $ sf data get record --use-tooling-api --sobject TraceFlag --record-id 7tf8c
 ```
 
-_See code: [src/commands/data/get/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/get/record.ts)_
+_See code: [src/commands/data/get/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/get/record.ts)_
 
 ## `sf data import bulk`
 
@@ -703,7 +703,7 @@ EXAMPLES
     $ sf data import bulk --file accounts.csv --sobject Account --async
 ```
 
-_See code: [src/commands/data/import/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/import/bulk.ts)_
+_See code: [src/commands/data/import/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/import/bulk.ts)_
 
 ## `sf data import resume`
 
@@ -739,7 +739,7 @@ EXAMPLES
     $ sf data import resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [src/commands/data/import/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/import/resume.ts)_
+_See code: [src/commands/data/import/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/import/resume.ts)_
 
 ## `sf data import tree`
 
@@ -803,7 +803,7 @@ FLAG DESCRIPTIONS
     - files(array) - Files: An array of files paths to load
 ```
 
-_See code: [src/commands/data/import/tree.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/import/tree.ts)_
+_See code: [src/commands/data/import/tree.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/import/tree.ts)_
 
 ## `sf data query`
 
@@ -869,7 +869,7 @@ EXAMPLES
     $ sf data query --query "SELECT Id FROM Contact" --bulk --wait 0
 ```
 
-_See code: [src/commands/data/query.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/query.ts)_
+_See code: [src/commands/data/query.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/query.ts)_
 
 ## `sf data query resume`
 
@@ -906,7 +906,7 @@ EXAMPLES
     $ sf data query resume --bulk-query-id 7500x000005BdFzXXX
 ```
 
-_See code: [src/commands/data/query/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/query/resume.ts)_
+_See code: [src/commands/data/query/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/query/resume.ts)_
 
 ## `sf data resume`
 
@@ -943,7 +943,7 @@ EXAMPLES
     $ sf data resume --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA
 ```
 
-_See code: [src/commands/data/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/resume.ts)_
+_See code: [src/commands/data/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/resume.ts)_
 
 ## `sf data search`
 
@@ -993,7 +993,7 @@ EXAMPLES
     $ sf data search --file query.txt --target-org my-scratch --result-format csv
 ```
 
-_See code: [src/commands/data/search.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/search.ts)_
+_See code: [src/commands/data/search.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/search.ts)_
 
 ## `sf data update bulk`
 
@@ -1054,7 +1054,7 @@ EXAMPLES
     $ sf data update bulk --file accounts.csv --sobject Account --async
 ```
 
-_See code: [src/commands/data/update/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/update/bulk.ts)_
+_See code: [src/commands/data/update/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/update/bulk.ts)_
 
 ## `sf data update record`
 
@@ -1116,7 +1116,7 @@ EXAMPLES
       "ExpirationDate=2017-12-01T00:58:04.000+0000"
 ```
 
-_See code: [src/commands/data/update/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/update/record.ts)_
+_See code: [src/commands/data/update/record.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/update/record.ts)_
 
 ## `sf data update resume`
 
@@ -1152,7 +1152,7 @@ EXAMPLES
     $ sf data update resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [src/commands/data/update/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/update/resume.ts)_
+_See code: [src/commands/data/update/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/update/resume.ts)_
 
 ## `sf data upsert bulk`
 
@@ -1211,7 +1211,7 @@ EXAMPLES
       my-scratch
 ```
 
-_See code: [src/commands/data/upsert/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/upsert/bulk.ts)_
+_See code: [src/commands/data/upsert/bulk.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/upsert/bulk.ts)_
 
 ## `sf data upsert resume`
 
@@ -1250,7 +1250,7 @@ EXAMPLES
     $ sf data upsert resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [src/commands/data/upsert/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/data/upsert/resume.ts)_
+_See code: [src/commands/data/upsert/resume.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/data/upsert/resume.ts)_
 
 ## `sf force data bulk delete`
 
@@ -1297,7 +1297,7 @@ EXAMPLES
     $ sf force data bulk delete --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch
 ```
 
-_See code: [src/commands/force/data/bulk/delete.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/force/data/bulk/delete.ts)_
+_See code: [src/commands/force/data/bulk/delete.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/force/data/bulk/delete.ts)_
 
 ## `sf force data bulk status`
 
@@ -1334,7 +1334,7 @@ EXAMPLES
     $ sf force data bulk status --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA --target-org my-scratch
 ```
 
-_See code: [src/commands/force/data/bulk/status.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/force/data/bulk/status.ts)_
+_See code: [src/commands/force/data/bulk/status.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/force/data/bulk/status.ts)_
 
 ## `sf force data bulk upsert`
 
@@ -1392,6 +1392,6 @@ EXAMPLES
       --target-org my-scratch
 ```
 
-_See code: [src/commands/force/data/bulk/upsert.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.3/src/commands/force/data/bulk/upsert.ts)_
+_See code: [src/commands/force/data/bulk/upsert.ts](https://github.com/salesforcecli/plugin-data/blob/4.0.6/src/commands/force/data/bulk/upsert.ts)_
 
 <!-- commandsstop -->

messages/batcher.md

@@ -18,7 +18,7 @@ Batch Status
 
 Will poll the batch statuses every %s seconds.
 To fetch the status on your own, press CTRL+C and use the command:
-sf force data bulk status -i %s -b [<batchId>]
+sf force data bulk status -i %s -b %s
 
 # ExternalIdRequired
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/plugin-data",
-  "version": "4.0.3",
+  "version": "4.0.6",
   "description": "Plugin for salesforce data commands",
   "author": "Salesforce",
   "homepage": "https://github.com/salesforcecli/plugin-data",
@@ -114,17 +114,18 @@
     "test:nuts:data:search": "nyc mocha \"./test/commands/data/search.nut.ts\" --slow 4500 --timeout 600000 --parallel --jobs 20",
     "test:nuts:data:create": "nyc mocha \"./test/commands/data/create/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --jobs 20",
     "test:nuts:data:bulk-upsert-delete": "nyc mocha \"./test/commands/data/dataBulk.nut.ts\" --slow 4500 --timeout 600000 --parallel --jobs 20",
+    "test:nuts:force:data:bulk-upsert-delete-status": "nyc mocha \"./test/commands/force/data/bulk/dataBulk.nut.ts\" --slow 4500 --timeout 600000 --parallel --jobs 20",
     "test:only": "wireit",
     "version": "oclif readme"
   },
   "dependencies": {
-    "@jsforce/jsforce-node": "^3.6.3",
+    "@jsforce/jsforce-node": "^3.6.4",
     "@oclif/multi-stage-output": "^0.8.5",
-    "@salesforce/core": "^8.6.1",
+    "@salesforce/core": "^8.8.2",
     "@salesforce/kit": "^3.2.2",
     "@salesforce/sf-plugins-core": "^12.1.2",
     "@salesforce/ts-types": "^2.0.11",
-    "ansis": "^3.6.0",
+    "ansis": "^3.9.0",
     "change-case": "^5.4.4",
     "csv-parse": "^5.6.0",
     "csv-stringify": "^6.5.2",
@@ -139,7 +140,7 @@
     "@salesforce/dev-scripts": "^10.2.11",
     "@salesforce/plugin-command-reference": "^3.1.38",
     "@salesforce/types": "^1.3.0",
-    "eslint-plugin-sf-plugin": "^1.20.13",
+    "eslint-plugin-sf-plugin": "^1.20.14",
     "oclif": "^4.17.10",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3"