DRIVERS-2524 fix commandStarted events with encryptionInformation (#1405

) * add escCollection and ecocCollection to commandStarted events escCollection and ecocCollection are appended by libmongocrypt * fix indent of encryptionInformation * add missing `ordered: true` * regenerate tests
mongodb · Apr 21, 2023 · eb3d882 · eb3d882
1 parent 73fddca
commit eb3d882
Show file tree

Hide file tree

Showing 126 changed files with 1,848 additions and 593 deletions.
diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-BypassQueryAnalysis.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-BypassQueryAnalysis.yml.template
@@ -48,6 +48,14 @@ tests:
             documents:
               - *doc0_encrypted
             ordered: true
+            encryptionInformation:
+                type: 1
+                schema:
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-Delete.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-Delete.yml.template
@@ -63,7 +63,11 @@ tests:
             encryptionInformation:
                 type: 1
                 schema:
-                  "default.default": *encrypted_fields
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -82,10 +86,15 @@ tests:
                   },
                   "limit": 1
                 }
+            ordered: true
             encryptionInformation:
               type: 1
               schema:
-                "default.default": *encrypted_fields
+                "default.default":
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: delete
     outcome:
       collection:

diff --git a/...ient-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-jsonSchema.yml.template b/...ient-side-encryption/etc/test-templates/fle2v2-EncryptedFields-vs-jsonSchema.yml.template
@@ -66,7 +66,12 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                "default.default": *encrypted_fields
+                "default.default":
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
+
           command_name: insert
       - command_started_event:
           command:
@@ -84,7 +89,12 @@ tests:
             encryptionInformation:
                 type: 1
                 schema:
-                  "default.default": *encrypted_fields
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
+
           command_name: find
     outcome:
       collection:

diff --git a/...client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template b/...client-side-encryption/etc/test-templates/fle2v2-EncryptedFieldsMap-defaults.yml.template
@@ -45,6 +45,8 @@ tests:
                 },
                 "schema": {
                     "default.default": {
+                        "escCollection": "enxcol_.default.esc",
+                        "ecocCollection": "enxcol_.default.ecoc",
                         "fields": []
                     }
                 }

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-FindOneAndUpdate.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-FindOneAndUpdate.yml.template
@@ -64,7 +64,12 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                "default.default": *encrypted_fields
+                "default.default":
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
+
           command_name: insert
       - command_started_event:
           command:
@@ -83,7 +88,12 @@ tests:
             encryptionInformation:
                 type: 1
                 schema:
-                  "default.default": *encrypted_fields
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
+
           command_name: findAndModify
     outcome:
       collection:
@@ -148,7 +158,12 @@ tests:
             encryptionInformation:
                 type: 1
                 schema:
-                  "default.default": *encrypted_fields
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
+
           command_name: insert
 
       - command_started_event:
@@ -168,7 +183,12 @@ tests:
             encryptionInformation:
                 type: 1
                 schema:
-                  "default.default": *encrypted_fields
+                  "default.default":
+                    # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                    escCollection: "enxcol_.default.esc"
+                    ecocCollection: "enxcol_.default.ecoc"
+                    <<: *encrypted_fields
+
           command_name: findAndModify
       - command_started_event:
           command:

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-InsertFind-Indexed.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-InsertFind-Indexed.yml.template
@@ -62,7 +62,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -80,7 +84,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: find
     outcome:
       collection:

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-Aggregate.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-Aggregate.yml.template
@@ -66,7 +66,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -77,7 +81,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -100,7 +108,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: aggregate
     outcome:
       collection:

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-Delete.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-Delete.yml.template
@@ -67,7 +67,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -78,7 +82,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -98,10 +106,15 @@ tests:
                       "limit": 1
                   }
               ]
+            ordered: true
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: delete
     outcome:
       collection:

diff --git a/...client-side-encryption/etc/test-templates/fle2v2-Range-Date-FindOneAndUpdate.yml.template b/...client-side-encryption/etc/test-templates/fle2v2-Range-Date-FindOneAndUpdate.yml.template
@@ -68,7 +68,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -79,7 +83,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -98,7 +106,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: findAndModify
     outcome:
       collection:

diff --git a/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-InsertFind.yml.template b/source/client-side-encryption/etc/test-templates/fle2v2-Range-Date-InsertFind.yml.template
@@ -66,7 +66,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -77,7 +81,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: insert
       - command_started_event:
           command:
@@ -94,7 +102,11 @@ tests:
             encryptionInformation:
               type: 1
               schema:
-                default.default: *encrypted_fields
+                default.default:
+                  # libmongocrypt applies escCollection and ecocCollection to outgoing command.
+                  escCollection: "enxcol_.default.esc"
+                  ecocCollection: "enxcol_.default.ecoc"
+                  <<: *encrypted_fields
           command_name: find
     outcome:
       collection: