Skip to content

fix: default wait #763

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
mdonnalley merged 10 commits into from
Dec 14, 2023
Merged

fix: default wait #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ee133f
style: typo
mshanemc Dec 7, 2023
25ad267
chore: bump some deps
mshanemc Dec 7, 2023
cbbcbde
fix: use duration flag correctly
mshanemc Dec 7, 2023
b2a0ebb
chore: bump deps
mshanemc Dec 7, 2023
cb96053
Merge remote-tracking branch 'origin/main' into sm/fix-default-wait
mshanemc Dec 13, 2023
5b2a9a6
chore: jsforce downgrade
mshanemc Dec 13, 2023
a623596
test: pin jsforce to 28
mshanemc Dec 13, 2023
1c5893a
chore: restore jsforce to "beta"
mshanemc Dec 13, 2023
af0759f
fix: bump sf-plugins-core
mdonnalley Dec 14, 2023
68a26bf
chore: yarn-deduplicate
mdonnalley Dec 14, 2023
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
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"bin": "sf",
"devPlugins": [
"@oclif/plugin-help",
"@salesforce/plugin-settings",
"@oclif/plugin-command-snapshot",
"@salesforce/plugin-command-reference"
],
Expand Down Expand Up @@ -109,21 +108,21 @@
"version": "oclif readme"
},
"dependencies": {
"@oclif/core": "^3.13.1",
"@oclif/core": "^3.14.0",
"@salesforce/core": "^6.4.0",
"@salesforce/kit": "^3.0.15",
"@salesforce/sf-plugins-core": "^5.0.5",
"@salesforce/sf-plugins-core": "^5.0.10",
"@salesforce/ts-types": "^2.0.9",
"chalk": "^5.3.0",
"csv-parse": "^4.16.3",
"csv-stringify": "^6.4.5",
"jsforce": "^2.0.0-beta.28"
"jsforce": "^2.0.0-beta.29"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.0.4",
"@salesforce/cli-plugins-testkit": "^5.1.1",
"@salesforce/dev-scripts": "^8.1.2",
"@salesforce/plugin-command-reference": "^3.0.47",
"@salesforce/plugin-command-reference": "^3.0.51",
"@types/chai-as-promised": "^7.1.8",
"chai-as-promised": "^7.1.1",
"eslint-plugin-sf-plugin": "^1.16.15",
Expand Down
6 changes: 3 additions & 3 deletions src/BulkBaseCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export abstract class BulkBaseCommand extends SfCommand<BulkResultV2> {
protected wait = 0;
private numberRecordsProcessed = 0;
private numberRecordsFailed = 0;
private numberRecordSuceeded = 0;
private numberRecordSucceeded = 0;
private timeout = false;

protected displayBulkV2Result(jobInfo: JobInfoV2): void {
Expand Down Expand Up @@ -74,7 +74,7 @@ export abstract class BulkBaseCommand extends SfCommand<BulkResultV2> {
const jobInfo = await this.job.check();
this.numberRecordsProcessed = jobInfo.numberRecordsProcessed ?? 0;
this.numberRecordsFailed = jobInfo.numberRecordsFailed ?? 0;
this.numberRecordSuceeded = this.numberRecordsProcessed - this.numberRecordsFailed;
this.numberRecordSucceeded = this.numberRecordsProcessed - this.numberRecordsFailed;
this.spinner.status = `${this.getRemainingTimeStatus()}${this.getStage(
jobInfo.state
)}${this.getRemainingRecordsStatus()}`;
Expand Down Expand Up @@ -119,7 +119,7 @@ export abstract class BulkBaseCommand extends SfCommand<BulkResultV2> {
protected getRemainingRecordsStatus(): string {
// the leading space is intentional
return ` ${messages.getMessage('remainingRecordsStatus', [
this.numberRecordSuceeded,
this.numberRecordSucceeded,
this.numberRecordsFailed,
this.numberRecordsProcessed,
])}`;
Expand Down
2 changes: 1 addition & 1 deletion src/bulkOperationCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export abstract class BulkOperationCommand extends BulkBaseCommand {
unit: 'minutes',
summary: messages.getMessage('flags.wait.summary'),
min: 0,
default: Duration.minutes(0),
defaultValue: 0,
exclusive: ['async'],
}),
async: Flags.boolean({
Expand Down
3 changes: 1 addition & 2 deletions src/commands/force/data/bulk/delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { Connection, Messages } from '@salesforce/core';
import { Flags, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { Duration } from '@salesforce/kit';
import { orgFlags } from '../../../../flags.js';
import { Batcher, BatcherReturnType } from '../../../../batcher.js';
import { validateSobjectType } from '../../../../bulkUtils.js';
Expand Down Expand Up @@ -45,7 +44,7 @@ export default class Delete extends SfCommand<BatcherReturnType> {
unit: 'minutes',
summary: messages.getMessage('flags.wait.summary'),
min: 0,
default: Duration.minutes(0),
defaultValue: 0,
}),
};

Expand Down
3 changes: 1 addition & 2 deletions src/commands/force/data/bulk/upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { Messages } from '@salesforce/core';
import { Flags, SfCommand, Ux } from '@salesforce/sf-plugins-core';
import { Duration } from '@salesforce/kit';
import { orgFlags } from '../../../../flags.js';
import { Batcher, BatcherReturnType } from '../../../../batcher.js';
import { validateSobjectType } from '../../../../bulkUtils.js';
Expand Down Expand Up @@ -51,7 +50,7 @@ export default class Upsert extends SfCommand<BatcherReturnType> {
unit: 'minutes',
summary: messages.getMessage('flags.wait.summary'),
min: 0,
default: Duration.minutes(0),
defaultValue: 0,
}),
serial: Flags.boolean({
char: 'r',
Expand Down
2 changes: 1 addition & 1 deletion src/resumeBulkCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export abstract class ResumeBulkCommand extends BulkBaseCommand {
summary: messages.getMessage('flags.wait.summary'),
unit: 'minutes',
min: 0,
default: Duration.minutes(0),
defaultValue: 0,
}),
'api-version': Flags.orgApiVersion(),
loglevel,
Expand Down
73 changes: 30 additions & 43 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,17 @@
integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==

"@babel/runtime-corejs3@^7.12.5":
version "7.23.2"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.23.2.tgz#a5cd9d8b408fb946b2f074b21ea40c04e516795c"
integrity sha512-54cIh74Z1rp4oIjsHjqN+WM4fMyCBYe+LpZ9jWm51CZ1fbH3SkAzQD/3XLoNkjbJ7YEmjobLXyvQrFypRHOrXw==
version "7.23.6"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.23.6.tgz#c25dd662fc205a03fdaefd122066eb9d4533ccf9"
integrity sha512-Djs/ZTAnpyj0nyg7p1J6oiE/tZ9G2stqAFlLGZynrW+F3k2w2jGK2mLOBxzYIOcZYA89+c3d3wXKpYLcpwcU6w==
dependencies:
core-js-pure "^3.30.2"
regenerator-runtime "^0.14.0"

"@babel/runtime@^7.12.5":
version "7.23.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
version "7.23.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.6.tgz#c05e610dc228855dc92ef1b53d07389ed8ab521d"
integrity sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==
dependencies:
regenerator-runtime "^0.14.0"

Expand Down Expand Up @@ -768,10 +768,10 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/core@^3.0.0", "@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.11.0", "@oclif/core@^3.12.0", "@oclif/core@^3.13.1", "@oclif/core@^3.3.1":
version "3.13.1"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.13.1.tgz#dbd5e604ec78a716a33bfa6fec6c988a507b7f38"
integrity sha512-bpnF6BL+j7D0k0T+dZ4g7LwcZzctCoKjIYm8zcSNgrItS2pgIlvsRf8SdkGNu6djzRD7vzM657ZO9fWU6goz0g==
"@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.12.0", "@oclif/core@^3.13.1", "@oclif/core@^3.14.0", "@oclif/core@^3.14.1", "@oclif/core@^3.3.1":
version "3.14.1"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.14.1.tgz#634fc96124068e47b720d62f3b278d818a07495e"
integrity sha512-HLFL2s45DFdqYI2CFjVS/CIQ4cQ4yZqH0XqO9nnwcRWYboz2rEW/vLmidjIYGDjh6xA/k5psiAL3O1KEjqSHuQ==
dependencies:
ansi-escapes "^4.3.2"
ansi-styles "^4.3.0"
Expand Down Expand Up @@ -988,7 +988,7 @@
semver "^7.5.4"
ts-retry-promise "^0.7.1"

"@salesforce/core@^6.1.0", "@salesforce/core@^6.2.0", "@salesforce/core@^6.4.0":
"@salesforce/core@^6.2.2", "@salesforce/core@^6.4.0":
version "6.4.0"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.4.0.tgz#09e856194c8dad5bd0d86e271e84c3c47304f508"
integrity sha512-zbUuOll6RnaOyO6vHGjaO6mv2SBimu2JzInubBrbx+bgw5KFVT0y+OrN0gEhBPS94VoC9/N6ZRKve+vQ82zmmA==
Expand Down Expand Up @@ -1057,15 +1057,15 @@
"@salesforce/ts-types" "^2.0.9"
tslib "^2.6.2"

"@salesforce/plugin-command-reference@^3.0.47":
version "3.0.47"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.47.tgz#477c3384402ef08458f4259b100447e136384e85"
integrity sha512-A3syaw8bf8Bovne6WDiYOcOeLFKTqf1T+MXlxXPwDkDM0X5squkwVvE6wun7S54Q3n4gCSlCPiAMbJfpF8wwaw==
"@salesforce/plugin-command-reference@^3.0.51":
version "3.0.51"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.51.tgz#d944701bef9ae43bf2ef1f74d3a1d79dccee6399"
integrity sha512-lKIktlP3ZwL9gM5DUl0yuclY9GaEIGaJ9E5CzGzCMN3FihMU7GJ+K80Z9XU2D4egb37U5LDfQFZepmqpi6hWUg==
dependencies:
"@oclif/core" "^3.0.0"
"@salesforce/core" "^5.3.20"
"@oclif/core" "^3.13.1"
"@salesforce/core" "^6.2.2"
"@salesforce/kit" "^3.0.15"
"@salesforce/sf-plugins-core" "^4"
"@salesforce/sf-plugins-core" "^5.0.5"
"@salesforce/ts-types" "^2.0.9"
chalk "^4"
handlebars "^4.7.8"
Expand All @@ -1081,26 +1081,13 @@
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==

"@salesforce/sf-plugins-core@^4":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-4.1.3.tgz#06fa96fec1903fe945def9303eb8c43058625a3d"
integrity sha512-cia0FRknxeQU0IK5gOxlP2KGxqc5zxwSmHLKJsd5+sUFWpn3Hnun/3rDO94UXIDjuGKV7HK08hQNBKkSLeYaRA==
dependencies:
"@oclif/core" "^3.11.0"
"@salesforce/core" "^6.1.0"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.9"
"@types/inquirer" "^8.2.3"
chalk "^4"
inquirer "^8.2.5"

"@salesforce/sf-plugins-core@^5.0.5":
version "5.0.5"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.5.tgz#9ab91099fb3e5f8be86c5572d755adcc5913dd25"
integrity sha512-IlxDYH8ihznGwPclKyo/teKo4eutuIIzA3hq2d9AuFlGH4N6e7rN3IgTfhp7yV/K7RA70Ub/+dl7etIAO7FmMQ==
"@salesforce/sf-plugins-core@^5.0.10", "@salesforce/sf-plugins-core@^5.0.5":
version "5.0.10"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.10.tgz#f13cc406100f9aba3a9d5ddea361854068fc7e7d"
integrity sha512-fp0f6Lbf7HDdglvU4pWmwnWt9HlgMOIdkQ0LeT7M0zbuu6tOMwGKcC6ewkXQ9lQvcSAUrtvvvpf9t4PzkN8o+w==
dependencies:
"@oclif/core" "^3.12.0"
"@salesforce/core" "^6.2.0"
"@oclif/core" "^3.14.1"
"@salesforce/core" "^6.2.2"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.9"
"@types/inquirer" "^8.2.3"
Expand Down Expand Up @@ -2579,14 +2566,14 @@ convert-source-map@^2.0.0:
integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==

core-js-pure@^3.30.2:
version "3.33.2"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.33.2.tgz#644830db2507ef84d068a70980ccd99c275f5fa6"
integrity sha512-a8zeCdyVk7uF2elKIGz67AjcXOxjRbwOLz8SbklEso1V+2DoW4OkAMZN9S9GBgvZIaqQi/OemFX4OiSoQEmg1Q==
version "3.34.0"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.34.0.tgz#981e462500708664c91b827a75b011f04a8134a0"
integrity sha512-pmhivkYXkymswFfbXsANmBAewXx86UBfmagP+w0wkK06kLsLlTK5oQmsURPivzMkIBQiYq2cjamcZExIwlFQIg==

core-js@^3.6.4:
version "3.33.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.2.tgz#312bbf6996a3a517c04c99b9909cdd27138d1ceb"
integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==
version "3.34.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.34.0.tgz#5705e6ad5982678612e96987d05b27c6c7c274a5"
integrity sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag==

core-util-is@~1.0.0:
version "1.0.3"
Expand Down