CSHARP-4654: Enable QEv2 tests on Serverless (#1109)

mongodb · Jun 20, 2023 · ee01960 · ee01960
1 parent c2f2500
commit ee01960
Show file tree

Hide file tree

Showing 116 changed files with 412 additions and 550 deletions.
diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json b/specifications/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-BypassQueryAnalysis.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Compact.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Compact.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Compact.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Compact.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json b/specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",
@@ -158,9 +157,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",
@@ -343,9 +339,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",
@@ -851,9 +844,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",
@@ -1048,9 +1038,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",
@@ -1367,9 +1354,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",
@@ -1635,9 +1619,6 @@
             "command": {
               "create": "encryptedCollection",
               "encryptedFields": {
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                   {
                     "path": "firstName",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]
@@ -101,10 +100,6 @@ tests:
             command:
               create: *encrypted_collection_name
               encryptedFields: &encrypted_fields_expectation {
-                # Expect state collections are not included in the encryptedFields sent to the server.
-                "escCollection": null,
-                "ecocCollection": null,
-                "eccCollection": null,
                 "fields": [
                     {
                         "path": "firstName",
@@ -939,4 +934,4 @@ tests:
           collection: *encrypted_collection_name
         result:
           # Expect error due to server constraints added in SERVER-74069
-          errorContains: "Encrypted State Collection name should follow"
+          errorContains: "Encrypted State Collection name should follow"
diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-DecryptExistingData.json b/specifications/client-side-encryption/tests/legacy/fle2v2-DecryptExistingData.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-DecryptExistingData.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-DecryptExistingData.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Delete.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Delete.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Delete.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Delete.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/...ons/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json b/...ons/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/...ions/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml b/...ions/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json b/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFields-vs-jsonSchema.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json b/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-EncryptedFieldsMap-defaults.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json b/specifications/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-FindOneAndUpdate.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json b/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Indexed.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json b/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-InsertFind-Unindexed.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-MissingKey.json b/specifications/client-side-encryption/tests/legacy/fle2v2-MissingKey.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-NoEncryption.json b/specifications/client-side-encryption/tests/legacy/fle2v2-NoEncryption.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-NoEncryption.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-NoEncryption.yml
@@ -1,7 +1,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml
@@ -2,7 +2,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml
@@ -4,7 +4,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml
@@ -2,7 +2,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml
@@ -2,7 +2,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml
@@ -2,7 +2,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json
@@ -2,7 +2,6 @@
   "runOn": [
     {
       "minServerVersion": "7.0.0",
-      "serverless": "forbid",
       "topology": [
         "replicaset",
         "sharded",

diff --git a/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml b/specifications/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml
@@ -2,7 +2,6 @@
 # Requires libmongocrypt 1.8.0.
 runOn:
   - minServerVersion: "7.0.0"
-    serverless: "forbid"
     # 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" ]