Skip to content

Commit 8e02256

Browse files
durrandurran
authored
test(NODE-5288): sync flev2 legacy spec tests (mongodb#3723)
1 parent 6580b7d commit 8e02256

File tree

119 files changed

+61
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+61
-141
lines changed

‎src/operations/create_collection.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,11 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
137137

138138
if (encryptedFields) {
139139
// Creating a QE collection required min server of 7.0.0
140-
if (server.description.maxWireVersion < MIN_SUPPORTED_QE_WIRE_VERSION) {
140+
// TODO(NODE-5353): Get wire version information from connection.
141+
if (
142+
!server.loadBalanced &&
143+
server.description.maxWireVersion < MIN_SUPPORTED_QE_WIRE_VERSION
144+
) {
141145
throw new MongoCompatibilityError(
142146
`${INVALID_QE_VERSION} The minimum server version required is ${MIN_SUPPORTED_QE_SERVER_VERSION}`
143147
);

‎test/spec/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",

‎test/spec/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Requires libmongocrypt 1.8.0.
22
runOn:
33
- minServerVersion: "7.0.0"
4-
serverless: "forbid"
54
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
65
# FLE 2 Encrypted collections are not supported on standalone.
76
topology: [ "replicaset", "sharded", "load-balanced" ]

‎test/spec/client-side-encryption/tests/legacy/fle2v2-Compact.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",

‎test/spec/client-side-encryption/tests/legacy/fle2v2-Compact.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Requires libmongocrypt 1.8.0.
22
runOn:
33
- minServerVersion: "7.0.0"
4-
serverless: "forbid"
54
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
65
# FLE 2 Encrypted collections are not supported on standalone.
76
topology: [ "replicaset", "sharded", "load-balanced" ]

‎test/spec/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,38 @@
5555
"result": {
5656
"errorContains": "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
5757
}
58+
},
59+
{
60+
"name": "assertCollectionNotExists",
61+
"object": "testRunner",
62+
"arguments": {
63+
"database": "default",
64+
"collection": "enxcol_.encryptedCollection.esc"
65+
}
66+
},
67+
{
68+
"name": "assertCollectionNotExists",
69+
"object": "testRunner",
70+
"arguments": {
71+
"database": "default",
72+
"collection": "enxcol_.encryptedCollection.ecc"
73+
}
74+
},
75+
{
76+
"name": "assertCollectionNotExists",
77+
"object": "testRunner",
78+
"arguments": {
79+
"database": "default",
80+
"collection": "enxcol_.encryptedCollection.ecoc"
81+
}
82+
},
83+
{
84+
"name": "assertCollectionNotExists",
85+
"object": "testRunner",
86+
"arguments": {
87+
"database": "default",
88+
"collection": "encryptedCollection"
89+
}
5890
}
5991
]
6092
}

‎test/spec/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,25 @@ tests:
3737
collection: "encryptedCollection"
3838
result:
3939
errorContains: "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
40+
# Assert no collections were created.
41+
- name: assertCollectionNotExists
42+
object: testRunner
43+
arguments:
44+
database: *database_name
45+
collection: &esc_collection_name "enxcol_.encryptedCollection.esc"
46+
# ecc collection is no longer created for QEv2
47+
- name: assertCollectionNotExists
48+
object: testRunner
49+
arguments:
50+
database: *database_name
51+
collection: &ecc_collection_name "enxcol_.encryptedCollection.ecc"
52+
- name: assertCollectionNotExists
53+
object: testRunner
54+
arguments:
55+
database: *database_name
56+
collection: &ecoc_collection_name "enxcol_.encryptedCollection.ecoc"
57+
- name: assertCollectionNotExists
58+
object: testRunner
59+
arguments:
60+
database: *database_name
61+
collection: encryptedCollection

‎test/spec/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",
@@ -158,9 +157,6 @@
158157
"command": {
159158
"create": "encryptedCollection",
160159
"encryptedFields": {
161-
"escCollection": null,
162-
"ecocCollection": null,
163-
"eccCollection": null,
164160
"fields": [
165161
{
166162
"path": "firstName",
@@ -343,9 +339,6 @@
343339
"command": {
344340
"create": "encryptedCollection",
345341
"encryptedFields": {
346-
"escCollection": null,
347-
"ecocCollection": null,
348-
"eccCollection": null,
349342
"fields": [
350343
{
351344
"path": "firstName",
@@ -851,9 +844,6 @@
851844
"command": {
852845
"create": "encryptedCollection",
853846
"encryptedFields": {
854-
"escCollection": null,
855-
"ecocCollection": null,
856-
"eccCollection": null,
857847
"fields": [
858848
{
859849
"path": "firstName",
@@ -1048,9 +1038,6 @@
10481038
"command": {
10491039
"create": "encryptedCollection",
10501040
"encryptedFields": {
1051-
"escCollection": null,
1052-
"ecocCollection": null,
1053-
"eccCollection": null,
10541041
"fields": [
10551042
{
10561043
"path": "firstName",
@@ -1367,9 +1354,6 @@
13671354
"command": {
13681355
"create": "encryptedCollection",
13691356
"encryptedFields": {
1370-
"escCollection": null,
1371-
"ecocCollection": null,
1372-
"eccCollection": null,
13731357
"fields": [
13741358
{
13751359
"path": "firstName",
@@ -1635,9 +1619,6 @@
16351619
"command": {
16361620
"create": "encryptedCollection",
16371621
"encryptedFields": {
1638-
"escCollection": null,
1639-
"ecocCollection": null,
1640-
"eccCollection": null,
16411622
"fields": [
16421623
{
16431624
"path": "firstName",

‎test/spec/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Requires libmongocrypt 1.8.0.
22
runOn:
33
- minServerVersion: "7.0.0"
4-
serverless: "forbid"
54
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
65
# FLE 2 Encrypted collections are not supported on standalone.
76
topology: [ "replicaset", "sharded", "load-balanced" ]
@@ -101,10 +100,6 @@ tests:
101100
command:
102101
create: *encrypted_collection_name
103102
encryptedFields: &encrypted_fields_expectation {
104-
# Expect state collections are not included in the encryptedFields sent to the server.
105-
"escCollection": null,
106-
"ecocCollection": null,
107-
"eccCollection": null,
108103
"fields": [
109104
{
110105
"path": "firstName",
@@ -939,4 +934,4 @@ tests:
939934
collection: *encrypted_collection_name
940935
result:
941936
# Expect error due to server constraints added in SERVER-74069
942-
errorContains: "Encrypted State Collection name should follow"
937+
errorContains: "Encrypted State Collection name should follow"

‎test/spec/client-side-encryption/tests/legacy/fle2v2-DecryptExistingData.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",

0 commit comments

Comments
 (0)