Skip to content

Commit b693b75

Browse files
prestonvasquezprestonvasquez
authored
GODRIVER-3161 Resync the fle2v2-Range-* tests and skip prose test 22 (#1591)
1 parent d41a7cc commit b693b75

File tree

87 files changed

+215
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+215
-87
lines changed

‎mongo/integration/client_side_encryption_prose_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -2457,9 +2457,8 @@ func TestClientSideEncryptionProse(t *testing.T) {
24572457
}
24582458
})
24592459

2460-
// Only test MongoDB Server 7.0+. MongoDB Server 7.0 introduced a backwards breaking change to the Queryable Encryption (QE) protocol: QEv2.
2461-
// libmongocrypt is configured to use the QEv2 protocol.
2462-
mt.RunOpts("22. range explicit encryption", qeRunOpts, func(mt *mtest.T) {
2460+
qeRunOpts22 := qeRunOpts.MinServerVersion("8.0")
2461+
mt.RunOpts("22. range explicit encryption", qeRunOpts22, func(mt *mtest.T) {
24632462
type testcase struct {
24642463
typeStr string
24652464
field string

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -238,4 +240,4 @@ tests:
238240
}
239241
}
240242
]
241-
}
243+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ runOn:
77
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
88
# FLE 2 Encrypted collections are not supported on standalone.
99
topology: [ "replicaset", "sharded", "load-balanced" ]
10+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
11+
maxServerVersion: "7.99.99"
1012
database_name: &database_name "default"
1113
collection_name: &collection_name "default"
1214
data: []
@@ -419,4 +421,4 @@ tests:
419421
filter: { encryptedDate: { $gte: { $numberDouble: "0" } }}
420422
result:
421423
# expect an error mongocryptd.
422-
errorContains: "value type is a date"
424+
errorContains: "value type is a date"

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -179,4 +181,4 @@ tests:
179181
}
180182
}
181183
]
182-
}
184+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -236,4 +238,4 @@ tests:
236238
}
237239
}
238240
]
239-
}
241+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -232,4 +234,4 @@ tests:
232234
}
233235
}
234236
]
235-
}
237+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -249,4 +251,4 @@ tests:
249251
}
250252
}
251253
]
252-
}
254+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runOn:
66
# FLE 2 Encrypted collections are not supported on standalone.
77
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
88
topology: [ "replicaset" ]
9+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
10+
maxServerVersion: "7.99.99"
911
database_name: &database_name "default"
1012
collection_name: &collection_name "default"
1113
data: []
@@ -1684,4 +1686,4 @@ tests:
16841686
}
16851687
]
16861688
}
1687-
1689+

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ runOn:
88
# FLE 2 Encrypted collections are not supported on standalone.
99
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
1010
topology: [ "replicaset" ]
11+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
12+
maxServerVersion: "7.99.99"
1113
database_name: &database_name "default"
1214
collection_name: &collection_name "default"
1315
data: []
@@ -290,4 +292,4 @@ tests:
290292
sort: { _id: 1 }
291293
result:
292294
# expect an error from libmongocrypt.
293-
errorContains: "field type is not supported"
295+
errorContains: "field type is not supported"

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runOn:
66
# FLE 2 Encrypted collections are not supported on standalone.
77
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
88
topology: [ "replicaset" ]
9+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
10+
maxServerVersion: "7.99.99"
911
database_name: &database_name "default"
1012
collection_name: &collection_name "default"
1113
data: []
@@ -902,4 +904,4 @@ tests:
902904
}
903905
}
904906
]
905-
}
907+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runOn:
66
# FLE 2 Encrypted collections are not supported on standalone.
77
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
88
topology: [ "replicaset" ]
9+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
10+
maxServerVersion: "7.99.99"
911
database_name: &database_name "default"
1012
collection_name: &collection_name "default"
1113
data: []
@@ -1681,4 +1683,4 @@ tests:
16811683
}
16821684
}
16831685
]
1684-
}
1686+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runOn:
66
# FLE 2 Encrypted collections are not supported on standalone.
77
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
88
topology: [ "replicaset" ]
9+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
10+
maxServerVersion: "7.99.99"
911
database_name: &database_name "default"
1012
collection_name: &collection_name "default"
1113
data: []
@@ -1677,4 +1679,4 @@ tests:
16771679
}
16781680
}
16791681
]
1680-
}
1682+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"minServerVersion": "7.0.0",
55
"topology": [
66
"replicaset"
7-
]
7+
],
8+
"maxServerVersion": "7.99.99"
89
}
910
],
1011
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ runOn:
66
# FLE 2 Encrypted collections are not supported on standalone.
77
# Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
88
topology: [ "replicaset" ]
9+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
10+
maxServerVersion: "7.99.99"
911
database_name: &database_name "default"
1012
collection_name: &collection_name "default"
1113
data: []
@@ -1694,4 +1696,4 @@ tests:
16941696
}
16951697
}
16961698
]
1697-
}
1699+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []
@@ -326,4 +328,4 @@ tests:
326328
}
327329
}
328330
]
329-
}
331+
}

‎testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

‎testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ runOn:
77
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
88
# FLE 2 Encrypted collections are not supported on standalone.
99
topology: [ "replicaset", "sharded", "load-balanced" ]
10+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
11+
maxServerVersion: "7.99.99"
1012
database_name: &database_name "default"
1113
collection_name: &collection_name "default"
1214
data: []
@@ -421,4 +423,4 @@ tests:
421423
sort: { _id: 1 }
422424
result:
423425
# expect an error from libmongocrypt.
424-
errorContains: "field type is not supported"
426+
errorContains: "field type is not supported"

‎testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

0 commit comments

Comments
 (0)