Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into sm/crdt-config
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshanemc
mshanemc committed Nov 10, 2023
2 parents a57f79f + 6f375b9 commit 4dbd64a
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [5.3.20](https://github.com/forcedotcom/sfdx-core/compare/5.3.19...5.3.20) (2023-11-10)

### Bug Fixes

- http 420 errors ([6deabcd](https://github.com/forcedotcom/sfdx-core/commit/6deabcd603055786311994cb25c8c9282ff9971d))

## [5.3.19](https://github.com/forcedotcom/sfdx-core/compare/5.3.18...5.3.19) (2023-11-08)

### Bug Fixes
Expand Down
10 changes: 10 additions & 0 deletions messages/org.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,13 @@ We found more than one SandboxProcess with the SandboxName %s.
# sandboxNotResumable

The sandbox %s cannot resume with status of %s.

# UnexpectedResponse

Unexpected response from the platform

# UnexpectedResponse.actions

- Check that the instance URL is correct and the org still exists.

- See what's at the URL that's causing the problem: %s.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
"jsforce": "^2.0.0-beta.28",
"jsonwebtoken": "9.0.2",
"jszip": "3.10.1",
"pino": "^8.16.0",
"pino-abstract-transport": "^1.0.0",
"pino": "^8.16.1",
"pino-abstract-transport": "^1.1.0",
"pino-pretty": "^10.2.3",
"proper-lockfile": "^4.1.2",
"semver": "^7.5.4",
"ts-retry-promise": "^0.7.1"
},
"devDependencies": {
"@salesforce/dev-scripts": "^6.0.3",
"@salesforce/ts-sinon": "^1.4.18",
"@salesforce/ts-sinon": "^1.4.19",
"@types/benchmark": "^2.1.3",
"@types/chai-string": "^1.4.4",
"@types/jsonwebtoken": "9.0.3",
Expand Down
11 changes: 10 additions & 1 deletion src/org/org.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,16 @@ export class Org extends AsyncOptionalCreatable<Org.Options> {
method: 'GET',
};
const conn = this.getConnection();
await conn.request(requestInfo);
try {
await conn.request(requestInfo);
} catch (e) {
// an html error page like https://computing-connect-6970-dev-ed.scratch.my.salesforce.com/services/data/v50.0
// where the message is an entire html page
if (e instanceof Error && (e.name.includes('ERROR_HTTP') || e.message.includes('<html '))) {
throw messages.createError('UnexpectedResponse', [], [conn.baseUrl()], e);
}
throw e;
}
}

/**
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,16 +570,16 @@
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==

"@salesforce/ts-sinon@^1.4.18":
version "1.4.18"
resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.18.tgz#a9ff91370bc3f682fbf964afcbc0fcf5f04d2912"
integrity sha512-YR+L5JEZRfZmPGYvamPs+urd753PfS/K6foygYdR9F6MM+e0VMbAQ8Zq2lmJKoZy4aDEencspmp+72wtZKJJpg==
"@salesforce/ts-sinon@^1.4.19":
version "1.4.19"
resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.19.tgz#64157b6c8cf4a3c637867e2ddd90c2d058c334f7"
integrity sha512-vopxKrI6QD0OCtPlge1eGGHFWLkoDee7KaB/dpGeRwioeNfCVJ8ikELN0hv0zq9Ys6gUYWYcdpxzTP1upslCJA==
dependencies:
"@salesforce/ts-types" "^2.0.8"
"@salesforce/ts-types" "^2.0.9"
sinon "^5.1.1"
tslib "^2.6.1"

"@salesforce/ts-types@^2.0.8", "@salesforce/ts-types@^2.0.9":
"@salesforce/ts-types@^2.0.9":
version "2.0.9"
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.9.tgz#66bff7b41720065d6b01631b6f6a3ccca02857c5"
integrity sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA==
Expand Down Expand Up @@ -3873,7 +3873,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

pino-abstract-transport@^1.0.0, [email protected]:
pino-abstract-transport@^1.0.0, pino-abstract-transport@^1.1.0, pino-abstract-transport@v1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8"
integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==
Expand Down Expand Up @@ -3906,10 +3906,10 @@ pino-std-serializers@^6.0.0:
resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3"
integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==

pino@^8.16.0:
version "8.16.0"
resolved "https://registry.yarnpkg.com/pino/-/pino-8.16.0.tgz#2465012a1d11fa2e7a0545032f636e203990ae26"
integrity sha512-UUmvQ/7KTZt/vHjhRrnyS7h+J7qPBQnpG80V56xmIC+o9IqYmQOw/UIny9S9zYDfRBR0ClouCr464EkBMIT7Fw==
pino@^8.16.1:
version "8.16.1"
resolved "https://registry.yarnpkg.com/pino/-/pino-8.16.1.tgz#dcaf82764b1a27f24101317cdd6453e96290f1d9"
integrity sha512-3bKsVhBmgPjGV9pyn4fO/8RtoVDR8ssW1ev819FsRXlRNgW8gR/9Kx+gCK4UPWd4JjrRDLWpzd/pb1AyWm3MGA==
dependencies:
atomic-sleep "^1.0.0"
fast-redact "^3.1.1"
Expand Down

3 comments on commit 4dbd64a

@svc-cli-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logger Benchmarks - ubuntu-latest

Benchmark suite Current: 4dbd64a Previous: a57f79f Ratio
Child logger creation 371242 ops/sec (±0.49%) 481339 ops/sec (±2.90%) 1.30
Logging a string on root logger 605872 ops/sec (±13.05%) 837909 ops/sec (±5.75%) 1.38
Logging an object on root logger 319043 ops/sec (±16.55%) 534496 ops/sec (±9.40%) 1.68
Logging an object with a message on root logger 168428 ops/sec (±19.42%) 8802 ops/sec (±201.94%) 0.05225971928657943
Logging an object with a redacted prop on root logger 189699 ops/sec (±20.66%) 381027 ops/sec (±12.02%) 2.01
Logging a nested 3-level object on root logger 152232 ops/sec (±20.57%) 299466 ops/sec (±7.37%) 1.97

This comment was automatically generated by workflow using github-action-benchmark.

@svc-cli-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Logger Benchmarks - ubuntu-latest'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 4dbd64a Previous: a57f79f Ratio
Logging an object with a redacted prop on root logger 189699 ops/sec (±20.66%) 381027 ops/sec (±12.02%) 2.01

This comment was automatically generated by workflow using github-action-benchmark.

@svc-cli-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logger Benchmarks - windows-latest

Benchmark suite Current: 4dbd64a Previous: a57f79f Ratio
Child logger creation 199486 ops/sec (±3.90%) 170635 ops/sec (±1.63%) 0.86
Logging a string on root logger 487144 ops/sec (±11.40%) 394456 ops/sec (±19.31%) 0.81
Logging an object on root logger 274758 ops/sec (±21.31%) 305057 ops/sec (±18.81%) 1.11
Logging an object with a message on root logger 185462 ops/sec (±16.22%) 161573 ops/sec (±19.58%) 0.87
Logging an object with a redacted prop on root logger 161447 ops/sec (±20.07%) 186822 ops/sec (±21.99%) 1.16
Logging a nested 3-level object on root logger 118828 ops/sec (±22.16%) 134173 ops/sec (±22.19%) 1.13

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.