Updated client side encryption tests

Author: rozza

driver-core/src/test/resources/client-side-encryption/README.rst

@@ -152,14 +152,14 @@ Use as integration tests
 
 Do the following before running spec tests:
 
-- If available for the platform under test, obtain a csfle_ binary and place it
-  in a location accessible to the tests. Refer to: `Using csfle`_
+- If available for the platform under test, obtain a crypt_shared_ binary and place it
+  in a location accessible to the tests. Refer to: `Using crypt_shared`_
 - Start the mongocryptd process.
 - Start a mongod process with **server version 4.1.9 or later**.
 - Place credentials to an AWS IAM user (access key ID + secret access key) somewhere in the environment outside of tracked code. (If testing on evergreen, project variables are a good place).
 - Start a KMIP test server on port 5698 by running `drivers-evergreen-tools/.evergreen/csfle/kms_kmip_server.py <https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/csfle/kms_kmip_server.py>`_.
 
-.. _csfle: ../client-side-encryption.rst#csfle
+.. _crypt_shared: ../client-side-encryption.rst#crypt_shared
 
 Load each YAML (or JSON) file using a Canonical Extended JSON parser.
 
@@ -182,7 +182,8 @@ Then for each element in ``tests``:
 
       {"create": <collection>, "validator": {"$jsonSchema": <json_schema>}}
 
-   If ``encrypted_fields`` is defined in the test, the required collections and index described in `FLE 2 CreateCollection() and Collection.Drop() <https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/client-side-encryption.rst#fle-2-createcollection-and-collection-drop>`_  must be created:
+   If ``encrypted_fields`` is defined in the test, the required collections and index described in `FLE 2 Create and Drop Collection Helpers <https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/client-side-encryption.rst#fle-2-create-and-drop-collection-helpers>`_  must be created:
+
    - Use the ``dropCollection`` helper with ``encrypted_fields`` as an option and writeConcern "majority".
    - Use the ``createCollection`` helper with ``encrypted_fields`` as an option.
 
@@ -323,32 +324,35 @@ Then for each element in ``tests``:
 The spec test MUST be run with *and* without auth.
 
 
-Using ``csfle``
-===============
+Using ``crypt_shared``
+======================
 
-On platforms where csfle_ is available, drivers should prefer to test with the
-csfle library instead of spawning mongocryptd, although having some tests
-dedicated to mongocryptd is recommended. Note that some tests assert on
-mongocryptd-related behaviors (e.g. the ``mongocryptdBypassSpawn`` test).
+On platforms where crypt_shared_ is available, drivers should prefer to test
+with the ``crypt_shared`` library instead of spawning mongocryptd, although
+having some tests dedicated to mongocryptd is recommended. Note that some tests
+assert on mongocryptd-related behaviors (e.g. the ``mongocryptdBypassSpawn``
+test).
 
-Drivers under test should load the csfle_ library using either the ``csflePath``
-public API option (as part of the AutoEncryption ``extraOptions``), or by
-setting a special search path instead.
+Drivers under test should load the crypt_shared_ library using either the
+``cryptSharedLibPath`` public API option (as part of the AutoEncryption
+``extraOptions``), or by setting a special search path instead.
 
-Some tests will require *not* using csfle_. For such tests, one should ensure
-that csfle will not be loaded. Refer to the client-side-encryption documentation
-for information on "disabling" csfle and setting csfle search paths.
+Some tests will require *not* using crypt_shared_. For such tests, one should
+ensure that ``crypt_shared`` will not be loaded. Refer to the
+client-side-encryption documentation for information on "disabling"
+``crypt_shared`` and setting library search paths.
 
 .. note::
 
-   The ``csfle`` dynamic library can be obtained using the mongodl_ Python
+   The crypt_shared_ dynamic library can be obtained using the mongodl_ Python
    script from drivers-evergreen-tools_:
 
    .. code-block:: shell
 
-      $ python3 mongodl.py --component=csfle --version=6.0.0-rc4 --out=./csfle/
+      $ python3 mongodl.py --component=crypt_shared --version=<VERSION> --out=./crypt_shared/
 
-   Other versions of `csfle` are available. Please use the `--list` option to see versions.
+   Other versions of ``crypt_shared`` are also available. Please use the
+   ``--list`` option to see versions.
 
 .. _mongodl: https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/mongodl.py
 .. _drivers-evergreen-tools: https://github.com/mongodb-labs/drivers-evergreen-tools/
@@ -961,12 +965,13 @@ Test cases
 
 .. note::
 
-   IMPORTANT: If csfle_ is visible to the operating system's library search
-   mechanism, the expected server error generated by these
+   IMPORTANT: If crypt_shared_ is visible to the operating system's library
+   search mechanism, the expected server error generated by these
    ``mongocryptdBypassSpawn`` tests will not appear because libmongocrypt will
-   load the csfle library instead of consulting mongocryptd. For these tests, it
-   is required that libmongocrypt *not* load csfle. Refer to the
-   client-side-encryption document for more information on "disabling" csfle.
+   load the ``crypt_shared`` library instead of consulting mongocryptd. For
+   these tests, it is required that libmongocrypt *not* load ``crypt_shared``.
+   Refer to the client-side-encryption document for more information on
+   "disabling" ``crypt_shared``.
 
 
 Via mongocryptdBypassSpawn

driver-core/src/test/resources/client-side-encryption/legacy/fle2-Compact.json

@@ -2,7 +2,7 @@
   "runOn": [
     {
       "minServerVersion": "6.0.0",
-      "topologies": [
+      "topology": [
         "replicaset",
         "sharded"
       ]

driver-core/src/test/resources/client-side-encryption/legacy/fle2-Delete.json

@@ -225,7 +225,7 @@
                     "encryptedIndexed": {
                       "$eq": {
                         "$binary": {
-                          "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
+                          "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                           "subType": "06"
                         }
                       }

driver-core/src/test/resources/client-side-encryption/legacy/fle2-EncryptedFields-vs-jsonSchema.json

@@ -230,7 +230,7 @@
                 "encryptedIndexed": {
                   "$eq": {
                     "$binary": {
-                      "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA",
+                      "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                       "subType": "06"
                     }
                   }

driver-core/src/test/resources/client-side-encryption/legacy/fle2-FindOneAndUpdate.json

@@ -230,7 +230,7 @@
                 "encryptedIndexed": {
                   "$eq": {
                     "$binary": {
-                      "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
+                      "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                       "subType": "06"
                     }
                   }
@@ -490,7 +490,7 @@
                 "encryptedIndexed": {
                   "$eq": {
                     "$binary": {
-                      "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
+                      "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                       "subType": "06"
                     }
                   }

driver-core/src/test/resources/client-side-encryption/legacy/fle2-InsertFind-Indexed.json

@@ -226,7 +226,7 @@
                 "encryptedIndexed": {
                   "$eq": {
                     "$binary": {
-                      "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA",
+                      "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                       "subType": "06"
                     }
                   }

driver-core/src/test/resources/client-side-encryption/legacy/fle2-Update.json

@@ -232,7 +232,7 @@
                     "encryptedIndexed": {
                       "$eq": {
                         "$binary": {
-                          "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
+                          "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                           "subType": "06"
                         }
                       }
@@ -496,7 +496,7 @@
                     "encryptedIndexed": {
                       "$eq": {
                         "$binary": {
-                          "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
+                          "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
                           "subType": "06"
                         }
                       }