github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[9.0] Update HAPI ecosystem (main) (#206158) (#213946)

Browse source 
# Backport

This will backport the following commits from `main` to `9.0`:
- [Update HAPI ecosystem (main)
(#206158)](https://github.com/elastic/kibana/pull/206158)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"elastic-renovate-prod[bot]","email":"174716857+elastic-renovate-prod[bot]@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-03-11T14:53:00Z","message":"Update
HAPI ecosystem (main) (#206158)\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"c835902ff9a277f306a5d6ab46bf1924088fd2dd","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","backport:prev-minor","v9.1.0"],"title":"Update
HAPI ecosystem
(main)","number":206158,"url":"https://github.com/elastic/kibana/pull/206158","mergeCommit":{"message":"Update
HAPI ecosystem (main) (#206158)\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"c835902ff9a277f306a5d6ab46bf1924088fd2dd"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/206158","number":206158,"mergeCommit":{"message":"Update
HAPI ecosystem (main) (#206158)\n\nCo-authored-by:
elastic-renovate-prod[bot]
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"c835902ff9a277f306a5d6ab46bf1924088fd2dd"}}]}]
BACKPORT-->

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2025-03-12 03:50:12 +11:00 • committed by GitHub
parent 213b60d8c7
commit 499ddadebd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -152,8 +152,8 @@
"@hapi/boom": "^10.0.1",
"@hapi/cookie": "^12.0.1",
"@hapi/h2o2": "^10.0.4",
"@hapi/hapi": "^21.3.10",
"@hapi/hoek": "^11.0.4",
"@hapi/hapi": "^21.3.12",
"@hapi/hoek": "^11.0.7",
"@hapi/inert": "^7.1.0",
"@hapi/wreck": "^18.1.0",
"@hello-pangea/dnd": "16.6.0",

15
src/core/server/integration_tests/http/http_server.test.ts
View file

@ -105,8 +105,8 @@ describe('Http server', () => {
expect(response.header.connection).toBe('close');
});
test('any requests triggered while stopping should be rejected', async () => {
await Promise.all([
test('any requests triggered while stopping should be rejected with 503', async () => {
const [, , response] = await Promise.all([
// Trigger a request that should hold the server from stopping until fulfilled (otherwise the server will stop straight away)
supertest(innerServerListener).post('/'),
// Stop the server while the request is in progress
@ -117,11 +117,16 @@ describe('Http server', () => {
// Trigger a new request while shutting down (should be rejected)
(async () => {
await new Promise((resolve) => setTimeout(resolve, (2 * shutdownTimeout) / 3));
const request = supertest(innerServerListener).post('/');
await expect(request).rejects.toThrow('socket hang up');
await request.catch((err) => expect(err.code).toBe('ECONNRESET'));
return supertest(innerServerListener).post('/');
})(),
]);
expect(response.status).toBe(503);
expect(response.body).toStrictEqual({
statusCode: 503,
error: 'Service Unavailable',
message: 'Kibana is shutting down and not accepting new incoming requests',
});
expect(response.header.connection).toBe('close');
});
test('when no ongoing connections, the server should stop without waiting any longer', async () => {

36
yarn.lock
View file

@ -3121,7 +3121,7 @@
dependencies:
is-negated-glob "^1.0.0"
"@hapi/accept@^6.0.1", "@hapi/accept@^6.0.3":
"@hapi/accept@^6.0.3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-6.0.3.tgz#eef0800a4f89cd969da8e5d0311dc877c37279ab"
integrity sha512-p72f9k56EuF0n3MwlBNThyVE5PXX40g+aQh+C/xbKrfzahM2Oispv3AXmOIU51t3j77zay1qrX7IIziZXspMlw==
@ -3150,10 +3150,10 @@
dependencies:
"@hapi/hoek" "^11.0.2"
"@hapi/bounce@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-3.0.1.tgz#25a51bf95733749c557c6bf948048bffa66435e4"
integrity sha512-G+/Pp9c1Ha4FDP+3Sy/Xwg2O4Ahaw3lIZFSX+BL4uWi64CmiETuZPxhKDUD4xBMOUZbBlzvO8HjiK8ePnhBadA==
"@hapi/bounce@^3.0.1", "@hapi/bounce@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-3.0.2.tgz#6499a1e2db6a699e2c8d284045af46b9d8d9d57d"
integrity sha512-d0XmlTi3H9HFDHhQLjg4F4auL1EY3Wqj7j7/hGDhFFe6xAbnm3qiGrXeT93zZnPH8gH+SKAFYiRzu26xkXcH3g==
dependencies:
"@hapi/boom" "^10.0.1"
"@hapi/hoek" "^11.0.2"
@ -3228,20 +3228,20 @@
"@hapi/validate" "^2.0.1"
"@hapi/wreck" "^18.0.1"
"@hapi/hapi@^21.1.0", "@hapi/hapi@^21.3.10":
version "21.3.10"
resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-21.3.10.tgz#0357db7ca49415e50e5df80ba50ad3964f2a62f3"
integrity sha512-CmEcmTREW394MaGGKvWpoOK4rG8tKlpZLs30tbaBzhCrhiL2Ti/HARek9w+8Ya4nMBGcd+kDAzvU44OX8Ms0Jg==
"@hapi/hapi@^21.1.0", "@hapi/hapi@^21.3.12":
version "21.3.12"
resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-21.3.12.tgz#a9c48869199d15c22e53d9c22153c9323919e5a0"
integrity sha512-GCUP12dkb3QMjpFl+wEFO73nqKRmsnD5um/QDOn6lj2GjGBrDXPcT194mNARO+PPNXZOR4KmvIpHt/lceUncfg==
dependencies:
"@hapi/accept" "^6.0.1"
"@hapi/accept" "^6.0.3"
"@hapi/ammo" "^6.0.1"
"@hapi/boom" "^10.0.1"
"@hapi/bounce" "^3.0.1"
"@hapi/bounce" "^3.0.2"
"@hapi/call" "^9.0.1"
"@hapi/catbox" "^12.1.1"
"@hapi/catbox-memory" "^6.0.2"
"@hapi/heavy" "^8.0.1"
"@hapi/hoek" "^11.0.2"
"@hapi/hoek" "^11.0.6"
"@hapi/mimos" "^7.0.1"
"@hapi/podium" "^5.0.1"
"@hapi/shot" "^6.0.1"
@ -3249,7 +3249,7 @@
"@hapi/statehood" "^8.1.1"
"@hapi/subtext" "^8.1.0"
"@hapi/teamwork" "^6.0.0"
"@hapi/topo" "^6.0.1"
"@hapi/topo" "^6.0.2"
"@hapi/validate" "^2.0.1"
"@hapi/heavy@^8.0.1":
@ -3261,10 +3261,10 @@
"@hapi/hoek" "^11.0.2"
"@hapi/validate" "^2.0.1"
"@hapi/hoek@^11.0.2", "@hapi/hoek@^11.0.4":
version "11.0.4"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-11.0.4.tgz#42a7f244fd3dd777792bfb74b8c6340ae9182f37"
integrity sha512-PnsP5d4q7289pS2T2EgGz147BFJ2Jpb4yrEdkpz2IhgEUzos1S7HTl7ezWh1yfYzYlj89KzLdCRkqsP6SIryeQ==
"@hapi/hoek@^11.0.2", "@hapi/hoek@^11.0.4", "@hapi/hoek@^11.0.6", "@hapi/hoek@^11.0.7":
version "11.0.7"
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-11.0.7.tgz#56a920793e0a42d10e530da9a64cc0d3919c4002"
integrity sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==
"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
version "9.3.0"
@ -3384,7 +3384,7 @@
dependencies:
"@hapi/hoek" "^9.0.0"
"@hapi/topo@^6.0.1":
"@hapi/topo@^6.0.1", "@hapi/topo@^6.0.2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-6.0.2.tgz#f219c1c60da8430228af4c1f2e40c32a0d84bbb4"
integrity sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==