test(NODE-4251): sync csfle create spec tests

.evergreen/run-tests.sh

@@ -56,7 +56,7 @@ else
   source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
 fi
 
-npm install mongodb-client-encryption@">=2.2.0-alpha.0"
+npm install mongodb-client-encryption@">=2.2.0-alpha.2"
 npm install @mongodb-js/zstd
 npm install snappy
 

src/cmap/connection.ts

@@ -727,7 +727,6 @@ export class CryptoConnection extends Connection {
         callback(err, null);
         return;
       }
-
       super.command(ns, encrypted, options, (err, response) => {
         if (err || response == null) {
           callback(err, response);

src/encrypter.ts

@@ -83,6 +83,9 @@ export class Encrypter {
 
       clonedOptions.minPoolSize = 0;
 
+      clonedOptions.promoteValues = false;
+      clonedOptions.promoteLongs = false;
+
       internalClient = new MongoClient(uri, clonedOptions);
       this[kInternalClient] = internalClient;
 

test/integration/client-side-encryption/client_side_encryption.spec.test.js

@@ -60,13 +60,7 @@ const skippedMaxWireVersionTest = 'operation fails with maxWireVersion < 8';
 const SKIPPED_TESTS = new Set([
   ...(isAuthEnabled
     ? skippedAuthTests.concat(skippedMaxWireVersionTest)
-    : [skippedMaxWireVersionTest]),
-  // TODO(NODE-4288): Fix FLE 2 tests
-  'default state collection names are applied',
-  'drop removes all state collections',
-  'CreateCollection from encryptedFields.',
-  'DropCollection from encryptedFields',
-  'DropCollection from remote encryptedFields'
+    : [skippedMaxWireVersionTest])
 ]);
 
 describe('Client Side Encryption', function () {

test/spec/client-side-encryption/tests/create-and-createIndexes.json

@@ -0,0 +1,115 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "tests": [
+    {
+      "description": "create is OK",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "local": {
+              "key": {
+                "$binary": {
+                  "base64": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk",
+                  "subType": "00"
+                }
+              }
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "database",
+          "arguments": {
+            "collection": "unencryptedCollection"
+          }
+        },
+        {
+          "name": "createCollection",
+          "object": "database",
+          "arguments": {
+            "collection": "unencryptedCollection",
+            "validator": {
+              "unencrypted_string": "foo"
+            }
+          }
+        },
+        {
+          "name": "assertCollectionExists",
+          "object": "testRunner",
+          "arguments": {
+            "database": "default",
+            "collection": "unencryptedCollection"
+          }
+        }
+      ]
+    },
+    {
+      "description": "createIndexes is OK",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "local": {
+              "key": {
+                "$binary": {
+                  "base64": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk",
+                  "subType": "00"
+                }
+              }
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "dropCollection",
+          "object": "database",
+          "arguments": {
+            "collection": "unencryptedCollection"
+          }
+        },
+        {
+          "name": "createCollection",
+          "object": "database",
+          "arguments": {
+            "collection": "unencryptedCollection"
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "arguments": {
+            "command": {
+              "createIndexes": "unencryptedCollection",
+              "indexes": [
+                {
+                  "name": "name",
+                  "key": {
+                    "name": 1
+                  }
+                }
+              ]
+            }
+          }
+        },
+        {
+          "name": "assertIndexExists",
+          "object": "testRunner",
+          "arguments": {
+            "database": "default",
+            "collection": "unencryptedCollection",
+            "index": "name"
+          }
+        }
+      ]
+    }
+  ]
+}

test/spec/client-side-encryption/tests/create-and-createIndexes.yml

@@ -0,0 +1,58 @@
+runOn:
+  - minServerVersion: "4.1.10"
+database_name: &database_name "default"
+collection_name: &collection_name "default"
+
+data: []
+tests:
+  - description: "create is OK"
+    clientOptions:
+      autoEncryptOpts:
+        kmsProviders:
+          local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}}
+    operations:
+    # Drop to remove a collection that may exist from previous test runs.
+    - name: dropCollection
+      object: database
+      arguments:
+        collection: "unencryptedCollection"
+    - name: createCollection
+      object: database
+      arguments:
+        collection: "unencryptedCollection"
+        validator:
+          unencrypted_string: "foo"
+    - name: assertCollectionExists
+      object: testRunner
+      arguments:
+        database: *database_name
+        collection: "unencryptedCollection"
+  - description: "createIndexes is OK"
+    clientOptions:
+      autoEncryptOpts:
+        kmsProviders:
+          local: {'key': {'$binary': {'base64': 'Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'subType': '00'}}}
+    operations:
+    # Drop to remove a collection that may exist from previous test runs.
+    - name: dropCollection
+      object: database
+      arguments:
+        collection: "unencryptedCollection"
+    - name: createCollection
+      object: database
+      arguments:
+        collection: "unencryptedCollection"
+    - name: runCommand
+      object: database
+      arguments:
+        command:
+          createIndexes: "unencryptedCollection"
+          indexes:
+            - name: "name"
+              key: { name: 1 }
+    - name: assertIndexExists
+      object: testRunner
+      arguments:
+        database: *database_name
+        collection: "unencryptedCollection"
+        index: name

test/spec/client-side-encryption/tests/fle2-CreateCollection.json

@@ -1469,6 +1469,18 @@
             "database_name": "default"
           }
         },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "encryptedCollection"
+              }
+            },
+            "command_name": "listCollections",
+            "database_name": "default"
+          }
+        },
         {
           "command_started_event": {
             "command": {
@@ -1829,6 +1841,18 @@
             "database_name": "default"
           }
         },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "encryptedCollection"
+              }
+            },
+            "command_name": "listCollections",
+            "database_name": "default"
+          }
+        },
         {
           "command_started_event": {
             "command": {
@@ -2132,6 +2156,18 @@
             "database_name": "default"
           }
         },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "encryptedCollection"
+              }
+            },
+            "command_name": "listCollections",
+            "database_name": "default"
+          }
+        },
         {
           "command_started_event": {
             "command": {

test/spec/client-side-encryption/tests/fle2-CreateCollection.yml

@@ -1,3 +1,4 @@
+# This test requires libmongocrypt 1.5.0-alpha2.
 runOn:
   - minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
@@ -821,6 +822,13 @@ tests:
               encryptedFields: *encrypted_fields5
             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" }
+            command_name: listCollections
+            database_name: *database_name
         # Index on __safeContents__ is then created.
         - command_started_event:
             command:
@@ -1028,6 +1036,13 @@ tests:
               encryptedFields: *encrypted_fields6
             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" }
+            command_name: listCollections
+            database_name: *database_name
         # Index on __safeContents__ is then created.
         - command_started_event:
             command:
@@ -1201,6 +1216,13 @@ tests:
               encryptedFields: *encrypted_fields7
             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" }
+            command_name: listCollections
+            database_name: *database_name
         # Index on __safeContents__ is then created.
         - command_started_event:
             command: