GODRIVER-3161 Resync the fle2v2-Range-* tests and skip prose test 22 (m…

…ongodb#1591)
blink1073 · Apr 5, 2024 · b693b75 · b693b75
1 parent d41a7cc
commit b693b75
Show file tree

Hide file tree

Showing 87 changed files with 215 additions and 87 deletions.
diff --git 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
@@ -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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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"
+          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
@@ -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
@@ -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:
                     }
                 }
             ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                   }
               ]
           }
-
+
diff --git 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
@@ -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"
+          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
@@ -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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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:
                       }
                   }
               ]
-          }
+          }
diff --git 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
@@ -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"
+          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
@@ -6,7 +6,8 @@
         "replicaset",
         "sharded",
         "load-balanced"
-      ]
+      ],
+      "maxServerVersion": "7.99.99"
     }
   ],
   "database_name": "default",