From d04ac82c68364f888ad34fb555b8a1658d2087ca Mon Sep 17 00:00:00 2001 From: Cloud User Date: Tue, 9 Jun 2026 13:49:04 +0000 Subject: [PATCH 1/3] resyncing specs 06-09-2026 --- .evergreen/scripts/resync-all-specs.py | 3 +++ .../data/encryptedFields-prefix-suffix-ci-di.json | 4 ++-- .../etc/data/encryptedFields-prefix-suffix.json | 10 +++++----- .../QE-Text-cleanupStructuredEncryptionData.json | 7 +++---- .../QE-Text-compactStructuredEncryptionData.json | 9 ++++----- ...-Text-prefixPreview.json => QE-Text-prefix.json} | 11 +++++------ ...-Text-suffixPreview.json => QE-Text-suffix.json} | 13 ++++++------- ...-not-supported.json => opmsg-not-supported.json} | 0 8 files changed, 28 insertions(+), 29 deletions(-) rename test/client-side-encryption/spec/unified/{QE-Text-prefixPreview.json => QE-Text-prefix.json} (97%) rename test/client-side-encryption/spec/unified/{QE-Text-suffixPreview.json => QE-Text-suffix.json} (96%) rename test/handshake/unified/{op_msg-not-supported.json => opmsg-not-supported.json} (100%) diff --git a/.evergreen/scripts/resync-all-specs.py b/.evergreen/scripts/resync-all-specs.py index 6c4d95c677..f1fe51033b 100644 --- a/.evergreen/scripts/resync-all-specs.py +++ b/.evergreen/scripts/resync-all-specs.py @@ -44,10 +44,13 @@ def apply_patches(errored): patches = [str(p) for p in spec_patch_dir.glob("*.patch")] patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")] if patches: + for patch in patches: + print(f"Applying patch {patch}") subprocess.run( [ # noqa: S603, S607 "git", "apply", + "-R", "--allow-empty", "--whitespace=fix", *patches, diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json index c43bf9390d..3002c642b2 100644 --- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json +++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json @@ -11,7 +11,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefixPreview", + "queryType": "prefix", "strMinQueryLength": { "$numberInt": "2" }, @@ -23,7 +23,7 @@ "diacriticSensitive": false }, { - "queryType": "suffixPreview", + "queryType": "suffix", "strMinQueryLength": { "$numberInt": "2" }, diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json index ec4489fa09..141c372dbe 100644 --- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json +++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json @@ -1,6 +1,6 @@ { - "fields": [ - { + "fields": [ + { "keyId": { "$binary": { "base64": "EjRWeBI0mHYSNBI0VniQEg==", @@ -11,7 +11,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefixPreview", + "queryType": "prefix", "strMinQueryLength": { "$numberInt": "2" }, @@ -22,7 +22,7 @@ "diacriticSensitive": true }, { - "queryType": "suffixPreview", + "queryType": "suffix", "strMinQueryLength": { "$numberInt": "2" }, @@ -34,5 +34,5 @@ } ] } - ] + ] } diff --git a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json index fd74573ea2..dc979b5019 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json +++ b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json @@ -3,15 +3,14 @@ "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "8.2.0", - "maxServerVersion": "8.99.99", + "minServerVersion": "9.0.0", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.15.0" + "minLibmongocryptVersion": "1.19.0" } } ], @@ -102,7 +101,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffixPreview", + "queryType": "suffix", "contention": { "$numberLong": "0" }, diff --git a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json index a89ab96fc4..1c3c6cc0de 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json +++ b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json @@ -3,15 +3,14 @@ "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "8.2.0", - "maxServerVersion": "8.99.99", + "minServerVersion": "9.0.0", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.15.0" + "minLibmongocryptVersion": "1.19.0" } } ], @@ -102,7 +101,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffixPreview", + "queryType": "suffix", "contention": { "$numberLong": "0" }, @@ -210,7 +209,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffixPreview", + "queryType": "suffix", "contention": { "$numberLong": "0" }, diff --git a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-prefix.json similarity index 97% rename from test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json rename to test/client-side-encryption/spec/unified/QE-Text-prefix.json index c193608e88..25475e2c3a 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json +++ b/test/client-side-encryption/spec/unified/QE-Text-prefix.json @@ -1,17 +1,16 @@ { - "description": "QE-Text-prefixPreview", + "description": "QE-Text-prefix", "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "8.2.0", - "maxServerVersion": "8.99.99", + "minServerVersion": "9.0.0", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.15.0" + "minLibmongocryptVersion": "1.19.0" } } ], @@ -102,7 +101,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefixPreview", + "queryType": "prefix", "contention": { "$numberLong": "0" }, @@ -124,7 +123,7 @@ ], "tests": [ { - "description": "Insert QE prefixPreview", + "description": "Insert QE prefix", "operations": [ { "name": "insertOne", diff --git a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-suffix.json similarity index 96% rename from test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json rename to test/client-side-encryption/spec/unified/QE-Text-suffix.json index 2de5cde4a4..ad6cdc06c9 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json +++ b/test/client-side-encryption/spec/unified/QE-Text-suffix.json @@ -1,17 +1,16 @@ { - "description": "QE-Text-suffixPreview", + "description": "QE-Text-suffix", "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "8.2.0", - "maxServerVersion": "8.99.99", + "minServerVersion": "9.0.0", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.15.0" + "minLibmongocryptVersion": "1.19.0" } } ], @@ -102,7 +101,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffixPreview", + "queryType": "suffix", "contention": { "$numberLong": "0" }, @@ -124,7 +123,7 @@ ], "tests": [ { - "description": "Insert QE suffixPreview", + "description": "Insert QE suffix", "operations": [ { "name": "insertOne", @@ -207,7 +206,7 @@ ] }, { - "description": "Query with matching $encStrStartsWith", + "description": "Query with matching $encStrEndsWith", "operations": [ { "name": "insertOne", diff --git a/test/handshake/unified/op_msg-not-supported.json b/test/handshake/unified/opmsg-not-supported.json similarity index 100% rename from test/handshake/unified/op_msg-not-supported.json rename to test/handshake/unified/opmsg-not-supported.json From 4f10d1359082a9822cce19df35a5fbc0d931ff49 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 9 Jun 2026 10:39:46 -0400 Subject: [PATCH 2/3] Patch renames --- .../data/encryptedFields-prefix-suffix-ci-di.json | 4 ++-- .../etc/data/encryptedFields-prefix-suffix.json | 10 +++++----- .../QE-Text-cleanupStructuredEncryptionData.json | 7 ++++--- .../QE-Text-compactStructuredEncryptionData.json | 9 +++++---- ...-Text-prefix.json => QE-Text-prefixPreview.json} | 11 ++++++----- ...-Text-suffix.json => QE-Text-suffixPreview.json} | 13 +++++++------ 6 files changed, 29 insertions(+), 25 deletions(-) rename test/client-side-encryption/spec/unified/{QE-Text-prefix.json => QE-Text-prefixPreview.json} (97%) rename test/client-side-encryption/spec/unified/{QE-Text-suffix.json => QE-Text-suffixPreview.json} (96%) diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json index 3002c642b2..c43bf9390d 100644 --- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json +++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json @@ -11,7 +11,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefix", + "queryType": "prefixPreview", "strMinQueryLength": { "$numberInt": "2" }, @@ -23,7 +23,7 @@ "diacriticSensitive": false }, { - "queryType": "suffix", + "queryType": "suffixPreview", "strMinQueryLength": { "$numberInt": "2" }, diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json index 141c372dbe..ec4489fa09 100644 --- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json +++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json @@ -1,6 +1,6 @@ { - "fields": [ - { + "fields": [ + { "keyId": { "$binary": { "base64": "EjRWeBI0mHYSNBI0VniQEg==", @@ -11,7 +11,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefix", + "queryType": "prefixPreview", "strMinQueryLength": { "$numberInt": "2" }, @@ -22,7 +22,7 @@ "diacriticSensitive": true }, { - "queryType": "suffix", + "queryType": "suffixPreview", "strMinQueryLength": { "$numberInt": "2" }, @@ -34,5 +34,5 @@ } ] } - ] + ] } diff --git a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json index dc979b5019..fd74573ea2 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json +++ b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json @@ -3,14 +3,15 @@ "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "9.0.0", + "minServerVersion": "8.2.0", + "maxServerVersion": "8.99.99", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.19.0" + "minLibmongocryptVersion": "1.15.0" } } ], @@ -101,7 +102,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffix", + "queryType": "suffixPreview", "contention": { "$numberLong": "0" }, diff --git a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json index 1c3c6cc0de..a89ab96fc4 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json +++ b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json @@ -3,14 +3,15 @@ "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "9.0.0", + "minServerVersion": "8.2.0", + "maxServerVersion": "8.99.99", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.19.0" + "minLibmongocryptVersion": "1.15.0" } } ], @@ -101,7 +102,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffix", + "queryType": "suffixPreview", "contention": { "$numberLong": "0" }, @@ -209,7 +210,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffix", + "queryType": "suffixPreview", "contention": { "$numberLong": "0" }, diff --git a/test/client-side-encryption/spec/unified/QE-Text-prefix.json b/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json similarity index 97% rename from test/client-side-encryption/spec/unified/QE-Text-prefix.json rename to test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json index 25475e2c3a..c193608e88 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-prefix.json +++ b/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json @@ -1,16 +1,17 @@ { - "description": "QE-Text-prefix", + "description": "QE-Text-prefixPreview", "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "9.0.0", + "minServerVersion": "8.2.0", + "maxServerVersion": "8.99.99", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.19.0" + "minLibmongocryptVersion": "1.15.0" } } ], @@ -101,7 +102,7 @@ "bsonType": "string", "queries": [ { - "queryType": "prefix", + "queryType": "prefixPreview", "contention": { "$numberLong": "0" }, @@ -123,7 +124,7 @@ ], "tests": [ { - "description": "Insert QE prefix", + "description": "Insert QE prefixPreview", "operations": [ { "name": "insertOne", diff --git a/test/client-side-encryption/spec/unified/QE-Text-suffix.json b/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json similarity index 96% rename from test/client-side-encryption/spec/unified/QE-Text-suffix.json rename to test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json index ad6cdc06c9..2de5cde4a4 100644 --- a/test/client-side-encryption/spec/unified/QE-Text-suffix.json +++ b/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json @@ -1,16 +1,17 @@ { - "description": "QE-Text-suffix", + "description": "QE-Text-suffixPreview", "schemaVersion": "1.25", "runOnRequirements": [ { - "minServerVersion": "9.0.0", + "minServerVersion": "8.2.0", + "maxServerVersion": "8.99.99", "topologies": [ "replicaset", "sharded", "load-balanced" ], "csfle": { - "minLibmongocryptVersion": "1.19.0" + "minLibmongocryptVersion": "1.15.0" } } ], @@ -101,7 +102,7 @@ "bsonType": "string", "queries": [ { - "queryType": "suffix", + "queryType": "suffixPreview", "contention": { "$numberLong": "0" }, @@ -123,7 +124,7 @@ ], "tests": [ { - "description": "Insert QE suffix", + "description": "Insert QE suffixPreview", "operations": [ { "name": "insertOne", @@ -206,7 +207,7 @@ ] }, { - "description": "Query with matching $encStrEndsWith", + "description": "Query with matching $encStrStartsWith", "operations": [ { "name": "insertOne", From 781fc40d292ac429f9ae61946de98edfc82c7cb4 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 9 Jun 2026 10:40:24 -0400 Subject: [PATCH 3/3] Add patch --- .evergreen/spec-patch/PYTHON-5799.patch | 232 ++++++++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 .evergreen/spec-patch/PYTHON-5799.patch diff --git a/.evergreen/spec-patch/PYTHON-5799.patch b/.evergreen/spec-patch/PYTHON-5799.patch new file mode 100644 index 0000000000..96d293f317 --- /dev/null +++ b/.evergreen/spec-patch/PYTHON-5799.patch @@ -0,0 +1,232 @@ +diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json +index c43bf9390..3002c642b 100644 +--- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json ++++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json +@@ -11,7 +11,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "prefixPreview", ++ "queryType": "prefix", + "strMinQueryLength": { + "$numberInt": "2" + }, +@@ -23,7 +23,7 @@ + "diacriticSensitive": false + }, + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "strMinQueryLength": { + "$numberInt": "2" + }, +diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json +index ec4489fa0..141c372db 100644 +--- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json ++++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json +@@ -1,6 +1,6 @@ + { +- "fields": [ +- { ++ "fields": [ ++ { + "keyId": { + "$binary": { + "base64": "EjRWeBI0mHYSNBI0VniQEg==", +@@ -11,7 +11,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "prefixPreview", ++ "queryType": "prefix", + "strMinQueryLength": { + "$numberInt": "2" + }, +@@ -22,7 +22,7 @@ + "diacriticSensitive": true + }, + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "strMinQueryLength": { + "$numberInt": "2" + }, +@@ -34,5 +34,5 @@ + } + ] + } +- ] ++ ] + } +diff --git a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json +index fd74573ea..dc979b501 100644 +--- a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json ++++ b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json +@@ -3,15 +3,14 @@ + "schemaVersion": "1.25", + "runOnRequirements": [ + { +- "minServerVersion": "8.2.0", +- "maxServerVersion": "8.99.99", ++ "minServerVersion": "9.0.0", + "topologies": [ + "replicaset", + "sharded", + "load-balanced" + ], + "csfle": { +- "minLibmongocryptVersion": "1.15.0" ++ "minLibmongocryptVersion": "1.19.0" + } + } + ], +@@ -102,7 +101,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "contention": { + "$numberLong": "0" + }, +diff --git a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json +index a89ab96fc..1c3c6cc0d 100644 +--- a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json ++++ b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json +@@ -3,15 +3,14 @@ + "schemaVersion": "1.25", + "runOnRequirements": [ + { +- "minServerVersion": "8.2.0", +- "maxServerVersion": "8.99.99", ++ "minServerVersion": "9.0.0", + "topologies": [ + "replicaset", + "sharded", + "load-balanced" + ], + "csfle": { +- "minLibmongocryptVersion": "1.15.0" ++ "minLibmongocryptVersion": "1.19.0" + } + } + ], +@@ -102,7 +101,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "contention": { + "$numberLong": "0" + }, +@@ -210,7 +209,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "contention": { + "$numberLong": "0" + }, +diff --git a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-prefix.json +similarity index 97% +rename from test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json +rename to test/client-side-encryption/spec/unified/QE-Text-prefix.json +index c193608e8..25475e2c3 100644 +--- a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json ++++ b/test/client-side-encryption/spec/unified/QE-Text-prefix.json +@@ -1,17 +1,16 @@ + { +- "description": "QE-Text-prefixPreview", ++ "description": "QE-Text-prefix", + "schemaVersion": "1.25", + "runOnRequirements": [ + { +- "minServerVersion": "8.2.0", +- "maxServerVersion": "8.99.99", ++ "minServerVersion": "9.0.0", + "topologies": [ + "replicaset", + "sharded", + "load-balanced" + ], + "csfle": { +- "minLibmongocryptVersion": "1.15.0" ++ "minLibmongocryptVersion": "1.19.0" + } + } + ], +@@ -102,7 +101,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "prefixPreview", ++ "queryType": "prefix", + "contention": { + "$numberLong": "0" + }, +@@ -124,7 +123,7 @@ + ], + "tests": [ + { +- "description": "Insert QE prefixPreview", ++ "description": "Insert QE prefix", + "operations": [ + { + "name": "insertOne", +diff --git a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-suffix.json +similarity index 96% +rename from test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json +rename to test/client-side-encryption/spec/unified/QE-Text-suffix.json +index 2de5cde4a..ad6cdc06c 100644 +--- a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json ++++ b/test/client-side-encryption/spec/unified/QE-Text-suffix.json +@@ -1,17 +1,16 @@ + { +- "description": "QE-Text-suffixPreview", ++ "description": "QE-Text-suffix", + "schemaVersion": "1.25", + "runOnRequirements": [ + { +- "minServerVersion": "8.2.0", +- "maxServerVersion": "8.99.99", ++ "minServerVersion": "9.0.0", + "topologies": [ + "replicaset", + "sharded", + "load-balanced" + ], + "csfle": { +- "minLibmongocryptVersion": "1.15.0" ++ "minLibmongocryptVersion": "1.19.0" + } + } + ], +@@ -102,7 +101,7 @@ + "bsonType": "string", + "queries": [ + { +- "queryType": "suffixPreview", ++ "queryType": "suffix", + "contention": { + "$numberLong": "0" + }, +@@ -124,7 +123,7 @@ + ], + "tests": [ + { +- "description": "Insert QE suffixPreview", ++ "description": "Insert QE suffix", + "operations": [ + { + "name": "insertOne", +@@ -207,7 +206,7 @@ + ] + }, + { +- "description": "Query with matching $encStrStartsWith", ++ "description": "Query with matching $encStrEndsWith", + "operations": [ + { + "name": "insertOne",