Skip to content

Commit

Permalink
GODRIVER-2761 Skip QE tests against latest servers (#1221)
Browse files Browse the repository at this point in the history
* sync fle2 tests to specifications commit baf3724155500acbb557e158b8a5d4334e7f3512

* skip QE tests on server 6.2.99+
  • Loading branch information
kevinAlbs committed Apr 4, 2023
1 parent a46ad91 commit b1161f4
Show file tree
Hide file tree
Showing 32 changed files with 62 additions and 16 deletions.
2 changes: 1 addition & 1 deletion mongo/integration/client_side_encryption_prose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions mongo/integration/client_side_encryption_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions testdata/client-side-encryption/legacy/fle2-Compact.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2-Compact.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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" ]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions testdata/client-side-encryption/legacy/fle2-Delete.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2-Delete.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2-MissingKey.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2-NoEncryption.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions testdata/client-side-encryption/legacy/fle2-Update.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2-Update.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"runOn": [
{
"maxServerVersion": "6.2.99",
"minServerVersion": "6.0.0",
"topology": [
"replicaset",
Expand Down
Original file line number Diff line number Diff line change
@@ -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" ]

Expand Down

0 comments on commit b1161f4

Please sign in to comment.