Skip to content

[Spec Resync] 06-09-2026 #2862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mongodb-drivers-pr-bot wants to merge 3 commits into
base: master
Choose a base branch
from
+235 −0
Open

[Spec Resync] 06-09-2026 #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d04ac82
resyncing specs 06-09-2026
Jun 9, 2026
4f10d13
Patch renames
NoahStapp Jun 9, 2026
781fc40
Add patch
NoahStapp Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .evergreen/scripts/resync-all-specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Comment on lines +47 to +48

@NoahStapp NoahStapp Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added for future debuggability.

subprocess.run(
[ # noqa: S603, S607
"git",
"apply",
"-R",

@NoahStapp NoahStapp Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed in a prior change that caused the patches to be applied incorrectly.

"--allow-empty",
"--whitespace=fix",
*patches,
Expand Down
232 changes: 232 additions & 0 deletions .evergreen/spec-patch/PYTHON-5799.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
0 ...ndshake/unified/op_msg-not-supported.json → ...andshake/unified/opmsg-not-supported.json
View file
Open in desktop
File renamed without changes.
Loading