-
Notifications
You must be signed in to change notification settings - Fork 453
CDRIVER-5901 support auto encryption in unified tests #2004
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.
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
base: master
Are you sure you want to change the base?
Conversation
Co-authored-by: Kevin Albertson <[email protected]>
src/libmongoc/tests/json/client_side_encryption/unified/fle2v2-BypassQueryAnalysis.json
Outdated
Show resolved
Hide resolved
"autoEncryptOpts": { | ||
"keyVaultNamespace": "keyvault.datakeys", | ||
"kmsProviders": { | ||
"aws": {} | ||
}, | ||
"extraOptions": { | ||
"mongocryptdBypassSpawn": true | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For future reference, what version of the specifications repository (commit) are these files synced with, and why? There are differences between the files in this PR compared to the latest commit, which has several fields reordered + some other significant changes (e.g. addition of $sessionToken
, removal of object: "unencryptedColl"
, etc.).
@@ -637,7 +641,7 @@ check_schema_version (test_file_t *test_file) | |||
// 1.21 is partially supported (expectedError.writeErrors and expectedError.writeConcernErrors) | |||
// 1.22 is partially supported (keyExpirationMS in client encryption options) | |||
semver_t schema_version; | |||
semver_parse ("1.22", &schema_version); | |||
semver_parse ("1.23", &schema_version); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Recommend updating the comment above to include 1.23 compatibility (full? with exceptions?).
@@ -953,6 +963,51 @@ test_setup_initial_data (test_t *test, bson_error_t *error) | |||
memset (error, 0, sizeof (bson_error_t)); | |||
} | |||
|
|||
// Also drop `enxcol_.<coll>.esc` and `enxcol_.<coll>.ecoc` in case the collection will be used for QE. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these series of blocks implementing this part of the CSFLE spec?
- Drop the collection with name
encryptedFields["escCollection"]
. IfencryptedFields["escCollection"]
is not set, use the collection nameenxcol_.<collectionName>.esc
.- Drop the collection with name
encryptedFields["ecocCollection"]
. IfencryptedFields["ecocCollection"]
is not set, use the collection nameenxcol_.<collectionName>.ecoc
.- Drop the collection
collectionName
.
If so, recommend adding a link/reference to this spec (+ is this missing handling of "escCollection"
/"ecocCollection"
?). If not, recommend elaborating what is meant by "in case the collection will be used for QE" (that is, what is motivating these drop commands?).
Co-authored-by: Ezra Chung <[email protected]>
Evergreen: https://spruce.mongodb.com/version/6827b7ca805919000708843e