New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(NODE-6391): Add timeoutMS support to explicit encryption #4269

Merged

W-A-James merged 70 commits into NODE-6090 from NODE-6391/explicit-encryption

Oct 29, 2024

Contributor

aditi-khare-mongoDB commented Oct 8, 2024 •

edited by nbbeeken

Loading

Description

What is changing?

Add timeoutMS support to

ClientEncryptionOptions
the following ClientEncryption helper functions:
- encrypt
- decrypt
- createDataKey
- createEncryptedCollection
Implemented spec prose tests for the above (createDataKey, encrypt, decrypt)
Add integration test for createEncryptedCollection and CSOT
Add unit tests for ClientEncryption getting a timeoutMS value from client and/or ClientEncryptionOptions

Is there new documentation needed for these changes?

During release

What is the motivation for this change?

Spec Compliance

Double check the following

Ran npm run check:lint script
Self-review completed using the steps outlined here
PR title follows the correct format: type(NODE-xxxx)[!]: description
- Example: feat(NODE-1234)!: rewriting everything in coffeescript
Changes are covered by tests
New TODOs have a related JIRA ticket

W-A-James and others added 18 commits

October 1, 2024 14:06


          feat(NODE-6090): Implement CSOT logic for connection checkout and ser…

…ver selection


          test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)

a216ae6


          refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)

aca9661


          refactor(NODE-6230): executeOperation to use iterative retry mechanism (

3051def

#4157)


          feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)

df025f4

Co-authored-by: Warren James <[email protected]>


          feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…

83cd82b

…4186)


          feat(NODE-6312): add error transformation for server timeouts (#4192)

c36dce5


          feat(NODE-6313): add CSOT support to sessions and transactions (#4199)

3fe3e01


          feat(NODE-6304): add CSOT support for non-tailable cursors (#4195)

7b4aa84


          fix(NODE-6374): MongoOperationTimeoutError inherits MongoRuntimeError (…

3045a34

…#4237)


          test: remove empty skipped context blocks (#4238)

11d059f


          feat(NODE-5844): add iscryptd to ServerDescription (#4239)

bfeeda9


          chore: allow clientBulkWrite to use TimeoutContext (#4251)

7a12914


          feat(NODE-6274): add CSOT support to bulkWrite (#4250)

09f6d7d

Co-authored-by: Bailey Pearson <[email protected]>


          feat(NODE-6275): Add CSOT support to GridFS (#4246)

1a06868

Co-authored-by: Neal Beeken <[email protected]>
Co-authored-by: Bailey Pearson <[email protected]>


          refactor(NODE-6411): AbstractCursor accepts an external timeout conte…

392599c

…xt (#4264)


          feat(NODE-6305): Add CSOT support to tailable cursors (#4218)

9a1b2d0

Co-authored-by: Neal Beeken <[email protected]>


          feat(NODE-6389): add support for timeoutMS in StateMachine.execute() (#…

d26a588

…4243)

Co-authored-by: Warren James <[email protected]>
Co-authored-by: Neal Beeken <[email protected]>
Co-authored-by: Bailey Pearson <[email protected]>

evergreen-ci-prod bot commented Oct 8, 2024

There is an existing patch(es) for this commit SHA:

Evergreen patch with PR

Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'.

aditi-khare-mongoDB changed the title ~~Node 6391/explicit encryption~~ feat(NODE-6391): Add timeoutMS support to explicit encryption


          src code change no tests

2206be1

aditi-khare-mongoDB changed the base branch from main to NODE-6090

October 8, 2024 21:05

baileympearson force-pushed the NODE-6090 branch 2 times, most recently from 3591368 to a645d9f Compare

October 10, 2024 20:40

W-A-James and others added 6 commits

October 14, 2024 14:09


          feat(NODE-6090): Implement CSOT logic for connection checkout and ser…

6330fd6

…ver selection


          test(NODE-6120): Implement Unified test runner changes for CSOT (#4121)

a1206a0


          refactor(NODE-6187): refactor to use TimeoutContext abstraction (#4131)

a47e280


          refactor(NODE-6230): executeOperation to use iterative retry mechanism (

398066e

#4157)


          feat(NODE-5682): set maxTimeMS on commands and preempt I/O (#4174)

c333723

Co-authored-by: Warren James <[email protected]>


          feat(NODE-6231): Add CSOT behaviour for retryable reads and writes (#…

256ca4e

…4186)

aditi-khare-mongoDB requested a review from W-A-James

October 24, 2024 20:12

W-A-James requested changes

View reviewed changes

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/timeout.ts Show resolved Hide resolved

aditi-khare-mongoDB added 2 commits

October 24, 2024 17:10


          add in comments

3fbcd2e


          typo

ad8970a

aditi-khare-mongoDB requested a review from W-A-James

October 24, 2024 21:11

W-A-James requested changes

View reviewed changes

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/timeout.ts Outdated Show resolved Hide resolved

aditi-khare-mongoDB and others added 2 commits

October 24, 2024 17:40


          Update src/client-side-encryption/client_encryption.ts

9201a08

Co-authored-by: Warren James <[email protected]>


          Update src/timeout.ts

Co-authored-by: Warren James <[email protected]>

aditi-khare-mongoDB requested a review from W-A-James

October 24, 2024 21:41

W-A-James approved these changes

View reviewed changes

W-A-James added Team Review and removed Primary Review labels

baileympearson requested changes

View reviewed changes

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

test/integration/client-side-operations-timeout/client_side_operations_timeout.prose.test.ts Outdated Show resolved Hide resolved

aditi-khare-mongoDB and others added 4 commits

October 28, 2024 04:48


          bailey requested changes

cab26a2


          bailey requested changes

cddad21


          fix merge conflict

2fb01bc


          Merge branch 'NODE-6090' into NODE-6391/explicit-encryption

171c766

aditi-khare-mongoDB commented

View reviewed changes

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

src/client-side-encryption/client_encryption.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Outdated Show resolved Hide resolved

test/integration/client-side-encryption/driver.test.ts Show resolved Hide resolved


          fixed failing tests

7185be8

aditi-khare-mongoDB requested a review from baileympearson

October 28, 2024 19:59

baileympearson approved these changes

View reviewed changes

aditi-khare-mongoDB and others added 2 commits

October 29, 2024 12:02


          Merge branch 'NODE-6090' into NODE-6391/explicit-encryption

c777bb3


          lint fix

12333d1

W-A-James approved these changes

View reviewed changes

W-A-James merged commit c6962d1 into NODE-6090

21 of 27 checks passed

W-A-James deleted the NODE-6391/explicit-encryption branch

October 29, 2024 20:15

nbbeeken pushed a commit that referenced this pull request


          feat(NODE-6391): Add timeoutMS support to explicit encryption (#4269)

da9d474

nbbeeken pushed a commit that referenced this pull request


          feat(NODE-6391): Add timeoutMS support to explicit encryption (#4269)

dariakp pushed a commit that referenced this pull request


          feat(NODE-6391): Add timeoutMS support to explicit encryption (#4269)

f745b99

github-actions bot mentioned this pull request

chore(main): release 6.11.0 [skip-ci] #4317

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels