Skip to content

Commit 13b7001

Browse files
chore(NA): upgrade Node.js to v22.21.1 (#244676)
Closes elastic/kibana-operations#397 https://nodejs.org/en/blog/release/v22.21.1 --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
1 parent e7dc690 commit 13b7001

14 files changed

Lines changed: 68 additions & 87 deletions

File tree

.buildkite/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.buildkite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@types/jscodeshift": "^0.12.0",
2525
"@types/minimatch": "^3.0.5",
2626
"@types/minimist": "^1.2.5",
27-
"@types/node": "^22.17.1",
27+
"@types/node": "^22.19.1",
2828
"jest": "^30.0.3",
2929
"jscodeshift": "^17.1.2",
3030
"nock": "^12.0.2",

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.1
1+
22.21.1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.17.1
1+
22.21.1

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373
"url": "https://github.com/elastic/kibana.git"
7474
},
7575
"engines": {
76-
"node": "22.17.1",
76+
"node": "22.21.1",
7777
"yarn": "^1.22.19"
7878
},
7979
"resolutions": {
8080
"**/@babel/parser": "7.24.7",
8181
"**/@hello-pangea/dnd": "18.0.1",
8282
"**/@langchain/core": "^0.3.78",
8383
"**/@langchain/google-common": "^0.2.18",
84-
"**/@types/node": "22.15.3",
84+
"**/@types/node": "22.19.1",
8585
"**/@types/prop-types": "15.7.5",
8686
"**/@typescript-eslint/utils": "8.46.3",
8787
"**/chokidar": "^3.5.3",
@@ -1441,7 +1441,7 @@
14411441
"type-fest": "^4.17.0",
14421442
"typescript-fsa": "^3.0.0",
14431443
"typescript-fsa-reducers": "^1.2.2",
1444-
"undici": "6.21.2",
1444+
"undici": "6.22.0",
14451445
"unidiff": "^1.0.4",
14461446
"unified": "9.2.2",
14471447
"use-resize-observer": "^9.1.0",
@@ -1829,7 +1829,7 @@
18291829
"@types/moment-duration-format": "^2.2.6",
18301830
"@types/mustache": "^4.2.5",
18311831
"@types/nock": "^10.0.3",
1832-
"@types/node": "22.10.5",
1832+
"@types/node": "22.19.1",
18331833
"@types/node-fetch": "2.6.4",
18341834
"@types/node-forge": "^1.3.14",
18351835
"@types/nodemailer": "^7.0.4",

x-pack/platform/plugins/shared/actions/server/lib/get_custom_agents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export function getCustomAgents(
123123
// At this point, we are going to use a proxy, so we need new agents.
124124
// We will though, copy over the calculated ssl options from above, into
125125
// the https agent.
126-
const httpAgent = new HttpProxyAgent(proxySettings.proxyUrl);
126+
const httpAgent = new HttpProxyAgent(proxySettings.proxyUrl) as unknown as HttpAgent;
127127
const httpsAgent = new HttpsProxyAgent({
128128
host: proxyUrl.hostname,
129129
port: Number(proxyUrl.port),

x-pack/platform/plugins/shared/actions/server/lib/request_oauth_client_credentials_token.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ describe('requestOAuthClientCredentialsToken', () => {
8484
"list": Array [],
8585
"map": Object {},
8686
},
87+
"agentKeepAliveTimeoutBuffer": 1000,
8788
"defaultPort": 443,
8889
"freeSockets": Object {},
8990
"keepAlive": false,
@@ -93,8 +94,10 @@ describe('requestOAuthClientCredentialsToken', () => {
9394
"maxSockets": Infinity,
9495
"maxTotalSockets": Infinity,
9596
"options": Object {
97+
"defaultPort": 443,
9698
"noDelay": true,
9799
"path": null,
100+
"protocol": "https:",
98101
"rejectUnauthorized": true,
99102
},
100103
"protocol": "https:",

x-pack/platform/plugins/shared/actions/server/lib/request_oauth_jwt_token.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ describe('requestOAuthJWTToken', () => {
6767
"list": Array [],
6868
"map": Object {},
6969
},
70+
"agentKeepAliveTimeoutBuffer": 1000,
7071
"defaultPort": 443,
7172
"freeSockets": Object {},
7273
"keepAlive": false,
@@ -76,8 +77,10 @@ describe('requestOAuthJWTToken', () => {
7677
"maxSockets": Infinity,
7778
"maxTotalSockets": Infinity,
7879
"options": Object {
80+
"defaultPort": 443,
7981
"noDelay": true,
8082
"path": null,
83+
"protocol": "https:",
8184
"rejectUnauthorized": true,
8285
},
8386
"protocol": "https:",

x-pack/platform/plugins/shared/actions/server/lib/request_oauth_token.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ describe('requestOAuthToken', () => {
7474
"list": Array [],
7575
"map": Object {},
7676
},
77+
"agentKeepAliveTimeoutBuffer": 1000,
7778
"defaultPort": 443,
7879
"freeSockets": Object {},
7980
"keepAlive": false,
@@ -83,8 +84,10 @@ describe('requestOAuthToken', () => {
8384
"maxSockets": Infinity,
8485
"maxTotalSockets": Infinity,
8586
"options": Object {
87+
"defaultPort": 443,
8688
"noDelay": true,
8789
"path": null,
90+
"protocol": "https:",
8891
"rejectUnauthorized": true,
8992
},
9093
"protocol": "https:",

x-pack/platform/plugins/shared/fleet/server/services/epm/registry/requests.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { RegistryError, RegistryConnectionError, RegistryResponseError } from '.
1616
import { airGappedUtils } from '../airgapped';
1717

1818
import { getProxyAgent, getRegistryProxyUrl } from './proxy';
19+
import type { Agent as HttpAgent } from 'http';
20+
import type { Agent as HttpsAgent } from 'https';
1921

2022
type FailedAttemptErrors = pRetry.FailedAttemptError | FetchError | Error;
2123

@@ -165,6 +167,6 @@ export function getFetchOptions(targetUrl: string): RequestInit | undefined {
165167
const logger = appContextService.getLogger();
166168
logger.debug(`Using ${proxyUrl} as proxy for ${targetUrl}`);
167169

168-
options.agent = getProxyAgent({ proxyUrl, targetUrl });
170+
options.agent = getProxyAgent({ proxyUrl, targetUrl }) as unknown as HttpAgent | HttpsAgent;
169171
return options;
170172
}

0 commit comments

Comments
 (0)