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

Jump to bottom

GODRIVER-3161 Resync the fle2v2-Range-* tests and skip prose test 22 #1591

Merged
merged 1 commit into from
Apr 5, 2024
Merged

GODRIVER-3161 Resync the fle2v2-Range-* tests and skip prose test 22 #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions 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 @@ -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
Expand Down
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -238,4 +240,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -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"
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -179,4 +181,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -236,4 +238,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -232,4 +234,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Date-Update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -249,4 +251,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Aggregate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -1684,4 +1686,4 @@ tests:
}
]
}


3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Correctness.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -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"
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Delete.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -902,4 +904,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -1681,4 +1683,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-InsertFind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -1677,4 +1679,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"minServerVersion": "7.0.0",
"topology": [
"replicaset"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-Decimal-Update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -1694,4 +1696,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -326,4 +328,4 @@ tests:
}
}
]
}
}
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down
4 changes: 3 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down Expand Up @@ -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"
3 changes: 2 additions & 1 deletion testdata/client-side-encryption/legacy/fle2v2-Range-DecimalPrecision-Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"maxServerVersion": "7.99.99"
}
],
"database_name": "default",
Expand Down