From dbff24f4b6e2520721ea42b8db5e0270b5950967 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Fri, 10 Jun 2022 12:03:23 -0400
Subject: [PATCH 1/2] fix: add commandName to runCommand usage in tests

---
 .../tests/unified/change-streams-showExpandedEvents.json        | 2 ++
 .../tests/unified/change-streams-showExpandedEvents.yml         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/source/change-streams/tests/unified/change-streams-showExpandedEvents.json b/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
index 9dd6f4d04d..731a562463 100644
--- a/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
+++ b/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
@@ -433,6 +433,7 @@
         {
           "name": "runCommand",
           "object": "database0",
+          "commandName": "collMod",
           "arguments": {
             "command": {
               "collMod": "collection0"
@@ -485,6 +486,7 @@
         {
           "name": "runCommand",
           "object": "adminDb",
+          "commandName": "shardCollection",
           "arguments": {
             "command": {
               "shardCollection": "shardedDb.shardedCollection",
diff --git a/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml b/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
index 18f5fe6394..cca9865157 100644
--- a/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
+++ b/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
@@ -256,6 +256,7 @@ tests:
         saveResultAsEntity: &changeStream0 changeStream0
       - name: runCommand
         object: *database0
+        commandName: collMod
         arguments:
           command:
             collMod: *collection0
@@ -284,6 +285,7 @@ tests:
         saveResultAsEntity: &changeStream0 changeStream0
       - name: runCommand
         object: *adminDb
+        commandName: shardCollection
         arguments:
           command:
             shardCollection: shardedDb.shardedCollection

From a755a76f20bc4755ec9e17ca61cdd759349a1bd4 Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Mon, 13 Jun 2022 13:23:41 -0400
Subject: [PATCH 2/2] fix: move commandName property into arguments of
 runCommand

---
 .../tests/unified/change-streams-showExpandedEvents.json  | 8 ++++----
 .../tests/unified/change-streams-showExpandedEvents.yml   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/change-streams/tests/unified/change-streams-showExpandedEvents.json b/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
index 731a562463..fe852b5443 100644
--- a/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
+++ b/source/change-streams/tests/unified/change-streams-showExpandedEvents.json
@@ -433,11 +433,11 @@
         {
           "name": "runCommand",
           "object": "database0",
-          "commandName": "collMod",
           "arguments": {
             "command": {
               "collMod": "collection0"
-            }
+            },
+            "commandName": "collMod"
           }
         },
         {
@@ -486,14 +486,14 @@
         {
           "name": "runCommand",
           "object": "adminDb",
-          "commandName": "shardCollection",
           "arguments": {
             "command": {
               "shardCollection": "shardedDb.shardedCollection",
               "key": {
                 "_id": 1
               }
-            }
+            },
+            "commandName": "shardCollection"
           }
         },
         {
diff --git a/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml b/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
index cca9865157..002e17ed33 100644
--- a/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
+++ b/source/change-streams/tests/unified/change-streams-showExpandedEvents.yml
@@ -256,10 +256,10 @@ tests:
         saveResultAsEntity: &changeStream0 changeStream0
       - name: runCommand
         object: *database0
-        commandName: collMod
         arguments:
           command:
             collMod: *collection0
+          commandName: collMod
       - name: iterateUntilDocumentOrError
         object: *changeStream0
         expectResult:
@@ -285,12 +285,12 @@ tests:
         saveResultAsEntity: &changeStream0 changeStream0
       - name: runCommand
         object: *adminDb
-        commandName: shardCollection
         arguments:
           command:
             shardCollection: shardedDb.shardedCollection
             key:
               _id: 1
+          commandName: shardCollection
       - name: iterateUntilDocumentOrError
         object: *changeStream0
         expectResult: