diff --git a/mongo/integration/client_side_encryption_prose_test.go b/mongo/integration/client_side_encryption_prose_test.go index 13cadc6305..b9765a4356 100644 --- a/mongo/integration/client_side_encryption_prose_test.go +++ b/mongo/integration/client_side_encryption_prose_test.go @@ -2457,9 +2457,8 @@ func TestClientSideEncryptionProse(t *testing.T) { } }) - // Only test MongoDB Server 7.0+. MongoDB Server 7.0 introduced a backwards breaking change to the Queryable Encryption (QE) protocol: QEv2. - // libmongocrypt is configured to use the QEv2 protocol. - mt.RunOpts("22. range explicit encryption", qeRunOpts, func(mt *mtest.T) { + qeRunOpts22 := qeRunOpts.MinServerVersion("8.0") + mt.RunOpts("22. range explicit encryption", qeRunOpts22, func(mt *mtest.T) { type testcase struct { typeStr string field string diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json index ba53b007b5..9eaabe0d71 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml index 93ad199511..27fe021ff0 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -238,4 +240,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json index e9620efbed..fa887e0892 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml index d60b7b6201..e660ddc651 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -419,4 +421,4 @@ tests: filter: { encryptedDate: { $gte: { $numberDouble: "0" } }} result: # expect an error mongocryptd. - errorContains: "value type is a date" \ No newline at end of file + errorContains: "value type is a date" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json index daaa093896..cce4faf188 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml index 0b969fd48c..ddbaaeafc2 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -179,4 +181,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json index 8500fa8291..4392b67686 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml index 76bfe7ea25..70728ffa2f 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -236,4 +238,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json index 7de45ba00e..27ce7881df 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml index e978b9de59..0341c5966d 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -232,4 +234,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json index d5b62be062..f7d5a6af66 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml index fe7d050f1b..3a5c9ce9f7 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -249,4 +251,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json index 081bc577fb..401ee34e3f 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml index 0926988d27..6e10d6f3ee 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -1684,4 +1686,4 @@ tests: } ] } - \ No newline at end of file + diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json index 12fe7c8bc8..758d3e5732 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml index 1961ed3e5f..5a4320a4e5 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml @@ -8,6 +8,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -290,4 +292,4 @@ tests: sort: { _id: 1 } result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json index ac49d16a20..24a08f318c 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml index bdb10e2d88..1d5b1fea20 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -902,4 +904,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json index 88a2350786..2a8070ecf9 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml index defccea0aa..a883e78960 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -1681,4 +1683,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json index 54e43e4a26..2ef63f42b9 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml index 51abaa6423..8c74a86646 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -1677,4 +1679,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json index b2b8136a9a..8064eb1b18 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json @@ -4,7 +4,8 @@ "minServerVersion": "7.0.0", "topology": [ "replicaset" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml index e79fd082ec..7ce7bfe1ad 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml @@ -6,6 +6,8 @@ runOn: # FLE 2 Encrypted collections are not supported on standalone. # 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. topology: [ "replicaset" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -1694,4 +1696,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json index b078d18172..8cf143c094 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml index 08f4a380cf..59ea8ec397 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -326,4 +328,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json index 0859e702aa..a4b06998f7 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml index 18252b4bbe..1df675c5fd 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -421,4 +423,4 @@ tests: sort: { _id: 1 } result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json index 6e1ad90cd4..fad8234838 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.yml index ade385d202..c57beba61a 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -223,4 +225,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json index 1cfd19a1e8..fb8f4f4140 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml index 7100d58886..2c67b36381 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json index da76609727..79562802e6 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml index 32785d6589..7b9b91cfa3 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -316,4 +318,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.json index 2d201948cf..cc93b76948 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.yml index eedd076084..19985df57e 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -333,4 +335,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.json index c188f1f5a9..79f26660f2 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.yml index 4fb95343b0..a1f52ec332 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -910,4 +912,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.json index 3e298127dd..117e56af62 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.yml index 7289bb24dc..4577b0fe04 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -289,4 +291,4 @@ tests: sort: { _id: 1 } result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.json index dc0ba435f0..40d8ed5bb2 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.yml index 2f42c1da10..39ea49ec3b 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -515,4 +517,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.json index 4b96575e18..f0893ce661 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml index d6573ff862..d0b93a0ab2 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -908,4 +910,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.json index 4827b6838f..d3dc2f830c 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.yml index 0122ba243c..c85115b8d4 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -904,4 +906,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.json index c3284ad0ff..9d6a1fbfdd 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.yml index 176db3971e..e63be502fe 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Double-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -921,4 +923,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.json index a2c1f3b75d..4188685a2c 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml index 134003bf9c..f6acb43dc3 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -322,4 +324,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.json index d0c0601ce8..60f1ea7a33 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.yml index a8fc4ec2a4..856b5d0020 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -421,4 +423,4 @@ tests: sort: { _id: 1 } result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.json index a617442ee0..4ed591d3f8 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.yml index a6f83da786..2a9c66289f 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -221,4 +223,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json index 5565fb179e..d8fbbfae73 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml index 5def8d287d..181e22cc2c 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -320,4 +322,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.json index a1d8c17855..4213b066d1 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml index 8900f79a86..93af040b36 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -316,4 +318,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.json index 6ea99242b1..89eb4c338d 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.yml index 3e31f40181..33a908acbe 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-DoublePrecision-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -335,4 +337,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.json index b3b2826faf..686f0241ba 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.yml index 13c350ea5f..ff56adb152 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -238,4 +240,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.json index 4932223ba2..2964624f22 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.yml index 1e7d5d47fc..48b2338fa8 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -420,4 +422,4 @@ tests: filter: { encryptedInt: { $gte: { $numberDouble: "0" } }} result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.json index 03f816e4b2..531b3e7590 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.yml index ab1e9d2e5e..eeeb297cc0 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -179,4 +181,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.json index d573f7b6a0..402086cdb6 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml index a33a5120a5..473fcd7fe3 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -236,4 +238,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.json index 04953663fe..965b8a5516 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.yml index 4ef8c8e520..565a9df362 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -232,4 +234,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.json index 4c7a3c2789..6cf44ac782 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.yml index cf5716dab0..571acf8407 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Int-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -251,4 +253,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.json index a7e77fd5c3..6edb38a800 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.yml index cb5e42c158..68f0fb96a0 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Aggregate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -238,4 +240,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.json index 365822c79c..3d33f7381b 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.yml index a7a33e274e..7d55c37158 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Correctness.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -419,4 +421,4 @@ tests: filter: { encryptedLong: { $gte: { $numberDouble: "0" } }} result: # expect an error from libmongocrypt. - errorContains: "field type is not supported" \ No newline at end of file + errorContains: "field type is not supported" diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.json index 17a01fe076..1b32782010 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.yml index 8dd1603f33..6146554e44 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Delete.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -179,4 +181,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.json index 918d0dfeed..b8e3b888a8 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml index 0641988b98..a197c564f0 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-FindOneAndUpdate.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -236,4 +238,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.json index 9fafd10d4b..d637fcf9e7 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.yml index 076670d49e..655d211218 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-InsertFind.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -232,4 +234,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.json b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.json index 20ac25bfad..1b76019a4c 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.yml index 0aad7c4416..55a5ae5b9e 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-Long-Update.yml @@ -5,6 +5,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: [] @@ -251,4 +253,4 @@ tests: } } ] - } \ No newline at end of file + } diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.json b/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.json index 5a6e650ab4..704a693b8f 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.json +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "maxServerVersion": "7.99.99" } ], "database_name": "default", diff --git a/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.yml b/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.yml index b44e8c5055..9f1a93386a 100644 --- a/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.yml +++ b/testdata/client-side-encryption/legacy/fle2v2-Range-WrongType.yml @@ -7,6 +7,8 @@ runOn: # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol. # FLE 2 Encrypted collections are not supported on standalone. topology: [ "replicaset", "sharded", "load-balanced" ] + # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range". + maxServerVersion: "7.99.99" database_name: &database_name "default" collection_name: &collection_name "default" data: []