CSHARP-4416: Remove getNonce command usage for 6.2+. (#997)

DmitryLukyanov · web-flow · commit a1c67e7ee6ba · 2022-12-21T20:59:47.000+04:00
diff --git a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.json
@@ -398,6 +398,11 @@
     },
     {
       "description": "getnonce command and server reply are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -443,6 +448,11 @@
     },
     {
       "description": "network error in response to getnonce is not redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",
@@ -753,6 +763,11 @@
     },
     {
       "description": "copydbgetnonce command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "3.6.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -804,7 +819,7 @@
       "description": "network error in response to copydbgetnonce is not redacted",
       "runOnRequirements": [
         {
-          "maxServerVersion": "4.0.99"
+          "maxServerVersion": "3.6.99"
         }
       ],
       "operations": [
@@ -875,6 +890,11 @@
     },
     {
       "description": "copydbsaslstart command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "4.0.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -997,6 +1017,11 @@
     },
     {
       "description": "copydb command and resulting server-generated error are redacted",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "4.0.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml b/specifications/command-logging-and-monitoring/tests/logging/redacted-commands.yml
@@ -241,6 +241,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "getnonce command and server reply are redacted"
+    runOnRequirements:
+      - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *database
@@ -268,6 +270,8 @@ tests:
                 $$matchAsDocument: {}
 
   - description: "network error in response to getnonce is not redacted"
+    runOnRequirements:
+      - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: failPoint
         object: testRunner
@@ -453,6 +457,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydbgetnonce command and resulting server-generated error are redacted"
+    runOnRequirements:
+      - maxServerVersion: 3.6.99 # copydbgetnonce was removed as of 4.0 via SERVER-32276
     operations:
       - name: runCommand
         object: *database
@@ -483,7 +489,7 @@ tests:
 
   - description: "network error in response to copydbgetnonce is not redacted"
     runOnRequirements:
-      - maxServerVersion: "4.0.99" # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+      - maxServerVersion: 3.6.99 # copydbgetnonce was removed as of 4.0 via SERVER-32276
     operations:
       - name: failPoint
         object: testRunner
@@ -523,6 +529,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydbsaslstart command and resulting server-generated error are redacted"
+    runOnRequirements:
+    - maxServerVersion: 4.0.99 # copydbsaslstart was removed as of 4.2 via SERVER-36211
     operations:
       - name: runCommand
         object: *database
@@ -553,7 +561,7 @@ tests:
 
   - description: "network error in response to copydbsaslstart is not redacted"
     runOnRequirements:
-    - maxServerVersion: "4.0.99"  # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+    - maxServerVersion: 4.0.99 # copydbsaslstart was removed as of 4.2 via SERVER-36211
     operations:
       - name: failPoint
         object: testRunner
@@ -593,6 +601,8 @@ tests:
               failure: { $$exists: true }
 
   - description: "copydb command and resulting server-generated error are redacted"
+    runOnRequirements:
+    - maxServerVersion: 4.0.99 # copydb was removed as of 4.2 via SERVER-36257
     operations:
       - name: runCommand
         object: *database
@@ -623,7 +633,7 @@ tests:
 
   - description: "network error in response to copydb is not redacted"
     runOnRequirements:
-    - maxServerVersion: "4.0.99"  # this commmand was removed in MongoDB 4.2 and the server returns CommandNotFound before hitting the failpoint
+    - maxServerVersion: 4.0.99 # copydb was removed as of 4.2 via SERVER-36257
     operations:
       - name: failPoint
         object: testRunner
diff --git a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.json
@@ -162,6 +162,11 @@
     },
     {
       "description": "getnonce",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml b/specifications/command-logging-and-monitoring/tests/unified/redacted-commands.yml
@@ -93,6 +93,8 @@ tests:
                 payload: { $$exists: false }
 
   - description: "getnonce"
+    runOnRequirements:
+      - maxServerVersion: "6.1.99"  
     operations:
       - name: runCommand
         object: *database
diff --git a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.json
@@ -61,6 +61,11 @@
   "tests": [
     {
       "description": "getnonce is observed with observeSensitiveCommands=true",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -106,6 +111,11 @@
     },
     {
       "description": "getnonce is not observed with observeSensitiveCommands=false",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -127,6 +137,11 @@
     },
     {
       "description": "getnonce is not observed by default",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.1.99"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml b/specifications/unified-test-format/tests/valid-pass/observeSensitiveCommands.yml
@@ -38,6 +38,8 @@ createEntities:
 
 tests:
   - description: "getnonce is observed with observeSensitiveCommands=true"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseObserveSensitiveCommands
@@ -57,6 +59,8 @@ tests:
                 nonce: { $$exists: false }
 
   - description: "getnonce is not observed with observeSensitiveCommands=false"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseDoNotObserveSensitiveCommands
@@ -68,6 +72,8 @@ tests:
         events: []
 
   - description: "getnonce is not observed by default"
+    runOnRequirements:
+    - maxServerVersion: 6.1.99 # getnonce removed as of 6.2 via SERVER-71007
     operations:
       - name: runCommand
         object: *databaseDoNotObserveSensitiveCommandsByDefault

Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,11 @@`
`398`	`398`	`},`
`399`	`399`	`{`
`400`	`400`	`"description": "getnonce command and server reply are redacted",`
	`401`	`+ "runOnRequirements": [`
	`402`	`+ {`
	`403`	`+ "maxServerVersion": "6.1.99"`
	`404`	`+ }`
	`405`	`+ ],`
`401`	`406`	`"operations": [`
`402`	`407`	`{`
`403`	`408`	`"name": "runCommand",`
`@@ -443,6 +448,11 @@`
`443`	`448`	`},`
`444`	`449`	`{`
`445`	`450`	`"description": "network error in response to getnonce is not redacted",`
	`451`	`+ "runOnRequirements": [`
	`452`	`+ {`
	`453`	`+ "maxServerVersion": "6.1.99"`
	`454`	`+ }`
	`455`	`+ ],`
`446`	`456`	`"operations": [`
`447`	`457`	`{`
`448`	`458`	`"name": "failPoint",`
`@@ -753,6 +763,11 @@`
`753`	`763`	`},`
`754`	`764`	`{`
`755`	`765`	`"description": "copydbgetnonce command and resulting server-generated error are redacted",`
	`766`	`+ "runOnRequirements": [`
	`767`	`+ {`
	`768`	`+ "maxServerVersion": "3.6.99"`
	`769`	`+ }`
	`770`	`+ ],`
`756`	`771`	`"operations": [`
`757`	`772`	`{`
`758`	`773`	`"name": "runCommand",`
`@@ -804,7 +819,7 @@`
`804`	`819`	`"description": "network error in response to copydbgetnonce is not redacted",`
`805`	`820`	`"runOnRequirements": [`
`806`	`821`	`{`
`807`		`- "maxServerVersion": "4.0.99"`
	`822`	`+ "maxServerVersion": "3.6.99"`
`808`	`823`	`}`
`809`	`824`	`],`
`810`	`825`	`"operations": [`
`@@ -875,6 +890,11 @@`
`875`	`890`	`},`
`876`	`891`	`{`
`877`	`892`	`"description": "copydbsaslstart command and resulting server-generated error are redacted",`
	`893`	`+ "runOnRequirements": [`
	`894`	`+ {`
	`895`	`+ "maxServerVersion": "4.0.99"`
	`896`	`+ }`
	`897`	`+ ],`
`878`	`898`	`"operations": [`
`879`	`899`	`{`
`880`	`900`	`"name": "runCommand",`
`@@ -997,6 +1017,11 @@`
`997`	`1017`	`},`
`998`	`1018`	`{`
`999`	`1019`	`"description": "copydb command and resulting server-generated error are redacted",`
	`1020`	`+ "runOnRequirements": [`
	`1021`	`+ {`
	`1022`	`+ "maxServerVersion": "4.0.99"`
	`1023`	`+ }`
	`1024`	`+ ],`
`1000`	`1025`	`"operations": [`
`1001`	`1026`	`{`
`1002`	`1027`	`"name": "runCommand",`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,11 @@`
`162`	`162`	`},`
`163`	`163`	`{`
`164`	`164`	`"description": "getnonce",`
	`165`	`+ "runOnRequirements": [`
	`166`	`+ {`
	`167`	`+ "maxServerVersion": "6.1.99"`
	`168`	`+ }`
	`169`	`+ ],`
`165`	`170`	`"operations": [`
`166`	`171`	`{`
`167`	`172`	`"name": "runCommand",`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,11 @@`
`61`	`61`	`"tests": [`
`62`	`62`	`{`
`63`	`63`	`"description": "getnonce is observed with observeSensitiveCommands=true",`
	`64`	`+ "runOnRequirements": [`
	`65`	`+ {`
	`66`	`+ "maxServerVersion": "6.1.99"`
	`67`	`+ }`
	`68`	`+ ],`
`64`	`69`	`"operations": [`
`65`	`70`	`{`
`66`	`71`	`"name": "runCommand",`
`@@ -106,6 +111,11 @@`
`106`	`111`	`},`
`107`	`112`	`{`
`108`	`113`	`"description": "getnonce is not observed with observeSensitiveCommands=false",`
	`114`	`+ "runOnRequirements": [`
	`115`	`+ {`
	`116`	`+ "maxServerVersion": "6.1.99"`
	`117`	`+ }`
	`118`	`+ ],`
`109`	`119`	`"operations": [`
`110`	`120`	`{`
`111`	`121`	`"name": "runCommand",`
`@@ -127,6 +137,11 @@`
`127`	`137`	`},`
`128`	`138`	`{`
`129`	`139`	`"description": "getnonce is not observed by default",`
	`140`	`+ "runOnRequirements": [`
	`141`	`+ {`
	`142`	`+ "maxServerVersion": "6.1.99"`
	`143`	`+ }`
	`144`	`+ ],`
`130`	`145`	`"operations": [`
`131`	`146`	`{`
`132`	`147`	`"name": "runCommand",`