GODRIVER-2761 Skip QE tests against latest servers (#1221)

kevinAlbs · web-flow · commit b1161f45392f · 2023-04-04T16:09:26.000-04:00
* sync fle2 tests to specifications commit baf3724155500acbb557e158b8a5d4334e7f3512

* skip QE tests on server 6.2.99+
diff --git a/mongo/integration/client_side_encryption_prose_test.go b/mongo/integration/client_side_encryption_prose_test.go
@@ -78,7 +78,6 @@ func TestClientSideEncryptionProse(t *testing.T) {
 		},
 	}
 
-	runOpts := mtest.NewOptions().MinServerVersion("6.0").Topologies(mtest.ReplicaSet, mtest.LoadBalanced, mtest.ShardedReplicaSet)
 	mt.Run("1. custom key material test", func(mt *mtest.T) {
 		const (
 			dkCollection = "datakeys"
@@ -1534,6 +1533,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 			})
 		}
 	})
+	runOpts := mtest.NewOptions().MinServerVersion("6.0").MaxServerVersion("6.2.99").Topologies(mtest.ReplicaSet, mtest.LoadBalanced, mtest.ShardedReplicaSet)
 	mt.RunOpts("12. explicit encryption", runOpts, func(mt *mtest.T) {
 		// Test Setup ... begin
 		encryptedFields := readJSONFile(mt, "encrypted-fields.json")
diff --git a/mongo/integration/client_side_encryption_test.go b/mongo/integration/client_side_encryption_test.go
@@ -477,6 +477,7 @@ func TestFLE2DocsExample(t *testing.T) {
 	// FLE 2 is not supported on Standalone topology.
 	mtOpts := mtest.NewOptions().
 		MinServerVersion("6.0").
+		MaxServerVersion("6.2.99").
 		Enterprise(true).
 		CreateClient(false).
 		Topologies(mtest.ReplicaSet,
diff --git a/testdata/client-side-encryption/legacy/fle2-BypassQueryAnalysis.json b/testdata/client-side-encryption/legacy/fle2-BypassQueryAnalysis.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-BypassQueryAnalysis.yml b/testdata/client-side-encryption/legacy/fle2-BypassQueryAnalysis.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-Compact.json b/testdata/client-side-encryption/legacy/fle2-Compact.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-Compact.yml b/testdata/client-side-encryption/legacy/fle2-Compact.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-CreateCollection.json b/testdata/client-side-encryption/legacy/fle2-CreateCollection.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-CreateCollection.yml b/testdata/client-side-encryption/legacy/fle2-CreateCollection.yml
@@ -1,6 +1,8 @@
 # This test requires libmongocrypt 1.5.0-alpha2.
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
     
diff --git a/testdata/client-side-encryption/legacy/fle2-DecryptExistingData.json b/testdata/client-side-encryption/legacy/fle2-DecryptExistingData.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-DecryptExistingData.yml b/testdata/client-side-encryption/legacy/fle2-DecryptExistingData.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-Delete.json b/testdata/client-side-encryption/legacy/fle2-Delete.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-Delete.yml b/testdata/client-side-encryption/legacy/fle2-Delete.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-EncryptedFieldsMap.json b/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-EncryptedFieldsMap.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-EncryptedFieldsMap.yml b/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-EncryptedFieldsMap.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-jsonSchema.json b/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-jsonSchema.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-jsonSchema.yml b/testdata/client-side-encryption/legacy/fle2-EncryptedFields-vs-jsonSchema.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFieldsMap-defaults.json b/testdata/client-side-encryption/legacy/fle2-EncryptedFieldsMap-defaults.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-EncryptedFieldsMap-defaults.yml b/testdata/client-side-encryption/legacy/fle2-EncryptedFieldsMap-defaults.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-FindOneAndUpdate.json b/testdata/client-side-encryption/legacy/fle2-FindOneAndUpdate.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-FindOneAndUpdate.yml b/testdata/client-side-encryption/legacy/fle2-FindOneAndUpdate.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-InsertFind-Indexed.json b/testdata/client-side-encryption/legacy/fle2-InsertFind-Indexed.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-InsertFind-Indexed.yml b/testdata/client-side-encryption/legacy/fle2-InsertFind-Indexed.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-InsertFind-Unindexed.json b/testdata/client-side-encryption/legacy/fle2-InsertFind-Unindexed.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-InsertFind-Unindexed.yml b/testdata/client-side-encryption/legacy/fle2-InsertFind-Unindexed.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-MissingKey.json b/testdata/client-side-encryption/legacy/fle2-MissingKey.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-MissingKey.yml b/testdata/client-side-encryption/legacy/fle2-MissingKey.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-NoEncryption.json b/testdata/client-side-encryption/legacy/fle2-NoEncryption.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-NoEncryption.yml b/testdata/client-side-encryption/legacy/fle2-NoEncryption.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-Update.json b/testdata/client-side-encryption/legacy/fle2-Update.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-Update.yml b/testdata/client-side-encryption/legacy/fle2-Update.yml
@@ -1,5 +1,7 @@
 runOn:
-  - minServerVersion: "6.0.0"
+  - maxServerVersion: "6.2.99"
+    # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+    minServerVersion: "6.0.0"
     # FLE 2 Encrypted collections are not supported on standalone.
     topology: [ "replicaset", "sharded", "load-balanced" ]
 database_name: &database_name "default"
diff --git a/testdata/client-side-encryption/legacy/fle2-validatorAndPartialFieldExpression.json b/testdata/client-side-encryption/legacy/fle2-validatorAndPartialFieldExpression.json
@@ -1,6 +1,7 @@
 {
   "runOn": [
     {
+      "maxServerVersion": "6.2.99",
       "minServerVersion": "6.0.0",
       "topology": [
         "replicaset",
diff --git a/testdata/client-side-encryption/legacy/fle2-validatorAndPartialFieldExpression.yml b/testdata/client-side-encryption/legacy/fle2-validatorAndPartialFieldExpression.yml
@@ -1,7 +1,9 @@
 # This test requires libmongocrypt 1.5.0-alpha2.
 runOn:
     # Require server version 6.0.0 to get behavior added in SERVER-64911.
-    - minServerVersion: "6.0.0"
+    - maxServerVersion: "6.2.99"
+      # Do not test on server version >= 6.3.0. Server version >= 6.3.0 includes backwards breaking changes to FLE2 protocol. Refer: DRIVERS-2435
+      minServerVersion: "6.0.0"
       # FLE 2 Encrypted collections are not supported on standalone.
       topology: [ "replicaset", "sharded", "load-balanced" ]
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`78`	`78`	`},`
`79`	`79`	`}`
`80`	`80`
`81`		`- runOpts := mtest.NewOptions().MinServerVersion("6.0").Topologies(mtest.ReplicaSet, mtest.LoadBalanced, mtest.ShardedReplicaSet)`
`82`	`81`	`mt.Run("1. custom key material test", func(mt *mtest.T) {`
`83`	`82`	`const (`
`84`	`83`	`dkCollection = "datakeys"`
`@@ -1534,6 +1533,7 @@ func TestClientSideEncryptionProse(t *testing.T) {`
`1534`	`1533`	`})`
`1535`	`1534`	`}`
`1536`	`1535`	`})`
	`1536`	`+ runOpts := mtest.NewOptions().MinServerVersion("6.0").MaxServerVersion("6.2.99").Topologies(mtest.ReplicaSet, mtest.LoadBalanced, mtest.ShardedReplicaSet)`
`1537`	`1537`	`mt.RunOpts("12. explicit encryption", runOpts, func(mt *mtest.T) {`
`1538`	`1538`	`// Test Setup ... begin`
`1539`	`1539`	`encryptedFields := readJSONFile(mt, "encrypted-fields.json")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"runOn": [`
`3`	`3`	`{`
	`4`	`+ "maxServerVersion": "6.2.99",`
`4`	`5`	`"minServerVersion": "6.0.0",`
`5`	`6`	`"topology": [`
`6`	`7`	`"replicaset",`