Skip to content

Commit c53a0f9

Browse files
mongodb-drivers-pr-bot[bot]Cloud UsersleepyStick
authored
[Spec Resync] 06-22-2026 (#2885)
Co-authored-by: Cloud User <ec2-user@ip-10-128-193-139.ec2.internal> Co-authored-by: Iris <58442094+sleepyStick@users.noreply.github.com> Co-authored-by: Iris <iris.ho@mongodb.com>
1 parent f65a451 commit c53a0f9

14 files changed

Lines changed: 811 additions & 42 deletions

‎.evergreen/scripts/resync-all-specs.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@ def apply_patches(errored):
3737
["bash", "./.evergreen/remove-unimplemented-tests.sh"], # noqa: S607
3838
check=True,
3939
)
40-
try:
41-
# Avoid shell=True by passing arguments as a list.
42-
# Note: glob expansion doesn't work in shell=False, so we use a list of files.
43-
spec_patch_dir = pathlib.Path("./.evergreen/spec-patch/")
44-
patches = [str(p) for p in spec_patch_dir.glob("*.patch")]
45-
patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")]
46-
if patches:
47-
for patch in patches:
48-
print(f"Applying patch {patch}")
49-
subprocess.run( # noqa: S603
50-
[ # noqa: S607
51-
"git",
52-
"apply",
53-
"-R",
54-
"--allow-empty",
55-
"--whitespace=fix",
56-
*patches,
57-
],
58-
check=True,
59-
stderr=subprocess.PIPE,
60-
)
61-
except CalledProcessError as exc:
62-
errored["applying patches"] = exc.stderr
40+
# Avoid shell=True by passing arguments as a list.
41+
# Note: glob expansion doesn't work in shell=False, so we use a list of files.
42+
spec_patch_dir = pathlib.Path("./.evergreen/spec-patch/")
43+
patches = [str(p) for p in spec_patch_dir.glob("*.patch")]
44+
patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")]
45+
if patches:
46+
for patch in patches:
47+
print(f"Applying patch {patch}")
48+
try:
49+
subprocess.run( # noqa: S603
50+
[ # noqa: S607
51+
"git",
52+
"apply",
53+
"-R",
54+
"--allow-empty",
55+
"--whitespace=fix",
56+
str(patch),
57+
],
58+
check=True,
59+
stderr=subprocess.PIPE,
60+
)
61+
except CalledProcessError as exc:
62+
errored[f"{patch}"] = exc.stderr
6363

6464

6565
def check_new_spec_directories(directory: pathlib.Path) -> list[str]:

.evergreen/spec-patch/permanent/PYTHON-4201.patch renamed to .evergreen/spec-patch/permanent/PYTHON-4261.patch

File renamed without changes.

‎test/client-side-encryption/etc/data/encryptedFields-c10.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedIndexed",
11+
"bsonType": "string",
12+
"queries": {
13+
"queryType": "equality",
14+
"contention": {
15+
"$numberLong": "10"
16+
}
17+
}
18+
},
19+
{
20+
"keyId": {
21+
"$binary": {
22+
"base64": "q83vqxI0mHYSNBI0VniQEg==",
23+
"subType": "04"
24+
}
25+
},
26+
"path": "encryptedUnindexed",
27+
"bsonType": "string"
28+
}
29+
]
30+
}

‎test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"bsonType": "string",
1212
"queries": [
1313
{
14-
"queryType": "prefixPreview",
14+
"queryType": "prefix",
1515
"strMinQueryLength": {
1616
"$numberInt": "2"
1717
},
@@ -23,7 +23,7 @@
2323
"diacriticSensitive": false
2424
},
2525
{
26-
"queryType": "suffixPreview",
26+
"queryType": "suffix",
2727
"strMinQueryLength": {
2828
"$numberInt": "2"
2929
},

‎test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-preview.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedText",
11+
"bsonType": "string",
12+
"queries": [
13+
{
14+
"queryType": "prefixPreview",
15+
"strMinQueryLength": {
16+
"$numberInt": "2"
17+
},
18+
"strMaxQueryLength": {
19+
"$numberInt": "10"
20+
},
21+
"contention": {
22+
"$numberLong": "0"
23+
},
24+
"caseSensitive": true,
25+
"diacriticSensitive": true
26+
},
27+
{
28+
"queryType": "suffixPreview",
29+
"strMinQueryLength": {
30+
"$numberInt": "2"
31+
},
32+
"strMaxQueryLength": {
33+
"$numberInt": "10"
34+
},
35+
"contention": {
36+
"$numberLong": "0"
37+
},
38+
"caseSensitive": true,
39+
"diacriticSensitive": true
40+
}
41+
]
42+
}
43+
]
44+
}

‎test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"fields": [
3-
{
2+
"fields": [
3+
{
44
"keyId": {
55
"$binary": {
66
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
@@ -11,28 +11,34 @@
1111
"bsonType": "string",
1212
"queries": [
1313
{
14-
"queryType": "prefixPreview",
14+
"queryType": "prefix",
1515
"strMinQueryLength": {
1616
"$numberInt": "2"
1717
},
1818
"strMaxQueryLength": {
1919
"$numberInt": "10"
2020
},
21+
"contention": {
22+
"$numberLong": "0"
23+
},
2124
"caseSensitive": true,
2225
"diacriticSensitive": true
2326
},
2427
{
25-
"queryType": "suffixPreview",
28+
"queryType": "suffix",
2629
"strMinQueryLength": {
2730
"$numberInt": "2"
2831
},
2932
"strMaxQueryLength": {
3033
"$numberInt": "10"
3134
},
35+
"contention": {
36+
"$numberLong": "0"
37+
},
3238
"caseSensitive": true,
3339
"diacriticSensitive": true
3440
}
3541
]
3642
}
37-
]
43+
]
3844
}

‎test/client-side-encryption/etc/data/encryptedFields-substring.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"strMaxQueryLength": {
2222
"$numberInt": "10"
2323
},
24+
"contention": {
25+
"$numberLong": "0"
26+
},
2427
"caseSensitive": true,
2528
"diacriticSensitive": true
2629
}

‎test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
"schemaVersion": "1.25",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "8.2.0",
7-
"maxServerVersion": "8.99.99",
6+
"minServerVersion": "9.0.0",
87
"topologies": [
98
"replicaset",
109
"sharded",
1110
"load-balanced"
1211
],
1312
"csfle": {
14-
"minLibmongocryptVersion": "1.15.0"
13+
"minLibmongocryptVersion": "1.19.0"
1514
}
1615
}
1716
],
@@ -102,7 +101,7 @@
102101
"bsonType": "string",
103102
"queries": [
104103
{
105-
"queryType": "suffixPreview",
104+
"queryType": "suffix",
106105
"contention": {
107106
"$numberLong": "0"
108107
},

‎test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
"schemaVersion": "1.25",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "8.2.0",
7-
"maxServerVersion": "8.99.99",
6+
"minServerVersion": "9.0.0",
87
"topologies": [
98
"replicaset",
109
"sharded",
1110
"load-balanced"
1211
],
1312
"csfle": {
14-
"minLibmongocryptVersion": "1.15.0"
13+
"minLibmongocryptVersion": "1.19.0"
1514
}
1615
}
1716
],
@@ -102,7 +101,7 @@
102101
"bsonType": "string",
103102
"queries": [
104103
{
105-
"queryType": "suffixPreview",
104+
"queryType": "suffix",
106105
"contention": {
107106
"$numberLong": "0"
108107
},
@@ -210,7 +209,7 @@
210209
"bsonType": "string",
211210
"queries": [
212211
{
213-
"queryType": "suffixPreview",
212+
"queryType": "suffix",
214213
"contention": {
215214
"$numberLong": "0"
216215
},

0 commit comments

Comments
 (0)