Skip to content

CXX-2642 update C driver and QE tests for QEv2 collection creation #964

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

Merged
merged 3 commits into from
May 16, 2023
Merged

CXX-2642 update C driver and QE tests for QEv2 collection creation #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54a635e
update C driver dependency to commit cf45741cef8a26b77ae8dda557e49af3…
kevinAlbs May 15, 2023
a68da84
sync `fle2v2-*` to specifications commit aa28f787718eb4306ce7ff8e5a87…
kevinAlbs May 15, 2023
e4c3e3d
sync `encryptedFields.json` to specifications commit aa28f787718eb430…
kevinAlbs May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .mci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#######################################
variables:

mongoc_version_default: &mongoc_version_default "11e31e3e" # TODO: update to 1.24.0 once released.
mongoc_version_default: &mongoc_version_default "cf45741cef8a26b77ae8dda557e49af311a6d66d" # TODO: update to 1.24.0 once released.

# If updating mongoc_version_minimum, also update:
# - the default value of --c-driver-build-ref in etc/make_release.py
# - LIBMONGOC_REQUIRED_VERSION in src/mongocxx/CMakeLists.txt
mongoc_version_minimum: &mongoc_version_minimum "11e31e3e" # TODO: update to 1.24.0 once released.
mongoc_version_minimum: &mongoc_version_minimum "cf45741cef8a26b77ae8dda557e49af311a6d66d" # TODO: update to 1.24.0 once released.

mongodb_version:
version_latest: &version_latest "latest"
Expand Down
3 changes: 0 additions & 3 deletions data/client_side_encryption/explicit-encryption/encryptedFields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"escCollection": "enxcol_.default.esc",
"eccCollection": "enxcol_.default.ecc",
"ecocCollection": "enxcol_.default.ecoc",
"fields": [
{
"keyId": {
Expand Down
3 changes: 0 additions & 3 deletions data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
"collection_name": "default",
"data": [],
"encrypted_fields": {
"escCollection": "enxcol_.default.esc",
"eccCollection": "enxcol_.default.ecc",
"ecocCollection": "enxcol_.default.ecoc",
"fields": [
{
"keyId": {
Expand Down
3 changes: 0 additions & 3 deletions data/client_side_encryption/legacy/fle2v2-Compact.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
"collection_name": "default",
"data": [],
"encrypted_fields": {
"escCollection": "enxcol_.default.esc",
"eccCollection": "enxcol_.default.ecc",
"ecocCollection": "enxcol_.default.ecoc",
"fields": [
{
"keyId": {
Expand Down
62 changes: 62 additions & 0 deletions data/client_side_encryption/legacy/fle2v2-CreateCollection-OldServer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"runOn": [
{
"minServerVersion": "6.0.0",
"maxServerVersion": "6.3.99",
"topology": [
"replicaset",
"sharded",
"load-balanced"
]
}
],
"database_name": "default",
"collection_name": "default",
"tests": [
{
"description": "driver returns an error if creating a QEv2 collection on unsupported server",
"clientOptions": {
"autoEncryptOpts": {
"kmsProviders": {
"aws": {}
},
"encryptedFieldsMap": {
"default.encryptedCollection": {
"fields": [
{
"path": "firstName",
"bsonType": "string",
"keyId": {
"$binary": {
"base64": "AAAAAAAAAAAAAAAAAAAAAA==",
"subType": "04"
}
}
}
]
}
}
}
},
"operations": [
{
"name": "dropCollection",
"object": "database",
"arguments": {
"collection": "encryptedCollection"
}
},
{
"name": "createCollection",
"object": "database",
"arguments": {
"collection": "encryptedCollection"
},
"result": {
"errorContains": "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
}
}
]
}
]
}
Loading