diff --git a/mongo/integration/client_side_encryption_prose_test.go b/mongo/integration/client_side_encryption_prose_test.go index 0533e7dc01..c3d97e29d2 100644 --- 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 index bf4bea173f..c6877018ef 100644 --- 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 index b8d06e8bcd..4272e16a8e 100644 --- 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 index e6b3d66505..7ef4ef7de2 100644 --- 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 index 6ca0f9ba02..b13e91b1ed 100644 --- 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 index 6e3a198d02..b815e60e72 100644 --- 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 index 7f4f38161e..19bd54e0de 100644 --- 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 index dd09f58584..30870f7962 100644 --- 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 index e622d3334d..23cdab93e4 100644 --- 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 index d1d0e2384a..5ca91ae39d 100644 --- 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 index 8687127748..8e04dc5d8e 100644 --- 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 index 7dfe117681..6ce4be1298 100644 --- 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 index 42cd4bbc9c..c44bf9d2e9 100644 --- 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 index fff3e24561..a5bd66f74b 100644 --- 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 index f4386483da..0e56912e36 100644 --- 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 index 2ff2e4da1c..b73ab184f9 100644 --- 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 index 60820aae95..4e13934b72 100644 --- 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 index 0ee418db05..e1bf35d0f5 100644 --- 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 index de1b5c5aad..e929c823ab 100644 --- 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 index a5596c2c24..da425c7ceb 100644 --- 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 index 84b69d7de9..53857cac16 100644 --- 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 index 5c5efbcc5e..44eae4f206 100644 --- 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 index 9b31438525..b2a3bd9d98 100644 --- 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 index 71f1993e56..a359e1a7a5 100644 --- 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 index 4210da09e4..ce5c1677fd 100644 --- 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 index 937c82ee9e..63dcdfd81d 100644 --- 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 index 9d255bd493..39ffcf17fc 100644 --- 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 index 8725ac1ef7..f2e92e844b 100644 --- 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 index 090f44f9ac..581cebbc75 100644 --- 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 index 929f4a3a38..ba53c5efc0 100644 --- 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 index e70ca7c72d..286fbb6b0d 100644 --- 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 index 9463ddecad..d92a666273 100644 --- 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" ]