Skip to content

Commit 0451dae

Browse files
feat(NODE-7150)!: update peer dependency matrix for 3rd party peer deps (#4720)
1 parent c39983d commit 0451dae

File tree

7 files changed

+288
-132
lines changed

7 files changed

+288
-132
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,28 +1468,7 @@ tasks:
14681468
- func: install dependencies
14691469
- func: bootstrap mongo-orchestration
14701470
- func: run-compression-tests
1471-
- name: test-zstd-1.x-compression
1472-
tags:
1473-
- latest
1474-
- zstd
1475-
commands:
1476-
- command: expansions.update
1477-
type: setup
1478-
params:
1479-
updates:
1480-
- {key: VERSION, value: latest}
1481-
- {key: TOPOLOGY, value: replica_set}
1482-
- {key: AUTH, value: auth}
1483-
- {key: COMPRESSOR, value: zstd}
1484-
- {key: CLIENT_ENCRYPTION, value: 'false'}
1485-
- {key: TEST_CSFLE, value: 'false'}
1486-
- func: install dependencies
1487-
- func: bootstrap mongo-orchestration
1488-
- func: install package
1489-
vars:
1490-
PACKAGE: '@mongodb-js/zstd@1.x'
1491-
- func: run-compression-tests
1492-
- name: test-zstd-2.x-compression
1471+
- name: test-zstd-compression
14931472
tags:
14941473
- latest
14951474
- zstd
@@ -2887,8 +2866,7 @@ buildvariants:
28872866
- test-socks5-csfle
28882867
- test-socks5-tls
28892868
- test-snappy-compression
2890-
- test-zstd-1.x-compression
2891-
- test-zstd-2.x-compression
2869+
- test-zstd-compression
28922870
- test-tls-support-latest
28932871
- test-tls-support-8.0
28942872
- test-tls-support-7.0
@@ -2942,8 +2920,7 @@ buildvariants:
29422920
- test-socks5-csfle
29432921
- test-socks5-tls
29442922
- test-snappy-compression
2945-
- test-zstd-1.x-compression
2946-
- test-zstd-2.x-compression
2923+
- test-zstd-compression
29472924
- test-tls-support-latest
29482925
- test-tls-support-8.0
29492926
- test-tls-support-7.0
@@ -2995,8 +2972,7 @@ buildvariants:
29952972
- test-socks5-csfle
29962973
- test-socks5-tls
29972974
- test-snappy-compression
2998-
- test-zstd-1.x-compression
2999-
- test-zstd-2.x-compression
2975+
- test-zstd-compression
30002976
- test-tls-support-latest
30012977
- test-tls-support-8.0
30022978
- test-tls-support-7.0
@@ -3040,8 +3016,7 @@ buildvariants:
30403016
- test-socks5
30413017
- test-socks5-tls
30423018
- test-snappy-compression
3043-
- test-zstd-1.x-compression
3044-
- test-zstd-2.x-compression
3019+
- test-zstd-compression
30453020
- test-tls-support-latest
30463021
- test-tls-support-8.0
30473022
- test-tls-support-7.0
@@ -3085,8 +3060,7 @@ buildvariants:
30853060
- test-socks5
30863061
- test-socks5-tls
30873062
- test-snappy-compression
3088-
- test-zstd-1.x-compression
3089-
- test-zstd-2.x-compression
3063+
- test-zstd-compression
30903064
- test-tls-support-latest
30913065
- test-tls-support-8.0
30923066
- test-tls-support-7.0

.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ TASKS.push({
243243
});
244244

245245
TASKS.push({
246-
name: `test-zstd-1.x-compression`,
246+
name: `test-zstd-compression`,
247247
tags: ['latest', 'zstd'],
248248
commands: [
249249
updateExpansions({
@@ -256,31 +256,6 @@ TASKS.push({
256256
}),
257257
{ func: 'install dependencies' },
258258
{ func: 'bootstrap mongo-orchestration' },
259-
{
260-
func: 'install package',
261-
vars: {
262-
PACKAGE: '@mongodb-js/zstd@1.x'
263-
}
264-
},
265-
{ func: 'run-compression-tests' }
266-
]
267-
});
268-
269-
TASKS.push({
270-
name: `test-zstd-2.x-compression`,
271-
tags: ['latest', 'zstd'],
272-
commands: [
273-
updateExpansions({
274-
VERSION: 'latest',
275-
TOPOLOGY: 'replica_set',
276-
AUTH: 'auth',
277-
COMPRESSOR: 'zstd',
278-
CLIENT_ENCRYPTION: 'false',
279-
TEST_CSFLE: 'false'
280-
}),
281-
{ func: 'install dependencies' },
282-
{ func: 'bootstrap mongo-orchestration' },
283-
// no need to manually install zstd - we specify 2.x as a dev dependency in package.json
284259
{ func: 'run-compression-tests' }
285260
]
286261
});

.github/dependabot.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,19 @@ updates:
3232
versions: [">=10.0.0"]
3333
# we ignore TS as a part of quarterly dependency updates.
3434
- dependency-name: "typescript"
35-
# stay on the supported major version of gcp-metadata
36-
- dependency-name: "gcp-metadata"
37-
versions: [">=6.0.0"]
3835
# NODE-3773: sinon 19+ breaks the srv polling unit tests
3936
- dependency-name: "sinon"
4037
versions: ["18.x"]
4138

39+
# ignore all peer dependencies
40+
- dependency-name: "@aws-sdk/credential-providers"
41+
- dependency-name: "@mongodb-js/zstd"
42+
- dependency-name: "gcp-metadata"
43+
- dependency-name: "kerberos"
44+
- dependency-name: "mongodb-client-encryption"
45+
- dependency-name: "snappy"
46+
- dependency-name: "socks"
47+
4248
versioning-strategy: increase
4349

4450
groups:

0 commit comments

Comments
 (0)