Skip to content

Commit 8ec55e8

Browse files
Merge branch 'main' into main
2 parents a916462 + 92a0470 commit 8ec55e8

215 files changed

Lines changed: 4478 additions & 1084 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
{
5151
"name": "setInterval",
5252
"message": "Use `import { setInterval } from 'timers';` instead"
53+
},
54+
{
55+
"name": "process",
56+
"message": "Use `import * as process from 'process';` instead"
5357
}
5458
],
5559
"prettier/prettier": "error",
@@ -95,6 +99,10 @@
9599
{
96100
"name": "..",
97101
"message": "Please import directly from the relevant file instead."
102+
},
103+
{
104+
"name": "node:*",
105+
"message": "Don't use `node:*`; use bare Node core module names instead."
98106
}
99107
]
100108
}
@@ -267,7 +275,8 @@
267275
{
268276
"patterns": [
269277
"**/../lib/**",
270-
"mongodb-mock-server"
278+
"mongodb-mock-server",
279+
"node:*"
271280
],
272281
"paths": [
273282
{
@@ -318,4 +327,4 @@
318327
}
319328
}
320329
]
321-
}
330+
}

.evergreen/ci_matrix_constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const LB_VERSIONS = MONGODB_VERSIONS.slice(0, MONGODB_VERSIONS.indexOf('5.0') +
1515
LB_VERSIONS.reverse();
1616

1717
const DEFAULT_OS = 'rhel80-large';
18-
const WINDOWS_OS = 'windows-vsCurrent-large';
18+
const WINDOWS_OS = 'windows-2022-latest-large';
1919
const MACOS_OS = 'macos-14-arm64';
2020
const UBUNTU_OS = 'ubuntu1804-large';
2121
const UBUNTU_20_OS = 'ubuntu2004-small';

.evergreen/config.yml

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,8 @@ tasks:
14251425
- func: assume secrets manager role
14261426
- func: run ldap tests
14271427
- name: test-socks5
1428-
tags: []
1428+
tags:
1429+
- socks5
14291430
commands:
14301431
- command: expansions.update
14311432
type: setup
@@ -1451,7 +1452,8 @@ tasks:
14511452
- func: bootstrap mongo-orchestration
14521453
- func: run socks5 tests
14531454
- name: test-socks5-tls
1454-
tags: []
1455+
tags:
1456+
- socks5-tls
14551457
commands:
14561458
- command: expansions.update
14571459
type: setup
@@ -1502,6 +1504,7 @@ tasks:
15021504
- name: test-tls-support-latest
15031505
tags:
15041506
- tls-support
1507+
- tls-support-latest
15051508
commands:
15061509
- command: expansions.update
15071510
type: setup
@@ -1517,6 +1520,7 @@ tasks:
15171520
- name: test-tls-support-8.0
15181521
tags:
15191522
- tls-support
1523+
- tls-support-8.0
15201524
commands:
15211525
- command: expansions.update
15221526
type: setup
@@ -1532,6 +1536,7 @@ tasks:
15321536
- name: test-tls-support-7.0
15331537
tags:
15341538
- tls-support
1539+
- tls-support-7.0
15351540
commands:
15361541
- command: expansions.update
15371542
type: setup
@@ -1547,6 +1552,7 @@ tasks:
15471552
- name: test-tls-support-6.0
15481553
tags:
15491554
- tls-support
1555+
- tls-support-6.0
15501556
commands:
15511557
- command: expansions.update
15521558
type: setup
@@ -1562,6 +1568,7 @@ tasks:
15621568
- name: test-tls-support-5.0
15631569
tags:
15641570
- tls-support
1571+
- tls-support-5.0
15651572
commands:
15661573
- command: expansions.update
15671574
type: setup
@@ -1577,6 +1584,7 @@ tasks:
15771584
- name: test-tls-support-4.4
15781585
tags:
15791586
- tls-support
1587+
- tls-support-4.4
15801588
commands:
15811589
- command: expansions.update
15821590
type: setup
@@ -1592,6 +1600,7 @@ tasks:
15921600
- name: test-tls-support-4.2
15931601
tags:
15941602
- tls-support
1603+
- tls-support-4.2
15951604
commands:
15961605
- command: expansions.update
15971606
type: setup
@@ -1877,19 +1886,6 @@ tasks:
18771886
- func: install dependencies
18781887
- func: bootstrap mongo-orchestration
18791888
- func: check resource management feature integration
1880-
- name: check-types-typescript-next
1881-
tags:
1882-
- check-types-typescript-next
1883-
- typescript-compilation
1884-
commands:
1885-
- command: expansions.update
1886-
type: setup
1887-
params:
1888-
updates:
1889-
- {key: NODE_LTS_VERSION, value: 20.19.0}
1890-
- {key: TS_VERSION, value: next}
1891-
- func: install dependencies
1892-
- func: check types
18931889
- name: check-types-typescript-current
18941890
tags:
18951891
- check-types-typescript-current
@@ -3080,9 +3076,9 @@ buildvariants:
30803076
- test-tls-support-5.0
30813077
- test-tls-support-4.4
30823078
- test-tls-support-4.2
3083-
- name: windows-vsCurrent-large-iron
3079+
- name: windows-2022-latest-large-iron
30843080
display_name: Windows Node20.19.0
3085-
run_on: windows-vsCurrent-large
3081+
run_on: windows-2022-latest-large
30863082
expansions:
30873083
NODE_LTS_VERSION: 20.19.0
30883084
CLIENT_ENCRYPTION: 'false'
@@ -3124,9 +3120,9 @@ buildvariants:
31243120
- test-tls-support-5.0
31253121
- test-tls-support-4.4
31263122
- test-tls-support-4.2
3127-
- name: windows-vsCurrent-large-Node22
3123+
- name: windows-2022-latest-large-Node22
31283124
display_name: Windows Node22
3129-
run_on: windows-vsCurrent-large
3125+
run_on: windows-2022-latest-large
31303126
expansions:
31313127
NODE_LTS_VERSION: 22
31323128
CLIENT_ENCRYPTION: 'false'
@@ -3168,9 +3164,9 @@ buildvariants:
31683164
- test-tls-support-5.0
31693165
- test-tls-support-4.4
31703166
- test-tls-support-4.2
3171-
- name: windows-vsCurrent-large-Node24
3167+
- name: windows-2022-latest-large-Node24
31723168
display_name: Windows Node24
3173-
run_on: windows-vsCurrent-large
3169+
run_on: windows-2022-latest-large
31743170
expansions:
31753171
NODE_LTS_VERSION: 24
31763172
CLIENT_ENCRYPTION: 'false'

.evergreen/generate_evergreen_tasks.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ TASKS.push(
181181
},
182182
{
183183
name: 'test-socks5',
184-
tags: [],
184+
tags: ['socks5'],
185185
commands: [
186186
updateExpansions({
187187
VERSION: 'latest',
@@ -208,7 +208,7 @@ TASKS.push(
208208
},
209209
{
210210
name: 'test-socks5-tls',
211-
tags: [],
211+
tags: ['socks5-tls'],
212212
commands: [
213213
updateExpansions({
214214
SSL: 'ssl',
@@ -298,7 +298,7 @@ AWS_LAMBDA_HANDLER_TASKS.push({
298298
for (const VERSION of TLS_VERSIONS) {
299299
TASKS.push({
300300
name: `test-tls-support-${VERSION}`,
301-
tags: ['tls-support'],
301+
tags: ['tls-support', `tls-support-${VERSION}`],
302302
commands: [
303303
updateExpansions({
304304
VERSION,
@@ -532,7 +532,8 @@ function* makeTypescriptTasks() {
532532
};
533533
}
534534

535-
yield makeCheckTypesTask('next');
535+
// TODO(NODE-7233): unskip ts@next tests once we adopt Typescript 6.0.
536+
// yield makeCheckTypesTask('next');
536537
yield makeCheckTypesTask('current');
537538
yield makeCheckTypesTask('5.6');
538539

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ source ./.evergreen/prepare-shell.sh # should not run git clone
1313

1414
# load node.js
1515
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
16-
17-
# run the tests
18-
npm install aws4

.evergreen/setup-mongodb-aws-auth-tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@ cd $DRIVERS_TOOLS/.evergreen/auth_aws
2222

2323
cd $BEFORE
2424

25-
npm install --no-save aws4
26-
2725
# revert to show test output
2826
set -x

.github/scripts/highlights.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-check
2-
import * as process from 'node:process';
2+
import * as process from 'process';
33
import { output } from './util.mjs';
44

55
const {

.github/scripts/nightly.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import * as url from 'node:url';
33
import * as fs from 'node:fs/promises';
44
import * as path from 'node:path';
5-
import * as process from 'node:process';
5+
import * as process from 'process';
66
import * as child_process from 'node:child_process';
77
import * as util from 'node:util';
88
import { output } from './util.mjs';

.github/scripts/release_notes.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import * as url from 'node:url';
33
import * as fs from 'node:fs/promises';
44
import * as path from 'node:path';
5-
import * as process from 'node:process';
5+
import * as process from 'process';
66
import * as semver from 'semver';
77
import { getCurrentHistorySection, output } from './util.mjs';
88

@@ -50,7 +50,7 @@ const releaseNotesPath = path.join(process.cwd(), 'release_notes.md');
5050
await fs.writeFile(
5151
releaseNotesPath,
5252
`:seedling: A new release!\n---\n${releaseNotes}\n---\n`,
53-
{ encoding:'utf8' }
53+
{ encoding: 'utf8' }
5454
);
5555

5656
await output('release_notes_path', releaseNotesPath)

.github/scripts/util.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-check
2-
import * as process from 'node:process';
2+
import * as process from 'process';
33
import * as fs from 'node:fs/promises';
44

55
export async function output(key, value) {

0 commit comments

Comments
 (0)