Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GODRIVER-2761 Skip QE tests against latest servers #1221

Merged
merged 2 commits into from
Apr 4, 2023
Merged

GODRIVER-2761 Skip QE tests against latest servers #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e547f9
sync fle2 tests to specifications commit baf3724155500acbb557e158b8a5…
kevinAlbs Apr 4, 2023
a0365ac
skip QE tests on server 6.2.99+
kevinAlbs Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mongo/integration/client_side_encryption_prose_test.go
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions testdata/client-side-encryption/legacy/fle2-BypassQueryAnalysis.json
View file
Open in desktop
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-BypassQueryAnalysis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-CreateCollection.json
View file
Open in desktop
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-CreateCollection.yml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions testdata/client-side-encryption/legacy/fle2-DecryptExistingData.json
View file
Open in desktop
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-DecryptExistingData.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-EncryptedFields-vs-EncryptedFieldsMap.json
View file
Open in desktop
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-EncryptedFields-vs-EncryptedFieldsMap.yml
View file
Open in desktop
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-EncryptedFields-vs-jsonSchema.json
View file
Open in desktop
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-EncryptedFields-vs-jsonSchema.yml
View file
Open in desktop
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-EncryptedFieldsMap-defaults.json
View file
Open in desktop
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-EncryptedFieldsMap-defaults.yml
View file
Open in desktop
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-FindOneAndUpdate.json
View file
Open in desktop
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-FindOneAndUpdate.yml
View file
Open in desktop
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-InsertFind-Indexed.json
View file
Open in desktop
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-InsertFind-Indexed.yml
View file
Open in desktop
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-InsertFind-Unindexed.json
View file
Open in desktop
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-InsertFind-Unindexed.yml
View file
Open in desktop
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-MissingKey.json
View file
Open in desktop
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
View file
Open in desktop
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-NoEncryption.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-validatorAndPartialFieldExpression.json
View file
Open in desktop
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-validatorAndPartialFieldExpression.yml
View file
Open in desktop
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