Skip to content

Commit e9db5b2

Browse files
authored
CXX-2642 update C driver and QE tests for QEv2 collection creation (#964)
* update C driver dependency to commit cf45741cef8a26b77ae8dda557e49af311a6d66d To include CDRIVER-4563 * sync `fle2v2-*` to specifications commit aa28f787718eb4306ce7ff8e5a87bd46bb0a2c05 * sync `encryptedFields.json` to specifications commit aa28f787718eb4306ce7ff8e5a87bd46bb0a2c05
1 parent 71b8e91 commit e9db5b2

File tree

60 files changed

+641
-1063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+641
-1063
lines changed

.mci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#######################################
88
variables:
99

10-
mongoc_version_default: &mongoc_version_default "11e31e3e" # TODO: update to 1.24.0 once released.
10+
mongoc_version_default: &mongoc_version_default "cf45741cef8a26b77ae8dda557e49af311a6d66d" # TODO: update to 1.24.0 once released.
1111

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

1717
mongodb_version:
1818
version_latest: &version_latest "latest"

data/client_side_encryption/explicit-encryption/encryptedFields.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"escCollection": "enxcol_.default.esc",
3-
"eccCollection": "enxcol_.default.ecc",
4-
"ecocCollection": "enxcol_.default.ecoc",
52
"fields": [
63
{
74
"keyId": {

data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"collection_name": "default",
1515
"data": [],
1616
"encrypted_fields": {
17-
"escCollection": "enxcol_.default.esc",
18-
"eccCollection": "enxcol_.default.ecc",
19-
"ecocCollection": "enxcol_.default.ecoc",
2017
"fields": [
2118
{
2219
"keyId": {

data/client_side_encryption/legacy/fle2v2-Compact.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"collection_name": "default",
1515
"data": [],
1616
"encrypted_fields": {
17-
"escCollection": "enxcol_.default.esc",
18-
"eccCollection": "enxcol_.default.ecc",
19-
"ecocCollection": "enxcol_.default.ecoc",
2017
"fields": [
2118
{
2219
"keyId": {
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"runOn": [
3+
{
4+
"minServerVersion": "6.0.0",
5+
"maxServerVersion": "6.3.99",
6+
"topology": [
7+
"replicaset",
8+
"sharded",
9+
"load-balanced"
10+
]
11+
}
12+
],
13+
"database_name": "default",
14+
"collection_name": "default",
15+
"tests": [
16+
{
17+
"description": "driver returns an error if creating a QEv2 collection on unsupported server",
18+
"clientOptions": {
19+
"autoEncryptOpts": {
20+
"kmsProviders": {
21+
"aws": {}
22+
},
23+
"encryptedFieldsMap": {
24+
"default.encryptedCollection": {
25+
"fields": [
26+
{
27+
"path": "firstName",
28+
"bsonType": "string",
29+
"keyId": {
30+
"$binary": {
31+
"base64": "AAAAAAAAAAAAAAAAAAAAAA==",
32+
"subType": "04"
33+
}
34+
}
35+
}
36+
]
37+
}
38+
}
39+
}
40+
},
41+
"operations": [
42+
{
43+
"name": "dropCollection",
44+
"object": "database",
45+
"arguments": {
46+
"collection": "encryptedCollection"
47+
}
48+
},
49+
{
50+
"name": "createCollection",
51+
"object": "database",
52+
"arguments": {
53+
"collection": "encryptedCollection"
54+
},
55+
"result": {
56+
"errorContains": "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
57+
}
58+
}
59+
]
60+
}
61+
]
62+
}

0 commit comments

Comments
 (0)