Skip to content

Commit 7bef363

Browse files
authored
feat(NODE-5584)!: adopt bson v6 and mongodb-client-encryption v6 (#3845)
1 parent 05d2725 commit 7bef363

File tree

7 files changed

+12
-70
lines changed

7 files changed

+12
-70
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,24 +2749,6 @@ tasks:
27492749
- func: run custom csfle tests
27502750
vars:
27512751
CSFLE_GIT_REF: master
2752-
- name: test-latest-driver-mongodb-client-encryption-6.0.0
2753-
tags:
2754-
- run-custom-dependency-tests
2755-
commands:
2756-
- func: install dependencies
2757-
vars:
2758-
NODE_LTS_VERSION: 16
2759-
- func: bootstrap mongo-orchestration
2760-
vars:
2761-
VERSION: '7.0'
2762-
TOPOLOGY: replica_set
2763-
- func: bootstrap kms servers
2764-
- func: install package
2765-
vars:
2766-
PACKAGE: mongodb-client-encryption@6.0.0-alpha.3
2767-
- func: run tests
2768-
vars:
2769-
CLIENT_ENCRYPTION: true
27702752
- name: test-latest-server-noauth
27712753
tags:
27722754
- latest
@@ -4039,7 +4021,6 @@ buildvariants:
40394021
- run-custom-csfle-tests-rapid-master
40404022
- run-custom-csfle-tests-latest-pinned-commit
40414023
- run-custom-csfle-tests-latest-master
4042-
- test-latest-driver-mongodb-client-encryption-6.0.0
40434024
- name: rhel8-test-serverless
40444025
display_name: Serverless Test
40454026
run_on: rhel80-large

.evergreen/generate_evergreen_tasks.js

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -677,38 +677,6 @@ for (const version of ['5.0', 'rapid', 'latest']) {
677677
}
678678
}
679679

680-
oneOffFuncAsTasks.push({
681-
name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
682-
tags: ['run-custom-dependency-tests'],
683-
commands: [
684-
{
685-
func: 'install dependencies',
686-
vars: {
687-
NODE_LTS_VERSION: LOWEST_LTS
688-
}
689-
},
690-
{
691-
func: 'bootstrap mongo-orchestration',
692-
vars: {
693-
VERSION: '7.0',
694-
TOPOLOGY: 'replica_set'
695-
}
696-
},
697-
{ func: 'bootstrap kms servers' },
698-
{
699-
func: 'install package',
700-
vars: {
701-
PACKAGE: 'mongodb-client-encryption@6.0.0-alpha.3'
702-
}
703-
},
704-
{
705-
func: 'run tests',
706-
vars: {
707-
CLIENT_ENCRYPTION: true
708-
}
709-
}
710-
]
711-
});
712680

713681
const coverageTask = {
714682
name: 'download and merge coverage'.split(' ').join('-'),

.evergreen/run-socks5-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ function setup_fle() {
2020
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
2121
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
2222

23-
npm i mongodb-client-encryption@alpha
2423
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
2524
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
2625
export TEST_CSFLE=true

.evergreen/run-unit-tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ set -o errexit # Exit the script with error if any of the commands fail
44
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
55
set -o xtrace
66

7-
npm i mongodb-client-encryption@alpha
8-
97
npx nyc npm run check:unit

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
},
2727
"dependencies": {
2828
"@mongodb-js/saslprep": "^1.1.0",
29-
"bson": "^6.0.0-alpha.1",
29+
"bson": "^6.0.0",
3030
"mongodb-connection-string-url": "^2.6.0"
3131
},
3232
"peerDependencies": {
3333
"@aws-sdk/credential-providers": "^3.188.0",
3434
"@mongodb-js/zstd": "^1.1.0",
3535
"gcp-metadata": "^5.2.0",
3636
"kerberos": "^2.0.1",
37-
"mongodb-client-encryption": ">=6.0.0-alpha.3 <7",
37+
"mongodb-client-encryption": ">=6.0.0 <7",
3838
"snappy": "^7.2.2",
3939
"socks": "^2.7.1"
4040
},
@@ -96,7 +96,7 @@
9696
"js-yaml": "^4.1.0",
9797
"mocha": "^10.2.0",
9898
"mocha-sinon": "^2.1.2",
99-
"mongodb-client-encryption": "6.0.0-alpha.3",
99+
"mongodb-client-encryption": "^6.0.0",
100100
"mongodb-legacy": "github:mongodb-js/nodejs-mongodb-legacy#main",
101101
"nyc": "^15.1.0",
102102
"prettier": "^2.8.8",

test/action/dependency.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ describe('package.json', function () {
9191

9292
context(`when ${depName} is installed`, () => {
9393
beforeEach(async function () {
94-
if (depName === 'mongodb-client-encryption') {
95-
execSync(`npm install --no-save "${depName}"@alpha`);
96-
return;
97-
}
9894
execSync(`npm install --no-save "${depName}"@"${depMajor}"`);
9995
});
10096

0 commit comments

Comments
 (0)