diff --git a/source/client-side-encryption/client-side-encryption.rst b/source/client-side-encryption/client-side-encryption.rst index f6b122408c..dabfd3722f 100644 --- a/source/client-side-encryption/client-side-encryption.rst +++ b/source/client-side-encryption/client-side-encryption.rst @@ -115,7 +115,6 @@ encryptedFields { "escCollection": "enxcol_.CollectionName.esc", - "eccCollection": "enxcol_.CollectionName.ecc", "ecocCollection": "enxcol_.CollectionName.ecoc", "fields": [ { @@ -134,7 +133,6 @@ encryptedFields The acronyms within ``encryptedFields`` are defined as follows: - * ECC: Encrypted Cache Collection * ECOC: Encrypted Compaction Collection * ESC: Encrypted State Collection @@ -914,6 +912,17 @@ Drivers MUST support a BSON document option named ``encryptedFields`` for any will be interpreted by the helper method and MUST be passed to the `create`_ command. +.. note:: + Users are not expected to set the ``escCollection`` and ``ecocCollection`` in + ``encryptedFields``. SERVER-74069 added server-side validation for those fields + and no longer allows names to deviate from the following: + + - ``enxcol_..esc`` + - ``enxcol_..ecoc` + + Drivers MUST NOT document the ``escCollection`` and ``ecocCollection`` + options. + For a helper function, ``CreateCollection(collectionName, collectionOptions)`` with the name of the database associated as `dbName`, look up the encrypted fields ``encryptedFields`` for the collection as @@ -924,17 +933,16 @@ If a set of ``encryptedFields`` was found, then do the following operations. If any of the following operations error, the remaining operations are not attempted: +- Check the wire version of the writable server. If the wire version is less + than 21 (for server 7.0.0), return an error containing the error message: + "Driver support of Queryable Encryption is incompatible with server. Upgrade + server to use Queryable Encryption." - Create the collection with name ``encryptedFields["escCollection"]`` as a clustered collection using the options ``{clusteredIndex: {key: {_id: 1}, unique: true}}``. If ``encryptedFields["escCollection"]`` is not set, use the collection name ``enxcol_..esc``. Creating this collection MUST NOT check if the collection namespace is in the ``AutoEncryptionOpts.encryptedFieldsMap``. -- Create the collection with name ``encryptedFields["eccCollection"]`` as a - clustered collection using the options - ``{clusteredIndex: {key: {_id: 1}, unique: true}}``. If - ``encryptedFields["eccCollection"]`` is not set, use the collection name - ``enxcol_..ecc``. Creating this collection MUST NOT check if the collection namespace is in the ``AutoEncryptionOpts.encryptedFieldsMap``. - Create the collection with name ``encryptedFields["ecocCollection"]`` as a clustered collection using the options @@ -1002,6 +1010,17 @@ Drivers MUST support a BSON document option named ``encryptedFields`` for any ``Collection.drop()``). This option will only be interpreted by the helper method and MUST NOT be passed to the `drop`_ command. +.. note:: + Users are not expected to set the ``escCollection`` and ``ecocCollection`` in + ``encryptedFields``. SERVER-74069 added server-side validation for those fields + and no longer allows names to deviate from the following: + + - ``enxcol_..esc`` + - ``enxcol_..ecoc` + + Drivers SHOULD NOT document the ``escCollection`` and ``ecocCollection`` + options. + For a helper function ``DropCollection(dropOptions)`` with associated collection named `collName` and database named `dbName`, look up the encrypted fields ``encryptedFields`` as `GetEncryptedFields(dropOptions, collName, dbname, true)` @@ -1015,9 +1034,6 @@ are not attempted. A ``namespace not found`` error returned from the server - Drop the collection with name ``encryptedFields["escCollection"]``. If ``encryptedFields["escCollection"]`` is not set, use the collection name ``enxcol_..esc``. -- Drop the collection with name ``encryptedFields["eccCollection"]``. If - ``encryptedFields["eccCollection"]`` is not set, use the collection name - ``enxcol_..ecc``. - Drop the collection with name ``encryptedFields["ecocCollection"]``. If ``encryptedFields["ecocCollection"]`` is not set, use the collection name ``enxcol_..ecoc``. @@ -2714,6 +2730,7 @@ explicit session parameter as described in the Changelog ========= +:2023-03-30: Remove ECC collection :2023-02-01: Replace ``DataKeyOpts`` with ``masterKey`` in ``createEncryptedCollection``. :2023-01-31: ``createEncryptedCollection`` does not check AutoEncryptionOptions for the encryptedFieldsMap. :2023-01-30: Return ``encryptedFields`` on ``CreateCollection`` error. diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-Date.json b/source/client-side-encryption/etc/data/encryptedFields-Range-Date.json index c9ad1ffdd4..b0299be2a3 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-Date.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-Date.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -33,4 +30,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-Decimal.json b/source/client-side-encryption/etc/data/encryptedFields-Range-Decimal.json index f209536c9c..8bd79a15f8 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-Decimal.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-Decimal.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -23,4 +20,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-DecimalPrecision.json b/source/client-side-encryption/etc/data/encryptedFields-Range-DecimalPrecision.json index e7634152ba..d52974ef51 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-DecimalPrecision.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-DecimalPrecision.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -32,4 +29,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-Double.json b/source/client-side-encryption/etc/data/encryptedFields-Range-Double.json index 4e9e8d6d81..5fbfaa8bdb 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-Double.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-Double.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -23,4 +20,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-DoublePrecision.json b/source/client-side-encryption/etc/data/encryptedFields-Range-DoublePrecision.json index 17c725ec44..18b40d0097 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-DoublePrecision.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-DoublePrecision.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -32,4 +29,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-Int.json b/source/client-side-encryption/etc/data/encryptedFields-Range-Int.json index 661d7395c5..819d0b9896 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-Int.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-Int.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -29,4 +26,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields-Range-Long.json b/source/client-side-encryption/etc/data/encryptedFields-Range-Long.json index b36bfb2c46..c500b85b53 100644 --- a/source/client-side-encryption/etc/data/encryptedFields-Range-Long.json +++ b/source/client-side-encryption/etc/data/encryptedFields-Range-Long.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -29,4 +26,4 @@ } } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/data/encryptedFields.json b/source/client-side-encryption/etc/data/encryptedFields.json index 2364590e4c..88abe5a604 100644 --- a/source/client-side-encryption/etc/data/encryptedFields.json +++ b/source/client-side-encryption/etc/data/encryptedFields.json @@ -1,7 +1,4 @@ { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -30,4 +27,4 @@ "bsonType": "string" } ] -} +} \ No newline at end of file diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml.template index da3f3e3af0..e75ad68350 100644 --- a/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml.template +++ b/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml.template @@ -18,9 +18,6 @@ tests: local: {{ local_provider() }} encryptedFieldsMap: { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [] } } diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template index e5f03737e2..c31d6cfce7 100644 --- a/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template +++ b/source/client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template @@ -45,9 +45,7 @@ tests: }, "schema": { "default.default": { - "fields": [], - "escCollection": "enxcol_.default.esc", - "ecocCollection": "enxcol_.default.ecoc" + "fields": [] } } } diff --git a/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json b/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json index 8f98cd6f2b..6e3ff82a62 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml b/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml index cdeedd0921..8665933be3 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [{'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Compact.json b/source/client-side-encryption/tests/legacy/fle2v2-Compact.json index e3d936e346..e47c689bf0 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Compact.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Compact.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Compact.yml b/source/client-side-encryption/tests/legacy/fle2v2-Compact.yml index 80c214305b..8e88cc5203 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Compact.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Compact.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}}, {'_id': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'HBk9BWihXExNDvTp1lUxOuxuZK2Pe2ZdVdlsxPEBkiO1bS4mG5NNDsQ7zVxJAH8BtdOYp72Ku4Y3nwc0BUpIKsvAKX4eYXtlhv5zUQxWdeNFhg9qK7qb8nqhnnLeT0f25jFSqzWJoT379hfwDeu0bebJHr35QrJ8myZdPMTEDYF08QYQ48ShRBli0S+QzBHHAQiM2iJNr4svg2WR8JSeWQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Compact works" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json new file mode 100644 index 0000000000..d5b04b3ea5 --- /dev/null +++ b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json @@ -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." + } + } + ] + } + ] +} diff --git a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml new file mode 100644 index 0000000000..f55001a429 --- /dev/null +++ b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml @@ -0,0 +1,39 @@ +# Requires libmongocrypt 1.8.0. +runOn: + - minServerVersion: "6.0.0" + maxServerVersion: "6.3.99" + # FLE 2 Encrypted collections are not supported on standalone. + topology: [ "replicaset", "sharded", "load-balanced" ] + +database_name: &database_name "default" +collection_name: &collection_name "default" + +tests: + - description: "driver returns an error if creating a QEv2 collection on unsupported server" + clientOptions: + autoEncryptOpts: + kmsProviders: + aws: {} # Credentials filled in from environment. + encryptedFieldsMap: + default.encryptedCollection: { + "fields": [ + { + "path": "firstName", + "bsonType": "string", + "keyId": { "$binary": { "base64": "AAAAAAAAAAAAAAAAAAAAAA==", "subType": "04" }} + } + ] + } + + operations: + # Do an initial drop to remove collections that may exist from previous test runs. + - 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." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json index 5e197848f8..819d2eec3c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json @@ -22,9 +22,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -65,7 +62,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -108,15 +105,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -150,21 +138,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -185,9 +158,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -243,12 +216,6 @@ "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" } - }, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } } } ] @@ -280,7 +247,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -323,15 +290,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -365,21 +323,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -400,6 +343,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -409,12 +355,6 @@ "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" } - }, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } } } ] @@ -461,12 +401,6 @@ "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" } - }, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } } } ] @@ -498,7 +432,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -537,14 +471,6 @@ "collection": "encryptedCollection" } }, - { - "name": "assertCollectionNotExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.ecc" - } - }, { "name": "assertCollectionNotExists", "object": "testRunner", @@ -581,15 +507,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -623,21 +540,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -667,12 +569,6 @@ "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" } - }, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } } } ] @@ -708,156 +604,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecoc" - }, - "command_name": "drop", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "drop": "encryptedCollection" - }, - "command_name": "drop", - "database_name": "default" - } - } - ] - }, - { - "description": "encryptedFieldsMap with cyclic entries does not loop", - "clientOptions": { - "autoEncryptOpts": { - "kmsProviders": { - "aws": {} - }, - "encryptedFieldsMap": { - "default.encryptedCollection": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { - "$binary": { - "subType": "04", - "base64": "AAAAAAAAAAAAAAAAAAAAAA==" - } - } - } - ] - }, - "default.encryptedCollection.esc": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { - "$binary": { - "subType": "04", - "base64": "AAAAAAAAAAAAAAAAAAAAAA==" - } - } - } - ] - } - } - } - }, - "operations": [ - { - "name": "dropCollection", - "object": "database", - "arguments": { - "collection": "encryptedCollection" - } - }, - { - "name": "createCollection", - "object": "database", - "arguments": { - "collection": "encryptedCollection" - } - }, - { - "name": "assertCollectionExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.esc" - } - }, - { - "name": "assertCollectionExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.ecc" - } - }, - { - "name": "assertCollectionExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.ecoc" - } - }, - { - "name": "assertCollectionExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "encryptedCollection" - } - }, - { - "name": "assertIndexExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "encryptedCollection", - "index": "__safeContent___1" - } - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.esc" - }, - "command_name": "drop", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -875,94 +621,6 @@ "command_name": "drop", "database_name": "default" } - }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.esc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecoc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "create": "encryptedCollection", - "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { - "$binary": { - "subType": "04", - "base64": "AAAAAAAAAAAAAAAAAAAAAA==" - } - } - } - ] - } - }, - "command_name": "create", - "database_name": "default" - } - }, - { - "command_started_event": { - "command": { - "createIndexes": "encryptedCollection", - "indexes": [ - { - "name": "__safeContent___1", - "key": { - "__safeContent__": 1 - } - } - ] - }, - "command_name": "createIndexes", - "database_name": "default" - } } ] }, @@ -975,9 +633,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1060,9 +715,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1103,7 +755,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -1146,15 +798,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1188,21 +831,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1223,9 +851,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -1279,9 +907,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1303,9 +928,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1330,7 +952,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -1373,15 +995,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1415,21 +1028,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1450,9 +1048,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -1511,9 +1109,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1549,15 +1144,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1595,9 +1181,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1619,9 +1202,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1646,7 +1226,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -1684,9 +1264,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1710,14 +1287,6 @@ "collection": "enxcol_.encryptedCollection.esc" } }, - { - "name": "assertCollectionNotExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.ecc" - } - }, { "name": "assertCollectionNotExists", "object": "testRunner", @@ -1745,15 +1314,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1787,21 +1347,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1822,9 +1367,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -1881,15 +1426,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -1927,9 +1463,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1951,9 +1484,6 @@ "arguments": { "collection": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", "fields": [ { "path": "firstName", @@ -1978,7 +1508,7 @@ } }, { - "name": "assertCollectionExists", + "name": "assertCollectionNotExists", "object": "testRunner", "arguments": { "database": "default", @@ -2025,14 +1555,6 @@ "collection": "enxcol_.encryptedCollection.esc" } }, - { - "name": "assertCollectionNotExists", - "object": "testRunner", - "arguments": { - "database": "default", - "collection": "enxcol_.encryptedCollection.ecc" - } - }, { "name": "assertCollectionNotExists", "object": "testRunner", @@ -2060,15 +1582,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "drop": "enxcol_.encryptedCollection.ecc" - }, - "command_name": "drop", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -2102,21 +1615,6 @@ "database_name": "default" } }, - { - "command_started_event": { - "command": { - "create": "enxcol_.encryptedCollection.ecc", - "clusteredIndex": { - "key": { - "_id": 1 - }, - "unique": true - } - }, - "command_name": "create", - "database_name": "default" - } - }, { "command_started_event": { "command": { @@ -2137,9 +1635,9 @@ "command": { "create": "encryptedCollection", "encryptedFields": { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, "fields": [ { "path": "firstName", @@ -2211,7 +1709,7 @@ { "command_started_event": { "command": { - "drop": "enxcol_.encryptedCollection.ecc" + "drop": "enxcol_.encryptedCollection.ecoc" }, "command_name": "drop", "database_name": "default" @@ -2220,19 +1718,57 @@ { "command_started_event": { "command": { - "drop": "enxcol_.encryptedCollection.ecoc" + "drop": "encryptedCollection" }, "command_name": "drop", "database_name": "default" } + } + ] + }, + { + "description": "encryptedFields are consulted for metadata collection names", + "clientOptions": { + "autoEncryptOpts": { + "kmsProviders": { + "aws": {} + }, + "encryptedFieldsMap": { + "default.encryptedCollection": { + "escCollection": "invalid_esc_name", + "ecocCollection": "invalid_ecoc_name", + "fields": [ + { + "path": "firstName", + "bsonType": "string", + "keyId": { + "$binary": { + "subType": "04", + "base64": "AAAAAAAAAAAAAAAAAAAAAA==" + } + } + } + ] + } + } + } + }, + "operations": [ + { + "name": "dropCollection", + "object": "database", + "arguments": { + "collection": "encryptedCollection" + } }, { - "command_started_event": { - "command": { - "drop": "encryptedCollection" - }, - "command_name": "drop", - "database_name": "default" + "name": "createCollection", + "object": "database", + "arguments": { + "collection": "encryptedCollection" + }, + "result": { + "errorContains": "Encrypted State Collection name should follow" } } ] diff --git a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml index 831d970964..ea33865a21 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml @@ -1,4 +1,3 @@ -# This test requires libmongocrypt 1.5.0-alpha2. # Requires libmongocrypt 1.8.0. runOn: - minServerVersion: "7.0.0" @@ -17,10 +16,7 @@ tests: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: &encrypted_fields0 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", + default.encryptedCollection: &encrypted_fields { "fields": [ { "path": "firstName", @@ -35,58 +31,54 @@ tests: - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: &encrypted_collection_name "encryptedCollection" - name: createCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: &esc_collection_name "enxcol_.encryptedCollection.esc" + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: &ecc_collection_name "enxcol_.encryptedCollection.ecc" - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: &ecoc_collection_name "enxcol_.encryptedCollection.ecoc" - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -94,33 +86,39 @@ tests: # State collections are created first. - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name # Data collection is created after. - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields0 + create: *encrypted_collection_name + encryptedFields: &encrypted_fields_expectation { + # Expect state collections are not included in the encryptedFields sent to the server. + "escCollection": null, + "ecocCollection": null, + "eccCollection": null, + "fields": [ + { + "path": "firstName", + "bsonType": "string", + "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} + } + ] + } command_name: create database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -133,79 +131,61 @@ tests: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: &encrypted_fields1 { - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }}, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } - } - } - ] - } + default.encryptedCollection: *encrypted_fields operations: # Do an initial drop to remove collections that may exist from previous test runs. - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: createCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -213,33 +193,27 @@ tests: # State collections are created first. - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name # Data collection is created after. - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields1 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields_expectation command_name: create database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -252,104 +226,83 @@ tests: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: &encrypted_fields2 { - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }}, - "queries": { - "queryType": "equality", - "contention": { - "$numberLong": "0" - } - } - } - ] - } + default.encryptedCollection: *encrypted_fields operations: # Do an initial drop to remove collections that may exist from previous test runs. - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: createCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecoc_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" - - name: assertCollectionNotExists - object: testRunner - arguments: - database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexNotExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -357,33 +310,27 @@ tests: # State collections are created first. - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name # Data collection is created after. - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields2 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields command_name: create database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -393,171 +340,27 @@ tests: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecoc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "encryptedCollection" - command_name: drop - database_name: *database_name - # events from dropCollection ... end - - description: "encryptedFieldsMap with cyclic entries does not loop" - clientOptions: - autoEncryptOpts: - kmsProviders: - aws: {} # Credentials filled in from environment. - encryptedFieldsMap: - # encryptedCollection has encryptedCollection.esc as the escCollection. - # encryptedCollection.esc has encryptedCollection as the escCollection. - default.encryptedCollection: &encrypted_fields3 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } - default.encryptedCollection.esc: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } - operations: - # Do an initial drop to remove collections that may exist from previous test runs. - - name: dropCollection - object: database - arguments: - collection: "encryptedCollection" - - name: createCollection - object: database - arguments: - collection: "encryptedCollection" - - name: assertCollectionExists - object: testRunner - arguments: - database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists - object: testRunner - arguments: - database: *database_name - collection: "enxcol_.encryptedCollection.ecc" - - name: assertCollectionExists - object: testRunner - arguments: - database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" - - name: assertCollectionExists - object: testRunner - arguments: - database: *database_name - collection: "encryptedCollection" - - name: assertIndexExists - object: testRunner - arguments: - database: *database_name - collection: "encryptedCollection" - index: __safeContent___1 - expectations: - # events from dropCollection ... begin - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.esc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end - # events from createCollection ... begin - # State collections are created first. - - command_started_event: - command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecoc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - # Data collection is created after. - - command_started_event: - command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields3 - command_name: create - database_name: *database_name - # Index on __safeContents__ is then created. - - command_started_event: - command: - createIndexes: "encryptedCollection" - indexes: - - name: __safeContent___1 - key: { __safeContent__: 1 } - command_name: createIndexes - database_name: *database_name - # events from createCollection ... end - description: "CreateCollection without encryptedFields." clientOptions: autoEncryptOpts: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + default.encryptedCollection: *encrypted_fields operations: # Do an initial drop to remove collections that may exist from previous test runs. - name: dropCollection @@ -600,75 +403,60 @@ tests: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: &encrypted_fields4 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + default.encryptedCollection: *encrypted_fields operations: # Do an initial drop to remove collections that may exist from previous test runs. - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: createCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -676,33 +464,27 @@ tests: # State collections are created first. - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name # Data collection is created after. - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields4 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields_expectation command_name: create database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -719,82 +501,56 @@ tests: - name: dropCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: createCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: &encrypted_fields5 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -802,40 +558,34 @@ tests: # State collections are created first. - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name # Data collection is created after. - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields5 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields_expectation command_name: create database_name: *database_name # libmongocrypt requests listCollections to get a schema for the "createIndexes" command. - command_started_event: command: listCollections: 1 - filter: { name: "encryptedCollection" } + filter: { name: *encrypted_collection_name } command_name: listCollections database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -849,43 +599,27 @@ tests: kmsProviders: aws: {} # Credentials filled in from environment. encryptedFieldsMap: - default.encryptedCollection: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + default.encryptedCollection: *encrypted_fields operations: - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -900,156 +634,111 @@ tests: - name: dropCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: createCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 - name: dropCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: &encrypted_fields6 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } - - name: assertCollectionNotExists - object: testRunner - arguments: - database: *database_name - collection: "enxcol_.encryptedCollection.esc" + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end # events from createCollection ... begin - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields6 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields_expectation command_name: create database_name: *database_name # libmongocrypt requests listCollections to get a schema for the "createIndexes" command. - command_started_event: command: listCollections: 1 - filter: { name: "encryptedCollection" } + filter: { name: *encrypted_collection_name } command_name: listCollections database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -1059,22 +748,17 @@ tests: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end @@ -1091,145 +775,111 @@ tests: - name: dropCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: createCollection object: database arguments: - collection: "encryptedCollection" - encryptedFields: &encrypted_fields7 { - "escCollection": "enxcol_.encryptedCollection.esc", - "eccCollection": "enxcol_.encryptedCollection.ecc", - "ecocCollection": "enxcol_.encryptedCollection.ecoc", - "fields": [ - { - "path": "firstName", - "bsonType": "string", - "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} - } - ] - } + collection: *encrypted_collection_name + encryptedFields: *encrypted_fields - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" - - name: assertCollectionExists + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 + - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" + collection: *ecoc_collection_name - name: assertCollectionExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name - name: assertIndexExists object: testRunner arguments: database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name index: __safeContent___1 - name: dropCollection object: database arguments: - collection: "encryptedCollection" + collection: *encrypted_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.esc" + collection: *esc_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecc" + collection: *ecoc_collection_name + # ecc collection is no longer created for QEv2 - name: assertCollectionNotExists object: testRunner arguments: database: *database_name - collection: "enxcol_.encryptedCollection.ecoc" - - name: assertCollectionNotExists - object: testRunner - arguments: - database: *database_name - collection: "encryptedCollection" + collection: *encrypted_collection_name expectations: # events from dropCollection ... begin - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end # events from createCollection ... begin - command_started_event: command: - create: "enxcol_.encryptedCollection.esc" - clusteredIndex: {key: {_id: 1}, unique: true} - command_name: create - database_name: *database_name - - command_started_event: - command: - create: "enxcol_.encryptedCollection.ecc" + create: *esc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "enxcol_.encryptedCollection.ecoc" + create: *ecoc_collection_name clusteredIndex: {key: {_id: 1}, unique: true} command_name: create database_name: *database_name - command_started_event: command: - create: "encryptedCollection" - encryptedFields: *encrypted_fields7 + create: *encrypted_collection_name + encryptedFields: *encrypted_fields_expectation command_name: create database_name: *database_name # libmongocrypt requests listCollections to get a schema for the "createIndexes" command. - command_started_event: command: listCollections: 1 - filter: { name: "encryptedCollection" } + filter: { name: *encrypted_collection_name } command_name: listCollections database_name: *database_name # Index on __safeContents__ is then created. - command_started_event: command: - createIndexes: "encryptedCollection" + createIndexes: *encrypted_collection_name indexes: - name: __safeContent___1 key: { __safeContent__: 1 } @@ -1240,27 +890,53 @@ tests: - command_started_event: command: listCollections: 1 - filter: { name: "encryptedCollection" } + filter: { name: *encrypted_collection_name } command_name: listCollections database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.esc" - command_name: drop - database_name: *database_name - - command_started_event: - command: - drop: "enxcol_.encryptedCollection.ecc" + drop: *esc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "enxcol_.encryptedCollection.ecoc" + drop: *ecoc_collection_name command_name: drop database_name: *database_name - command_started_event: command: - drop: "encryptedCollection" + drop: *encrypted_collection_name command_name: drop database_name: *database_name # events from dropCollection ... end + - description: "encryptedFields are consulted for metadata collection names" + clientOptions: + autoEncryptOpts: + kmsProviders: + aws: {} # Credentials filled in from environment. + encryptedFieldsMap: + default.encryptedCollection: { + "escCollection": "invalid_esc_name", + "ecocCollection": "invalid_ecoc_name", + "fields": [ + { + "path": "firstName", + "bsonType": "string", + "keyId": { "$binary": { "subType": "04", "base64": "AAAAAAAAAAAAAAAAAAAAAA==" }} + } + ] + } + + operations: + # Do an initial drop to remove collections that may exist from previous test runs. + - name: dropCollection + object: database + arguments: + collection: *encrypted_collection_name + - name: createCollection + object: database + arguments: + collection: *encrypted_collection_name + result: + # Expect error due to server constraints added in SERVER-74069 + errorContains: "Encrypted State Collection name should follow" \ No newline at end of file diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Delete.json index 2eb33c96e3..492b053518 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -179,9 +176,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -240,9 +234,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Delete.yml index 2f2f80ee5e..87faff1515 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Delete.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Delete can query an FLE2 indexed field" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json index b4edec7e15..b579979e94 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -95,9 +92,6 @@ }, "encryptedFieldsMap": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [] } } diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml index 598092edd1..13d1129c8b 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'HBk9BWihXExNDvTp1lUxOuxuZK2Pe2ZdVdlsxPEBkiO1bS4mG5NNDsQ7zVxJAH8BtdOYp72Ku4Y3nwc0BUpIKsvAKX4eYXtlhv5zUQxWdeNFhg9qK7qb8nqhnnLeT0f25jFSqzWJoT379hfwDeu0bebJHr35QrJ8myZdPMTEDYF08QYQ48ShRBli0S+QzBHHAQiM2iJNr4svg2WR8JSeWQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}}] tests: - description: "encryptedFieldsMap is preferred over remote encryptedFields" @@ -18,9 +18,6 @@ tests: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [] } } diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json index a9cabfa1e1..4c05c44ad6 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json @@ -18,9 +18,6 @@ "bsonType": "object" }, "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -186,9 +183,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -242,9 +236,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml index 5fe97767cc..80d5144ebb 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml @@ -12,7 +12,7 @@ json_schema: { "properties": {}, "bsonType": "object" } -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "encryptedFields is preferred over jsonSchema" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json index d565bdcf15..c2fea80a8d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json @@ -74,9 +74,7 @@ }, "schema": { "default.default": { - "fields": [], - "escCollection": "enxcol_.default.esc", - "ecocCollection": "enxcol_.default.ecoc" + "fields": [] } } }, diff --git a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml index 1a10e44307..95eb8add3e 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml @@ -45,9 +45,7 @@ tests: }, "schema": { "default.default": { - "fields": [], - "escCollection": "enxcol_.default.esc", - "ecocCollection": "enxcol_.default.ecoc" + "fields": [] } } } diff --git a/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json index 2124ae401c..7375d21b3d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -186,9 +183,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -247,9 +241,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -428,9 +419,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -491,9 +479,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml index 291747b3cc..a087b832f1 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "findOneAndUpdate can query an FLE2 indexed field" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json index e18deac436..bb2c1ff1af 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -182,9 +179,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -238,9 +232,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml index 5f186d5e9a..c9c34a4b0d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Insert and find FLE2 indexed field" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json index ef7bfbfd7f..008b0c959f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml index f50f935222..aeff4a88fc 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'HBk9BWihXExNDvTp1lUxOuxuZK2Pe2ZdVdlsxPEBkiO1bS4mG5NNDsQ7zVxJAH8BtdOYp72Ku4Y3nwc0BUpIKsvAKX4eYXtlhv5zUQxWdeNFhg9qK7qb8nqhnnLeT0f25jFSqzWJoT379hfwDeu0bebJHr35QrJ8myZdPMTEDYF08QYQ48ShRBli0S+QzBHHAQiM2iJNr4svg2WR8JSeWQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Insert and find FLE2 unindexed field" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.json b/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.json index c7bbe71c40..0b7e86bca3 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.json @@ -23,9 +23,6 @@ } ], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml b/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml index 569f6775cf..0ff40dbe8c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml @@ -17,7 +17,7 @@ data: [ } } ] -encrypted_fields: {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [] tests: - description: "FLE2 encrypt fails with mising key" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json index 0d4e163b2d..9298f3ba3f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -216,9 +213,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -274,9 +268,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -338,9 +329,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml index c7f6afaa88..a90993972a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Date. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json index 35d639f67d..9e4f525877 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml index 54fcd48e30..6e5f80265c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json index 8f7500eb9b..a3f19af02d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -205,9 +202,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -263,9 +257,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -327,9 +318,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml index 10cc451296..db8af71c3c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Date. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json index b9739331f8..c581180d39 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -220,9 +217,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -278,9 +272,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -344,9 +335,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml index 2d72b2f33e..8a92b01a0c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Date. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json index c9dc66d942..a9de859564 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -212,9 +209,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -270,9 +264,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -329,9 +320,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml index 7959f1c304..be60505c45 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Date. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json index 13e2633313..6a09517134 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -216,9 +213,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -274,9 +268,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -346,9 +337,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml index bf8b2c3920..94356e997b 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDate', 'bsonType': 'date', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$date': {'$numberLong': '0'}}, 'max': {'$date': {'$numberLong': '200'}}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Date. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json index cff4558a59..cd7a7f143f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -196,9 +193,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -244,9 +238,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -298,9 +289,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml index ddb254cfee..09ba7fff5a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml @@ -10,7 +10,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Decimal. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json index ff9f5a9b4a..5d04365569 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml index c4b01b26eb..6307bea62a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml @@ -12,7 +12,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json index 1a094b8531..220ae1f0ef 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -187,9 +184,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -235,9 +229,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -289,9 +280,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml index f0f1d186ed..7a2e1d3d7b 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml @@ -10,7 +10,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Decimal. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json index 5dc95283a2..3b37b03ac6 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -198,9 +195,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -246,9 +240,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -302,9 +293,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml index 578c6fd7d8..7992b8fe6f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml @@ -10,7 +10,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Decimal. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json index 6e881332df..f9d99ffa57 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -192,9 +189,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -240,9 +234,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -289,9 +280,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml index 5469d61bdb..c877fd221c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml @@ -10,7 +10,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Decimal. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json index 9d2cc69956..4e4d3e65f7 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json @@ -12,9 +12,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -196,9 +193,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -244,9 +238,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -306,9 +297,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml index 96ee9a126f..73653e3869 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml @@ -10,7 +10,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimal', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Decimal. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json index 876357fa74..0efe2e17aa 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -207,9 +204,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -264,9 +258,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -327,9 +318,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml index e4090b0437..e7d401e426 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DecimalPrecision. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json index d8c40a7a8f..b8a6953611 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml index 359df7cead..aa7ef7525d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json index c219d36e54..cede2b5f6a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -198,9 +195,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -255,9 +249,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml index 66faf3db9d..3b367781aa 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DecimalPrecision. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json index 7a7a9218ee..0da1c2087c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -209,9 +206,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -266,9 +260,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -331,9 +322,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml index bceee76efa..c9724e352c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DecimalPrecision. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json index 5453e6c8ac..7f6ba50e8e 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -203,9 +200,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -260,9 +254,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml index e597df670e..bdf22f5f4c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DecimalPrecision. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json index fa94097eff..fbdc8a0396 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -207,9 +204,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -264,9 +258,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -335,9 +326,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml index 618f1e4ac8..b71f1e9f31 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDecimalPrecision', 'bsonType': 'decimal', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDecimal': '0.0'}, 'max': {'$numberDecimal': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DecimalPrecision. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json index d6118bfa13..ff3dd71857 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -198,9 +195,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -246,9 +240,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -300,9 +291,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml index a07588d99b..2f1fb577cb 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Double. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json index e455c72dc5..f8e4c5d837 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml index 0881cf315f..38e870a053 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json index 05a78d6143..d843530d64 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -189,9 +186,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -237,9 +231,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -291,9 +282,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml index 5cd9b6f82b..0608938b4a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Double. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json index 6712f7920d..92426d48dd 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -200,9 +197,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -248,9 +242,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -304,9 +295,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml index c652d9d432..8c886a9e6d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Double. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json index a9d9bed7c5..4175ce2fb0 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -194,9 +191,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -242,9 +236,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -291,9 +282,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml index bdc8397b9b..78e8736110 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Double. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json index 91387dd900..320d44fe6e 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -198,9 +195,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -246,9 +240,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -308,9 +299,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml index f18145e934..5405c37a33 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Double-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDouble', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Double. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json index a6fd2c164e..e5ec029265 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -207,9 +204,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -264,9 +258,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -327,9 +318,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml index 83308a5918..3d649226ae 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DoublePrecision. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json index 00f2754d2e..6b42ecfe82 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml index 48733159c0..6508db7d19 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json index 88c2820a25..9244794f4b 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -198,9 +195,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -255,9 +249,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml index 48ab4f480f..88ca982a38 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DoublePrecision. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json index 0186f6fd5c..dbf6afda26 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -209,9 +206,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -266,9 +260,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -331,9 +322,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml index d48c7aa378..7d083ba075 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DoublePrecision. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json index b7ce04c7c1..eaa9c03830 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -203,9 +200,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -260,9 +254,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml index 004f35f9d6..1a4364c3f9 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DoublePrecision. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json index 7d799c7850..5fb7d8550f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -207,9 +204,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -264,9 +258,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -335,9 +326,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml index 94d5d23b3a..d8eece4a7b 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-DoublePrecision-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedDoublePrecision', 'bsonType': 'double', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberDouble': '0.0'}, 'max': {'$numberDouble': '200.0'}, 'precision': {'$numberInt': '2'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range DoublePrecision. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json index d95d95a113..721b5d3cb2 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -204,9 +201,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -258,9 +252,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml index 8fed802023..8a550803a7 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Int. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json index b5f79c8cb9..58ccf3efc8 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml index 4d16fd4303..77206aed6e 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json index e3217a2a70..b247573896 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -195,9 +192,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -249,9 +243,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -309,9 +300,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml index bb9b9d268f..c48c2b73ad 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Int. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json index 1b729d14eb..993e95b670 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -206,9 +203,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -260,9 +254,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -322,9 +313,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml index 1bc5020d60..9e49d3916d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Int. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json index 81ded95962..e43defe3d6 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -200,9 +197,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -254,9 +248,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -309,9 +300,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml index 11043cdd39..593d77cd78 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Int. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json index 81120af32e..723a30b9d7 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -204,9 +201,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -258,9 +252,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -326,9 +317,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml index 3c9dabbd63..db8e1f49b8 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Int-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Int. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json index 3c17a3238f..5f66dd514a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -204,9 +201,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -258,9 +252,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -318,9 +309,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml index 93cc2f7e9b..358524a4ee 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Aggregate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Long. Aggregate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json index db1e69a36d..cda941de8a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml index 582284cbea..4df64cb67a 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Correctness.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Find with $gt" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json index 6e32f8d5e4..edacf50df7 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -195,9 +192,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -249,9 +243,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -309,9 +300,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml index 52fbe15f4e..d13fb60566 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Delete.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Long. Delete." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json index 2db5f700f1..08e57be8f2 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -206,9 +203,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -260,9 +254,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -322,9 +313,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml index 689fadc1a3..f7953a484c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Long. FindOneAndUpdate." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json index 365c7e5d5b..0d479a0c57 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -200,9 +197,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -254,9 +248,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -309,9 +300,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml index 84ed8f44be..de2644d43f 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-InsertFind.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Long. Insert and Find." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json index 3ee000b63e..2c9e6aaf7e 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -204,9 +201,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -258,9 +252,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -326,9 +317,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml index f3bda51ff4..3353ce4990 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-Long-Update.yml @@ -9,7 +9,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedLong', 'bsonType': 'long', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberLong': '0'}, 'max': {'$numberLong': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "FLE2 Range Long. Update." diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json b/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json index c28576554e..e5e9ddc821 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml b/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml index 63b138ec87..ada65209e5 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Range-WrongType.yml @@ -11,7 +11,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} +encrypted_fields: &encrypted_fields { 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedInt', 'bsonType': 'int', 'queries': {'queryType': 'rangePreview', 'contention': {'$numberLong': '0'}, 'sparsity': {'$numberLong': '1'}, 'min': {'$numberInt': '0'}, 'max': {'$numberInt': '200'}}}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Wrong type: Insert Double" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Update.json b/source/client-side-encryption/tests/legacy/fle2v2-Update.json index 5756ed8289..f9e37f6e20 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Update.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-Update.json @@ -14,9 +14,6 @@ "collection_name": "default", "data": [], "encrypted_fields": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -186,9 +183,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -251,9 +245,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -432,9 +423,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -499,9 +487,6 @@ "type": 1, "schema": { "default.default": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-Update.yml b/source/client-side-encryption/tests/legacy/fle2v2-Update.yml index 2df6991cd2..8f3c5f8638 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-Update.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-Update.yml @@ -8,7 +8,7 @@ runOn: database_name: &database_name "default" collection_name: &collection_name "default" data: [] -encrypted_fields: &encrypted_fields {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} +encrypted_fields: &encrypted_fields {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} key_vault_data: [ {'_id': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'keyMaterial': {'$binary': {'base64': 'sHe0kz57YW7v8g9VP9sf/+K1ex4JqKc5rf/URX3n3p8XdZ6+15uXPaSayC6adWbNxkFskuMCOifDoTT+rkqMtFkDclOy884RuGGtUysq3X7zkAWYTKi8QAfKkajvVbZl2y23UqgVasdQu3OVBQCrH/xY00nNAs/52e958nVjBuzQkSb1T8pKJAyjZsHJ60+FtnfafDZSTAIBJYn7UWBCwQ==', 'subType': '00'}}, 'creationDate': {'$date': {'$numberLong': '1648914851981'}}, 'updateDate': {'$date': {'$numberLong': '1648914851981'}}, 'status': {'$numberInt': '0'}, 'masterKey': {'provider': 'local'}} ] tests: - description: "Update can query an FLE2 indexed field" diff --git a/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.json b/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.json index b18afb1153..4adf6fc07d 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.json +++ b/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.json @@ -30,9 +30,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -109,9 +106,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -183,9 +177,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -263,9 +254,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -346,9 +334,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { @@ -443,9 +428,6 @@ }, "encryptedFieldsMap": { "default.encryptedCollection": { - "escCollection": "enxcol_.default.esc", - "eccCollection": "enxcol_.default.ecc", - "ecocCollection": "enxcol_.default.ecoc", "fields": [ { "keyId": { diff --git a/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.yml b/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.yml index 36344dda9a..fdeb49010c 100644 --- a/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.yml +++ b/source/client-side-encryption/tests/legacy/fle2v2-validatorAndPartialFieldExpression.yml @@ -17,7 +17,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection @@ -41,7 +41,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection @@ -62,7 +62,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection @@ -86,7 +86,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection @@ -112,7 +112,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection @@ -145,7 +145,7 @@ tests: kmsProviders: local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}} encryptedFieldsMap: - "default.encryptedCollection": {'escCollection': 'enxcol_.default.esc', 'eccCollection': 'enxcol_.default.ecc', 'ecocCollection': 'enxcol_.default.ecoc', 'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} + "default.encryptedCollection": {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]} operations: # Drop to remove a collection that may exist from previous test runs. - name: dropCollection