fix(NODE-4556): attempt to use exported BSON #443
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
durran
requested review from
addaleax,
baileympearson,
dariakp and
nbbeeken
as code owners
5 tasks
dariakp
requested changes
Aug 17, 2022
durran
changed the title
durran
force-pushed
the
NODE-4516
branch
3 times, most recently
from
d773cf7 to
45e6ba7
Compare
durran
commented
Aug 19, 2022
| // This case is driver 4.9.0 and higher. | ||
| context('when mongodb exports BSON', function () { | ||
| context('when a bson option is provided', function () { | ||
| const bson = Object.assign({}, BSON); |
Member
Author
There was a problem hiding this comment.
We clone the original BSON module and use the clone as the bson option so it does not have object equality and then matches.
durran
commented
Aug 19, 2022
| ); | ||
|
|
||
| it('uses the mongodb exported BSON', function () { | ||
| expect(encrypter._bson).to.equal(BSON); |
Member
Author
There was a problem hiding this comment.
When we provide no bson option we use the exported BSON from the driver.
durran
commented
Aug 19, 2022
| const encrypter = new AutoEncrypter( | ||
| {}, | ||
| { | ||
| bson: bson, |
Member
Author
There was a problem hiding this comment.
We ensure here we use the bson option.
durran
commented
Aug 19, 2022
| }); | ||
|
|
||
| context('when a bson option is not provided', function () { | ||
| const mongoNoBson = { ...mongodb, BSON: undefined }; |
Member
Author
There was a problem hiding this comment.
This is to ensure BSON is not exported by the module we inject.
5 tasks
baileympearson
requested changes
Aug 19, 2022
Member
Author
|
This has also been rebased/squashed. |
baileympearson
approved these changes
Aug 19, 2022
Contributor
|
filed a flakey test ticket for socks5 tests and restarted the run - https://jira.mongodb.org/browse/NODE-4567 |
dariakp
approved these changes
Aug 19, 2022
nbbeeken
approved these changes
Aug 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates the Node bindings to first attempt to use the exported
BSONfrom themongodbmodule before falling back to the old behaviour. This means that:BSONfrom the driver itself.bsonobject passed in the options or onclient.topologyThis allows driver 4.9.0 and higher to not need a connected client to be able to user csfle.
Main of the Node driver is now pinning on the latest commit in this PR and passing, running all live tests: https://spruce.mongodb.com/task/mongo_node_driver_next_ubuntu1804_custom_dependency_tests_run_custom_csfle_tests_latest_pinned_commit_40d485c292a14f8251a4e3724d1bb5f8cf11577c_22_08_17_20_53_00/tests?execution=0&sortBy=STATUS&sortDir=ASC
The patch build shows this works (since the tests pass and bson is no longer a dev dependency) but the dev dependency on mongodb will need to bump to the next release once mongodb/node-mongodb-native#3367 is merged.