mongodb · nbbeeken · May 24, 2023 · May 24, 2023
diff --git a/src/cmap/wire_protocol/constants.ts b/src/cmap/wire_protocol/constants.ts
@@ -2,6 +2,8 @@ export const MIN_SUPPORTED_SERVER_VERSION = '3.6';
 export const MAX_SUPPORTED_SERVER_VERSION = '6.0';
 export const MIN_SUPPORTED_WIRE_VERSION = 6;
 export const MAX_SUPPORTED_WIRE_VERSION = 17;
+export const MIN_SUPPORTED_QE_WIRE_VERSION = 21;
+export const MIN_SUPPORTED_QE_SERVER_VERSION = '7.0';
 export const OP_REPLY = 1;
 export const OP_UPDATE = 2001;
 export const OP_INSERT = 2002;

diff --git a/src/operations/create_collection.ts b/src/operations/create_collection.ts
@@ -1,6 +1,11 @@
 import type { Document } from '../bson';
+import {
+  MIN_SUPPORTED_QE_SERVER_VERSION,
+  MIN_SUPPORTED_QE_WIRE_VERSION
+} from '../cmap/wire_protocol/constants';
 import { Collection } from '../collection';
 import type { Db } from '../db';
+import { MongoCompatibilityError } from '../error';
 import type { PkFactory } from '../mongo_client';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
@@ -97,6 +102,10 @@ export interface CreateCollectionOptions extends CommandOperationOptions {
   changeStreamPreAndPostImages?: { enabled: boolean };
 }
 
+/* @internal */
+const INVALID_QE_VERSION =
+  'Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption.';
+
 /** @internal */
 export class CreateCollectionOperation extends CommandOperation<Collection> {
   override options: CreateCollectionOptions;
@@ -126,12 +135,17 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
         db.s.client.options.autoEncryption?.encryptedFieldsMap?.[`${db.databaseName}.${name}`];
 
       if (encryptedFields) {
+        // Creating a QE collection required min server of 7.0.0
+        if (server.description.maxWireVersion < MIN_SUPPORTED_QE_WIRE_VERSION) {
+          throw new MongoCompatibilityError(
+            `${INVALID_QE_VERSION} The minimum server version required is ${MIN_SUPPORTED_QE_SERVER_VERSION}`
+          );
+        }
         // Create auxilliary collections for queryable encryption support.
         const escCollection = encryptedFields.escCollection ?? `enxcol_.${name}.esc`;
-        const eccCollection = encryptedFields.eccCollection ?? `enxcol_.${name}.ecc`;
         const ecocCollection = encryptedFields.ecocCollection ?? `enxcol_.${name}.ecoc`;
 
-        for (const collectionName of [escCollection, eccCollection, ecocCollection]) {
+        for (const collectionName of [escCollection, ecocCollection]) {
           const createOp = new CreateCollectionOperation(db, collectionName, {
             clusteredIndex: {
               key: { _id: 1 },

diff --git a/src/operations/drop.ts b/src/operations/drop.ts
@@ -53,10 +53,9 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
 
       if (encryptedFields) {
         const escCollection = encryptedFields.escCollection || `enxcol_.${name}.esc`;
-        const eccCollection = encryptedFields.eccCollection || `enxcol_.${name}.ecc`;
         const ecocCollection = encryptedFields.ecocCollection || `enxcol_.${name}.ecoc`;
 
-        for (const collectionName of [escCollection, eccCollection, ecocCollection]) {
+        for (const collectionName of [escCollection, ecocCollection]) {
           // Drop auxilliary collections, ignoring potential NamespaceNotFound errors.
           const dropOp = new DropCollectionOperation(db, collectionName);
           try {

diff --git a/...nt-side-encryption/client_side_encryption.prose.21.automatic_data_encryption_keys.test.ts b/...nt-side-encryption/client_side_encryption.prose.21.automatic_data_encryption_keys.test.ts
@@ -6,7 +6,7 @@ import { installNodeDNSWorkaroundHooks } from '../../tools/runner/hooks/configur
 const metadata = {
   requires: {
     clientSideEncryption: true,
-    mongodb: '>=6.0.0',
+    mongodb: '>=7.0.0',
     topology: '!single'
   }
 } as const;

diff --git a/test/spec/client-side-encryption/etc/data/encryptedFields.json b/test/spec/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"
     }
   ]
-}
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-Date.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-Date.json
@@ -1,30 +1,33 @@
 {
-    "fields": [
-      {
-        "keyId": {
-          "$binary": {
-            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
-            "subType": "04"
-          }
+  "fields": [
+    {
+      "keyId": {
+        "$binary": {
+          "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+          "subType": "04"
+        }
+      },
+      "path": "encryptedDate",
+      "bsonType": "date",
+      "queries": {
+        "queryType": "rangePreview",
+        "contention": {
+          "$numberLong": "0"
         },
-        "path": "encryptedDate",
-        "bsonType": "date",
-        "queries": {
-          "queryType": "rangePreview",
-          "sparsity": {
-            "$numberLong": "1"
-          },
-          "min": {
-            "$date": {
-              "$numberLong": "0"
-          }
-          },
-          "max": {
-            "$date": {
-              "$numberLong": "200"
+        "sparsity": {
+          "$numberLong": "1"
+        },
+        "min": {
+          "$date": {
+            "$numberLong": "0"
           }
+        },
+        "max": {
+          "$date": {
+            "$numberLong": "200"
           }
         }
       }
-    ]
+    }
+  ]
 }
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json
@@ -1,21 +1,23 @@
 {
-    "fields": [
-      {
-        "keyId": {
-          "$binary": {
-            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
-            "subType": "04"
-          }
+  "fields": [
+    {
+      "keyId": {
+        "$binary": {
+          "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+          "subType": "04"
+        }
+      },
+      "path": "encryptedDecimalNoPrecision",
+      "bsonType": "decimal",
+      "queries": {
+        "queryType": "rangePreview",
+        "contention": {
+          "$numberLong": "0"
         },
-        "path": "encryptedDecimalNoPrecision",
-        "bsonType": "decimal",
-        "queries": {
-          "queryType": "rangePreview",
-          "sparsity": {
-            "$numberInt": "1"
-          }
+        "sparsity": {
+          "$numberLong": "1"
         }
       }
-    ]
-  }
-  
+    }
+  ]
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json
@@ -11,8 +11,11 @@
       "bsonType": "decimal",
       "queries": {
         "queryType": "rangePreview",
+        "contention": {
+          "$numberLong": "0"
+        },
         "sparsity": {
-          "$numberInt": "1"
+          "$numberLong": "1"
         },
         "min": {
           "$numberDecimal": "0.0"

diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json
@@ -1,21 +1,23 @@
 {
-    "fields": [
-      {
-        "keyId": {
-          "$binary": {
-            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
-            "subType": "04"
-          }
+  "fields": [
+    {
+      "keyId": {
+        "$binary": {
+          "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+          "subType": "04"
+        }
+      },
+      "path": "encryptedDoubleNoPrecision",
+      "bsonType": "double",
+      "queries": {
+        "queryType": "rangePreview",
+        "contention": {
+          "$numberLong": "0"
         },
-        "path": "encryptedDoubleNoPrecision",
-        "bsonType": "double",
-        "queries": {
-          "queryType": "rangePreview",
-          "sparsity": {
-            "$numberLong": "1"
-          }
+        "sparsity": {
+          "$numberLong": "1"
         }
       }
-    ]
-  }
-  
+    }
+  ]
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json
@@ -1,30 +1,32 @@
 {
-    "fields": [
-      {
-        "keyId": {
-          "$binary": {
-            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
-            "subType": "04"
-          }
+  "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"
         },
-        "path": "encryptedDoublePrecision",
-        "bsonType": "double",
-        "queries": {
-          "queryType": "rangePreview",
-          "sparsity": {
-            "$numberLong": "1"
-          },
-          "min": {
-            "$numberDouble": "0.0"
-          },
-          "max": {
-            "$numberDouble": "200.0"
-          },
-          "precision": {
-            "$numberInt": "2"
-          }
+        "precision": {
+          "$numberInt": "2"
         }
       }
-    ]
-  }
-  
+    }
+  ]
+}
diff --git a/test/spec/client-side-encryption/etc/data/range-encryptedFields-Int.json b/test/spec/client-side-encryption/etc/data/range-encryptedFields-Int.json
@@ -1,27 +1,29 @@
 {
-    "fields": [
-      {
-        "keyId": {
-          "$binary": {
-            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
-            "subType": "04"
-          }
+  "fields": [
+    {
+      "keyId": {
+        "$binary": {
+          "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+          "subType": "04"
+        }
+      },
+      "path": "encryptedInt",
+      "bsonType": "int",
+      "queries": {
+        "queryType": "rangePreview",
+        "contention": {
+          "$numberLong": "0"
+        },
+        "sparsity": {
+          "$numberLong": "1"
+        },
+        "min": {
+          "$numberInt": "0"
         },
-        "path": "encryptedInt",
-        "bsonType": "int",
-        "queries": {
-          "queryType": "rangePreview",
-          "sparsity": {
-            "$numberLong": "1"
-          },
-          "min": {
-            "$numberInt": "0"
-          },
-          "max": {
-            "$numberInt": "200"
-          }
+        "max": {
+          "$numberInt": "200"
         }
       }
-    ]
-  }
-  
+    }
+  ]
+}