Skip to content

Commit f95f6e4

Browse files
baileympearsonbaileympearson
authored
Merge branch 'main' into NODE-7359 
2 parents 476e821 + 92a0470 commit f95f6e4

113 files changed

Lines changed: 743 additions & 274 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: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3076,14 +3076,17 @@ buildvariants:
30763076
- test-tls-support-5.0
30773077
- test-tls-support-4.4
30783078
- test-tls-support-4.2
3079-
- name: windows-vsCurrent-large-iron
3079+
- name: windows-2022-latest-large-iron
30803080
display_name: Windows Node20.19.0
3081-
run_on: windows-vsCurrent-large
3081+
run_on: windows-2022-latest-large
30823082
expansions:
30833083
NODE_LTS_VERSION: 20.19.0
30843084
CLIENT_ENCRYPTION: 'false'
30853085
TEST_CSFLE: 'false'
30863086
tasks:
3087+
- test-latest-server
3088+
- test-latest-replica_set
3089+
- test-latest-sharded_cluster
30873090
- test-rapid-server
30883091
- test-rapid-replica_set
30893092
- test-rapid-sharded_cluster
@@ -3105,20 +3108,29 @@ buildvariants:
31053108
- test-4.2-server
31063109
- test-4.2-replica_set
31073110
- test-4.2-sharded_cluster
3111+
- test-latest-server-v1-api
3112+
- test-socks5
3113+
- test-socks5-tls
3114+
- test-snappy-compression
3115+
- test-zstd-compression
3116+
- test-tls-support-latest
31083117
- test-tls-support-8.0
31093118
- test-tls-support-7.0
31103119
- test-tls-support-6.0
31113120
- test-tls-support-5.0
31123121
- test-tls-support-4.4
31133122
- test-tls-support-4.2
3114-
- name: windows-vsCurrent-large-Node22
3123+
- name: windows-2022-latest-large-Node22
31153124
display_name: Windows Node22
3116-
run_on: windows-vsCurrent-large
3125+
run_on: windows-2022-latest-large
31173126
expansions:
31183127
NODE_LTS_VERSION: 22
31193128
CLIENT_ENCRYPTION: 'false'
31203129
TEST_CSFLE: 'false'
31213130
tasks:
3131+
- test-latest-server
3132+
- test-latest-replica_set
3133+
- test-latest-sharded_cluster
31223134
- test-rapid-server
31233135
- test-rapid-replica_set
31243136
- test-rapid-sharded_cluster
@@ -3140,20 +3152,29 @@ buildvariants:
31403152
- test-4.2-server
31413153
- test-4.2-replica_set
31423154
- test-4.2-sharded_cluster
3155+
- test-latest-server-v1-api
3156+
- test-socks5
3157+
- test-socks5-tls
3158+
- test-snappy-compression
3159+
- test-zstd-compression
3160+
- test-tls-support-latest
31433161
- test-tls-support-8.0
31443162
- test-tls-support-7.0
31453163
- test-tls-support-6.0
31463164
- test-tls-support-5.0
31473165
- test-tls-support-4.4
31483166
- test-tls-support-4.2
3149-
- name: windows-vsCurrent-large-Node24
3167+
- name: windows-2022-latest-large-Node24
31503168
display_name: Windows Node24
3151-
run_on: windows-vsCurrent-large
3169+
run_on: windows-2022-latest-large
31523170
expansions:
31533171
NODE_LTS_VERSION: 24
31543172
CLIENT_ENCRYPTION: 'false'
31553173
TEST_CSFLE: 'false'
31563174
tasks:
3175+
- test-latest-server
3176+
- test-latest-replica_set
3177+
- test-latest-sharded_cluster
31573178
- test-rapid-server
31583179
- test-rapid-replica_set
31593180
- test-rapid-sharded_cluster
@@ -3175,6 +3196,12 @@ buildvariants:
31753196
- test-4.2-server
31763197
- test-4.2-replica_set
31773198
- test-4.2-sharded_cluster
3199+
- test-latest-server-v1-api
3200+
- test-socks5
3201+
- test-socks5-tls
3202+
- test-snappy-compression
3203+
- test-zstd-compression
3204+
- test-tls-support-latest
31783205
- test-tls-support-8.0
31793206
- test-tls-support-7.0
31803207
- test-tls-support-6.0

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ const WINDOWS_SKIP_TAGS = new Set([
4545
'auth',
4646
'load_balancer',
4747
'socks5-csfle',
48-
'oidc',
49-
50-
// TODO: NODE-7356: enable skipped tests on windows
51-
'latest',
52-
'socks5',
53-
'socks5-tls',
54-
'tls-support-latest'
48+
'oidc'
5549
]);
5650

5751
const TASKS = [];

‎.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)