Skip to content

Commit 0e01f26

Browse files
eramongodberamongodb
authored
CXX-2656 Update tests for QEv2 compatibility (#953)
* Move legacy client side encryption test files into legacy subdirectory * Sort *_TESTS_PATH variable export commands * CXX-2656 skip QE prose tests on server versions older than 7.0 * Use Catch2 WARN instead of std::cerr * Improve error message on unexpected success on expectError * CXX-2656 Sync legacy client-side-encryption spec test files with 64deb283 * CXX-2656 Bump minimium libmongoc version to 8aced03a * CXX-2671 skip snapshot documentation examples on server 7.0 and newer
1 parent aa1fa62 commit 0e01f26

File tree

99 files changed

+38077
-254
lines changed

Some content is hidden

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

99 files changed

+38077
-254
lines changed

‎.mci.yml

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

10-
mongoc_version_default: &mongoc_version_default "9ef1cc99" # TODO: update to 1.24.0 once released.
10+
mongoc_version_default: &mongoc_version_default "8aced03a" # 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 "9ef1cc99" # TODO: update to 1.24.0 once released.
15+
mongoc_version_minimum: &mongoc_version_minimum "8aced03a" # TODO: update to 1.24.0 once released.
1616

1717
mongodb_version:
1818
version_latest: &version_latest "latest"
@@ -381,25 +381,26 @@ functions:
381381
fi
382382
export PATH=$(pwd)/src/bsoncxx/${build_type}:$(pwd)/src/mongocxx/${build_type}:$PREFIX/bin:$(pwd)/install/bin:$PATH
383383
384+
export CHANGE_STREAMS_UNIFIED_TESTS_PATH="$(pwd)/../data/change-streams/unified"
385+
export CLIENT_SIDE_ENCRYPTION_LEGACY_TESTS_PATH="$(pwd)/../data/client_side_encryption/legacy"
386+
export CLIENT_SIDE_ENCRYPTION_TESTS_PATH="$(pwd)/../data/client_side_encryption"
387+
export CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS_PATH="$(pwd)/../data/client_side_encryption/unified"
388+
export COLLECTION_MANAGEMENT_TESTS_PATH="$(pwd)/../data/collection-management"
389+
export COMMAND_MONITORING_TESTS_PATH="$(pwd)/../data/command-monitoring"
384390
export CRUD_LEGACY_TESTS_PATH="$(pwd)/../data/crud/legacy"
385391
export CRUD_UNIFIED_TESTS_PATH="$(pwd)/../data/crud/unified"
386-
export CHANGE_STREAMS_UNIFIED_TESTS_PATH="$(pwd)/../data/change-streams/unified"
387-
export ENCRYPTION_TESTS_PATH="$(pwd)/../data/client_side_encryption"
388-
export INITIAL_DNS_SEEDLIST_DISCOVERY_TESTS_PATH="$(pwd)/../data/initial_dns_seedlist_discovery"
389392
export GRIDFS_TESTS_PATH="$(pwd)/../data/gridfs"
390-
export COMMAND_MONITORING_TESTS_PATH="$(pwd)/../data/command-monitoring"
391-
export TRANSACTIONS_TESTS_PATH="$(pwd)/../data/transactions"
392-
export WITH_TRANSACTION_TESTS_PATH="$(pwd)/../data/with_transaction"
393+
export INITIAL_DNS_SEEDLIST_DISCOVERY_TESTS_PATH="$(pwd)/../data/initial_dns_seedlist_discovery"
394+
export READ_WRITE_CONCERN_OPERATION_TESTS_PATH="$(pwd)/../data/read-write-concern/operation"
393395
export RETRYABLE_READS_LEGACY_TESTS_PATH="$(pwd)/../data/retryable-reads/legacy"
394396
export RETRYABLE_READS_UNIFIED_TESTS_PATH="$(pwd)/../data/retryable-reads/unified"
395397
export RETRYABLE_WRITES_UNIFIED_TESTS_PATH="$(pwd)/../data/retryable-writes/unified"
396-
export READ_WRITE_CONCERN_OPERATION_TESTS_PATH="$(pwd)/../data/read-write-concern/operation"
397-
export UNIFIED_FORMAT_TESTS_PATH=$(pwd)/../data/unified-format
398398
export SESSION_UNIFIED_TESTS_PATH="$(pwd)/../data/sessions/unified"
399-
export VERSIONED_API_TESTS_PATH=$(pwd)/../data/versioned-api
400-
export COLLECTION_MANAGEMENT_TESTS_PATH="$(pwd)/../data/collection-management"
399+
export TRANSACTIONS_TESTS_PATH="$(pwd)/../data/transactions"
400+
export UNIFIED_FORMAT_TESTS_PATH=$(pwd)/../data/unified-format
401401
export URI_OPTIONS_TESTS_PATH="$(pwd)/../data/uri-options"
402-
export CLIENT_SIDE_ENCRYPTION_UNIFIED_TESTS_PATH="$(pwd)/../data/client_side_encryption/unified"
402+
export VERSIONED_API_TESTS_PATH=$(pwd)/../data/versioned-api
403+
export WITH_TRANSACTION_TESTS_PATH="$(pwd)/../data/with_transaction"
403404
404405
export MONGODB_API_VERSION="${MONGODB_API_VERSION}"
405406

‎data/client_side_encryption/aggregate.json renamed to ‎data/client_side_encryption/legacy/aggregate.json

File renamed without changes.

‎data/client_side_encryption/awsTemporary.json renamed to ‎data/client_side_encryption/legacy/awsTemporary.json

File renamed without changes.

‎data/client_side_encryption/azureKMS.json renamed to ‎data/client_side_encryption/legacy/azureKMS.json

File renamed without changes.

‎data/client_side_encryption/badQueries.json renamed to ‎data/client_side_encryption/legacy/badQueries.json

File renamed without changes.

‎data/client_side_encryption/badSchema.json renamed to ‎data/client_side_encryption/legacy/badSchema.json

File renamed without changes.

‎data/client_side_encryption/basic.json renamed to ‎data/client_side_encryption/legacy/basic.json

File renamed without changes.

‎data/client_side_encryption/bulk.json renamed to ‎data/client_side_encryption/legacy/bulk.json

File renamed without changes.

‎data/client_side_encryption/bypassAutoEncryption.json renamed to ‎data/client_side_encryption/legacy/bypassAutoEncryption.json

File renamed without changes.

‎data/client_side_encryption/bypassedCommand.json renamed to ‎data/client_side_encryption/legacy/bypassedCommand.json

File renamed without changes.

‎data/client_side_encryption/count.json renamed to ‎data/client_side_encryption/legacy/count.json

File renamed without changes.

‎data/client_side_encryption/countDocuments.json renamed to ‎data/client_side_encryption/legacy/countDocuments.json

File renamed without changes.

‎data/client_side_encryption/delete.json renamed to ‎data/client_side_encryption/legacy/delete.json

File renamed without changes.

‎data/client_side_encryption/distinct.json renamed to ‎data/client_side_encryption/legacy/distinct.json

File renamed without changes.

‎data/client_side_encryption/explain.json renamed to ‎data/client_side_encryption/legacy/explain.json

File renamed without changes.

‎data/client_side_encryption/find.json renamed to ‎data/client_side_encryption/legacy/find.json

File renamed without changes.

‎data/client_side_encryption/findOneAndDelete.json renamed to ‎data/client_side_encryption/legacy/findOneAndDelete.json

File renamed without changes.

‎data/client_side_encryption/findOneAndReplace.json renamed to ‎data/client_side_encryption/legacy/findOneAndReplace.json

File renamed without changes.

‎data/client_side_encryption/findOneAndUpdate.json renamed to ‎data/client_side_encryption/legacy/findOneAndUpdate.json

File renamed without changes.

‎data/client_side_encryption/fle2-BypassQueryAnalysis.json renamed to ‎data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json

Lines changed: 6 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -75,36 +76,6 @@
7576
"masterKey": {
7677
"provider": "local"
7778
}
78-
},
79-
{
80-
"_id": {
81-
"$binary": {
82-
"base64": "q83vqxI0mHYSNBI0VniQEg==",
83-
"subType": "04"
84-
}
85-
},
86-
"keyMaterial": {
87-
"$binary": {
88-
"base64": "HBk9BWihXExNDvTp1lUxOuxuZK2Pe2ZdVdlsxPEBkiO1bS4mG5NNDsQ7zVxJAH8BtdOYp72Ku4Y3nwc0BUpIKsvAKX4eYXtlhv5zUQxWdeNFhg9qK7qb8nqhnnLeT0f25jFSqzWJoT379hfwDeu0bebJHr35QrJ8myZdPMTEDYF08QYQ48ShRBli0S+QzBHHAQiM2iJNr4svg2WR8JSeWQ==",
89-
"subType": "00"
90-
}
91-
},
92-
"creationDate": {
93-
"$date": {
94-
"$numberLong": "1648914851981"
95-
}
96-
},
97-
"updateDate": {
98-
"$date": {
99-
"$numberLong": "1648914851981"
100-
}
101-
},
102-
"status": {
103-
"$numberInt": "0"
104-
},
105-
"masterKey": {
106-
"provider": "local"
107-
}
10879
}
10980
],
11081
"tests": [
@@ -133,7 +104,7 @@
133104
"_id": 1,
134105
"encryptedIndexed": {
135106
"$binary": {
136-
"base64": "BHEBAAAFZAAgAAAAAHb62aV7+mqmaGcotPLdG3KP7S8diFwWMLM/5rYtqLrEBXMAIAAAAAAVJ6OWHRv3OtCozHpt3ZzfBhaxZirLv3B+G8PuaaO4EgVjACAAAAAAsZXWOWA+UiCBbrJNB6bHflB/cn7pWSvwWN2jw4FPeIUFcABQAAAAAMdD1nV2nqeI1eXEQNskDflCy8I7/HvvqDKJ6XxjhrPQWdLqjz+8GosGUsB7A8ee/uG9/guENuL25XD+Fxxkv1LLXtavHOlLF7iW0u9yabqqBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AE0AAAAAq83vqxI0mHYSNBI0VniQEkzZZBBDgeZh+h+gXEmOrSFtVvkUcnHWj/rfPW7iJ0G3UJ8zpuBmUM/VjOMJCY4+eDqdTiPIwX+/vNXegc8FZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsAA==",
107+
"base64": "C18BAAAFZAAgAAAAANnt+eLTkv4GdDPl8IAfJOvTzArOgFJQ2S/DcLza4W0DBXMAIAAAAAD2u+omZme3P2gBPehMQyQHQ153tPN1+z7bksYA9jKTpAVwADAAAAAAUnCOQqIvmR65YKyYnsiVfVrg9hwUVO3RhhKExo3RWOzgaS0QdsBL5xKFS0JhZSoWBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AFAAAAAAEjRWeBI0mHYSNBI0VniQEpQbp/ZJpWBKeDtKLiXb0P2E9wvc0g3f373jnYQYlJquOrlPOoEy3ngsHPJuSUijvWDsrQzqYa349K7G/66qaXEFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsBWwAIAAAAACkm0o9bj6j0HuADKc0svbqO2UHj6GrlNdF6yKNxh63xRJrAAAAAAAAAAAAAA==",
137108
"subType": "06"
138109
}
139110
}
@@ -150,7 +121,7 @@
150121
"result": [
151122
{
152123
"_id": 1,
153-
"encryptedIndexed": "value123"
124+
"encryptedIndexed": "123"
154125
}
155126
]
156127
}
@@ -176,7 +147,7 @@
176147
"_id": 1,
177148
"encryptedIndexed": {
178149
"$binary": {
179-
"base64": "BHEBAAAFZAAgAAAAAHb62aV7+mqmaGcotPLdG3KP7S8diFwWMLM/5rYtqLrEBXMAIAAAAAAVJ6OWHRv3OtCozHpt3ZzfBhaxZirLv3B+G8PuaaO4EgVjACAAAAAAsZXWOWA+UiCBbrJNB6bHflB/cn7pWSvwWN2jw4FPeIUFcABQAAAAAMdD1nV2nqeI1eXEQNskDflCy8I7/HvvqDKJ6XxjhrPQWdLqjz+8GosGUsB7A8ee/uG9/guENuL25XD+Fxxkv1LLXtavHOlLF7iW0u9yabqqBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AE0AAAAAq83vqxI0mHYSNBI0VniQEkzZZBBDgeZh+h+gXEmOrSFtVvkUcnHWj/rfPW7iJ0G3UJ8zpuBmUM/VjOMJCY4+eDqdTiPIwX+/vNXegc8FZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsAA==",
150+
"base64": "C18BAAAFZAAgAAAAANnt+eLTkv4GdDPl8IAfJOvTzArOgFJQ2S/DcLza4W0DBXMAIAAAAAD2u+omZme3P2gBPehMQyQHQ153tPN1+z7bksYA9jKTpAVwADAAAAAAUnCOQqIvmR65YKyYnsiVfVrg9hwUVO3RhhKExo3RWOzgaS0QdsBL5xKFS0JhZSoWBXUAEAAAAAQSNFZ4EjSYdhI0EjRWeJASEHQAAgAAAAV2AFAAAAAAEjRWeBI0mHYSNBI0VniQEpQbp/ZJpWBKeDtKLiXb0P2E9wvc0g3f373jnYQYlJquOrlPOoEy3ngsHPJuSUijvWDsrQzqYa349K7G/66qaXEFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsBWwAIAAAAACkm0o9bj6j0HuADKc0svbqO2UHj6GrlNdF6yKNxh63xRJrAAAAAAAAAAAAAA==",
180151
"subType": "06"
181152
}
182153
}
@@ -230,39 +201,6 @@
230201
},
231202
"command_name": "find"
232203
}
233-
},
234-
{
235-
"command_started_event": {
236-
"command": {
237-
"find": "datakeys",
238-
"filter": {
239-
"$or": [
240-
{
241-
"_id": {
242-
"$in": [
243-
{
244-
"$binary": {
245-
"base64": "q83vqxI0mHYSNBI0VniQEg==",
246-
"subType": "04"
247-
}
248-
}
249-
]
250-
}
251-
},
252-
{
253-
"keyAltNames": {
254-
"$in": []
255-
}
256-
}
257-
]
258-
},
259-
"$db": "keyvault",
260-
"readConcern": {
261-
"level": "majority"
262-
}
263-
},
264-
"command_name": "find"
265-
}
266204
}
267205
],
268206
"outcome": {
@@ -276,7 +214,7 @@
276214
"__safeContent__": [
277215
{
278216
"$binary": {
279-
"base64": "ThpoKfQ8AkOzkFfNC1+9PF0pY2nIzfXvRdxQgjkNbBw=",
217+
"base64": "31eCYlbQoVboc5zwC8IoyJVSkag9PxREka8dkmbXJeY=",
280218
"subType": "00"
281219
}
282220
}

‎data/client_side_encryption/fle2-Compact.json renamed to ‎data/client_side_encryption/legacy/fle2v2-Compact.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

‎data/client_side_encryption/fle2-CreateCollection.json renamed to ‎data/client_side_encryption/legacy/fle2v2-CreateCollection.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

‎data/client_side_encryption/fle2-DecryptExistingData.json renamed to ‎data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

‎data/client_side_encryption/fle2-Delete.json renamed to ‎data/client_side_encryption/legacy/fle2v2-Delete.json

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -226,7 +227,7 @@
226227
"encryptedIndexed": {
227228
"$eq": {
228229
"$binary": {
229-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
230+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
230231
"subType": "06"
231232
}
232233
}
@@ -271,24 +272,6 @@
271272
}
272273
]
273274
}
274-
},
275-
"deleteTokens": {
276-
"default.default": {
277-
"encryptedIndexed": {
278-
"e": {
279-
"$binary": {
280-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
281-
"subType": "00"
282-
}
283-
},
284-
"o": {
285-
"$binary": {
286-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
287-
"subType": "00"
288-
}
289-
}
290-
}
291-
}
292275
}
293276
}
294277
},

‎data/client_side_encryption/fle2-EncryptedFields-vs-EncryptedFieldsMap.json renamed to ‎data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",

‎data/client_side_encryption/fle2-EncryptedFields-vs-jsonSchema.json renamed to ‎data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -231,7 +232,7 @@
231232
"encryptedIndexed": {
232233
"$eq": {
233234
"$binary": {
234-
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
235+
"base64": "DIkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVsACAAAAAApJtKPW4+o9B7gAynNLL26jtlB4+hq5TXResijcYet8USY20AAAAAAAAAAAAA",
235236
"subType": "06"
236237
}
237238
}

‎data/client_side_encryption/fle2-EncryptedFieldsMap-defaults.json renamed to ‎data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -75,7 +76,6 @@
7576
"default.default": {
7677
"fields": [],
7778
"escCollection": "enxcol_.default.esc",
78-
"eccCollection": "enxcol_.default.ecc",
7979
"ecocCollection": "enxcol_.default.ecoc"
8080
}
8181
}

‎data/client_side_encryption/fle2-FindOneAndUpdate.json renamed to ‎data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -231,7 +232,7 @@
231232
"encryptedIndexed": {
232233
"$eq": {
233234
"$binary": {
234-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
235+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
235236
"subType": "06"
236237
}
237238
}
@@ -278,24 +279,6 @@
278279
}
279280
]
280281
}
281-
},
282-
"deleteTokens": {
283-
"default.default": {
284-
"encryptedIndexed": {
285-
"e": {
286-
"$binary": {
287-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
288-
"subType": "00"
289-
}
290-
},
291-
"o": {
292-
"$binary": {
293-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
294-
"subType": "00"
295-
}
296-
}
297-
}
298-
}
299282
}
300283
}
301284
},
@@ -491,7 +474,7 @@
491474
"encryptedIndexed": {
492475
"$eq": {
493476
"$binary": {
494-
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
477+
"base64": "DIkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVsACAAAAAAaZ9s3G+4znfxStxeOZwcZy1OhzjMGc5hjmdMN+b/w6kSY20AAAAAAAAAAAAA",
495478
"subType": "06"
496479
}
497480
}
@@ -540,24 +523,6 @@
540523
}
541524
]
542525
}
543-
},
544-
"deleteTokens": {
545-
"default.default": {
546-
"encryptedIndexed": {
547-
"e": {
548-
"$binary": {
549-
"base64": "65pz95EthqQpfoHS9nWvdCh05AV+OokP7GUaI+7j8+w=",
550-
"subType": "00"
551-
}
552-
},
553-
"o": {
554-
"$binary": {
555-
"base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
556-
"subType": "00"
557-
}
558-
}
559-
}
560-
}
561526
}
562527
}
563528
},

‎data/client_side_encryption/fle2-InsertFind-Indexed.json renamed to ‎data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "6.0.0",
4+
"minServerVersion": "7.0.0",
5+
"serverless": "forbid",
56
"topology": [
67
"replicaset",
78
"sharded",
@@ -227,7 +228,7 @@
227228
"encryptedIndexed": {
228229
"$eq": {
229230
"$binary": {
230-
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
231+
"base64": "DIkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVsACAAAAAApJtKPW4+o9B7gAynNLL26jtlB4+hq5TXResijcYet8USY20AAAAAAAAAAAAA",
231232
"subType": "06"
232233
}
233234
}

0 commit comments

Comments
 (0)