Skip to content

Commit

Permalink
feat(NODE-5584)!: adopt bson v6 and mongodb-client-encryption v6 (#3845)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbbeeken authored Aug 28, 2023
1 parent 05d2725 commit 7bef363
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 70 deletions.
19 changes: 0 additions & 19 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2749,24 +2749,6 @@ tasks:
- func: run custom csfle tests
vars:
CSFLE_GIT_REF: master
- name: test-latest-driver-mongodb-client-encryption-6.0.0
tags:
- run-custom-dependency-tests
commands:
- func: install dependencies
vars:
NODE_LTS_VERSION: 16
- func: bootstrap mongo-orchestration
vars:
VERSION: '7.0'
TOPOLOGY: replica_set
- func: bootstrap kms servers
- func: install package
vars:
PACKAGE: mongodb-client-encryption@6.0.0-alpha.3
- func: run tests
vars:
CLIENT_ENCRYPTION: true
- name: test-latest-server-noauth
tags:
- latest
Expand Down Expand Up @@ -4039,7 +4021,6 @@ buildvariants:
- run-custom-csfle-tests-rapid-master
- run-custom-csfle-tests-latest-pinned-commit
- run-custom-csfle-tests-latest-master
- test-latest-driver-mongodb-client-encryption-6.0.0
- name: rhel8-test-serverless
display_name: Serverless Test
run_on: rhel80-large
Expand Down
32 changes: 0 additions & 32 deletions .evergreen/generate_evergreen_tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -677,38 +677,6 @@ for (const version of ['5.0', 'rapid', 'latest']) {
}
}

oneOffFuncAsTasks.push({
name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
tags: ['run-custom-dependency-tests'],
commands: [
{
func: 'install dependencies',
vars: {
NODE_LTS_VERSION: LOWEST_LTS
}
},
{
func: 'bootstrap mongo-orchestration',
vars: {
VERSION: '7.0',
TOPOLOGY: 'replica_set'
}
},
{ func: 'bootstrap kms servers' },
{
func: 'install package',
vars: {
PACKAGE: 'mongodb-client-encryption@6.0.0-alpha.3'
}
},
{
func: 'run tests',
vars: {
CLIENT_ENCRYPTION: true
}
}
]
});

const coverageTask = {
name: 'download and merge coverage'.split(' ').join('-'),
Expand Down
1 change: 0 additions & 1 deletion .evergreen/run-socks5-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function setup_fle() {
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh

npm i mongodb-client-encryption@alpha
export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
export TEST_CSFLE=true
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ set -o errexit # Exit the script with error if any of the commands fail
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
set -o xtrace

npm i mongodb-client-encryption@alpha

npx nyc npm run check:unit
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"dependencies": {
"@mongodb-js/saslprep": "^1.1.0",
"bson": "^6.0.0-alpha.1",
"bson": "^6.0.0",
"mongodb-connection-string-url": "^2.6.0"
},
"peerDependencies": {
"@aws-sdk/credential-providers": "^3.188.0",
"@mongodb-js/zstd": "^1.1.0",
"gcp-metadata": "^5.2.0",
"kerberos": "^2.0.1",
"mongodb-client-encryption": ">=6.0.0-alpha.3 <7",
"mongodb-client-encryption": ">=6.0.0 <7",
"snappy": "^7.2.2",
"socks": "^2.7.1"
},
Expand Down Expand Up @@ -96,7 +96,7 @@
"js-yaml": "^4.1.0",
"mocha": "^10.2.0",
"mocha-sinon": "^2.1.2",
"mongodb-client-encryption": "6.0.0-alpha.3",
"mongodb-client-encryption": "^6.0.0",
"mongodb-legacy": "github:mongodb-js/nodejs-mongodb-legacy#main",
"nyc": "^15.1.0",
"prettier": "^2.8.8",
Expand Down
4 changes: 0 additions & 4 deletions test/action/dependency.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ describe('package.json', function () {

context(`when ${depName} is installed`, () => {
beforeEach(async function () {
if (depName === 'mongodb-client-encryption') {
execSync(`npm install --no-save "${depName}"@alpha`);
return;
}
execSync(`npm install --no-save "${depName}"@"${depMajor}"`);
});

Expand Down

0 comments on commit 7bef363

Please sign in to comment.