RUST-768 Pass versioned API parameters to getMore and transaction-continuing commands.

src/cmap/conn/command.rs

@@ -46,10 +46,6 @@ impl Command {
     }
 
     pub(crate) fn set_server_api(&mut self, server_api: &ServerApi) {
-        if matches!(self.name.as_str(), "getMore") {
-            return;
-        }
-
         self.body
             .insert("apiVersion", format!("{}", server_api.version));
 

src/test/mod.rs

@@ -11,7 +11,7 @@ mod spec;
 mod util;
 
 pub(crate) use self::{
-    spec::{run_single_test, run_spec_test, RunOn, Serverless, Topology},
+    spec::{run_single_test, run_spec_test, run_spec_test_with_path, RunOn, Serverless, Topology},
     util::{
         assert_matches,
         CmapEvent,

src/test/spec/json/versioned-api/README.rst

@@ -33,5 +33,5 @@ To run this test, proceed as follows:
 - If the environment variable is set, all clients created in tests MUST declare
   the ``ServerApiVersion`` specified.
 
-No other topologies must be tested until ``mongo-orchestration`` can handle
-servers with ``requireApiVersion`` enabled.
+Only standalone servers must be tested. The tests should run for each server
+version >= 5.0, including ``latest``.

src/test/spec/json/versioned-api/crud-api-version-1-strict.json

@@ -1,6 +1,6 @@
 {
   "description": "CRUD Api Version 1 (strict)",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9"
@@ -141,6 +141,11 @@
     },
     {
       "description": "aggregate on database appends declared API version",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "aggregate",
@@ -651,7 +656,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -712,14 +717,10 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
-                  "apiStrict": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
+                  "apiStrict": true,
                   "apiDeprecationErrors": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   }
                 }
               }

src/test/spec/json/versioned-api/crud-api-version-1-strict.yml

@@ -1,6 +1,6 @@
 description: "CRUD Api Version 1 (strict)"
 
-schemaVersion: "1.1"
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.9"
@@ -62,6 +62,10 @@ tests:
                 <<: *expectedApiVersion
 
   - description: "aggregate on database appends declared API version"
+    runOnRequirements:
+        # serverless does not support either of the current database-level aggregation stages ($listLocalSessions and
+        # $currentOp)
+      - serverless: "forbid"
     operations:
       - name: aggregate
         object: *adminDatabase
@@ -240,7 +244,7 @@ tests:
                   - $group: { _id: 1, n: { $sum: $count }}
                 <<: *expectedApiVersion
 
-  - description: "find command with declared API version appends to the command, but getMore does not"
+  - description: "find and getMore append API version"
     operations:
       - name: find
         object: *collection
@@ -264,9 +268,7 @@ tests:
           - commandStartedEvent:
               command:
                 getMore: { $$type: [ int, long ] }
-                apiVersion: { $$exists: false }
-                apiStrict: { $$exists: false }
-                apiDeprecationErrors: { $$exists: false }
+                <<: *expectedApiVersion
 
   - description: "findOneAndDelete appends declared API version"
     operations:

src/test/spec/json/versioned-api/crud-api-version-1.json

@@ -1,6 +1,6 @@
 {
   "description": "CRUD Api Version 1",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9"
@@ -141,6 +141,11 @@
     },
     {
       "description": "aggregate on database appends declared API version",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "aggregate",
@@ -643,7 +648,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -704,15 +709,11 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
                   "apiStrict": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   },
-                  "apiDeprecationErrors": {
-                    "$$exists": false
-                  }
+                  "apiDeprecationErrors": true
                 }
               }
             }

src/test/spec/json/versioned-api/crud-api-version-1.yml

@@ -1,6 +1,6 @@
 description: "CRUD Api Version 1"
 
-schemaVersion: "1.1"
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.9"
@@ -64,6 +64,10 @@ tests:
                 <<: *expectedApiVersion
 
   - description: "aggregate on database appends declared API version"
+    runOnRequirements:
+        # serverless does not support either of the current database-level aggregation stages ($listLocalSessions and
+        # $currentOp)
+      - serverless: forbid
     operations:
       - name: aggregate
         object: *adminDatabase
@@ -234,7 +238,7 @@ tests:
                   - $group: { _id: 1, n: { $sum: $count }}
                 <<: *expectedApiVersion
 
-  - description: "find command with declared API version appends to the command, but getMore does not"
+  - description: "find and getMore append API version"
     operations:
       - name: find
         object: *collection
@@ -258,9 +262,7 @@ tests:
           - commandStartedEvent:
               command:
                 getMore: { $$type: [ int, long ] }
-                apiVersion: { $$exists: false }
-                apiStrict: { $$exists: false }
-                apiDeprecationErrors: { $$exists: false }
+                <<: *expectedApiVersion
 
   - description: "findOneAndDelete appends declared API version"
     operations:

src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.json

@@ -1,6 +1,6 @@
 {
   "description": "RunCommand helper: No API version declared",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9",
@@ -29,6 +29,11 @@
   "tests": [
     {
       "description": "runCommand does not inspect or change the command document",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -72,6 +77,11 @@
     },
     {
       "description": "runCommand does not prevent sending invalid API version declarations",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",

src/test/spec/json/versioned-api/runcommand-helper-no-api-version-declared.yml

@@ -1,6 +1,6 @@
 description: "RunCommand helper: No API version declared"
 
-schemaVersion: "1.1"
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.9"
@@ -19,6 +19,10 @@ createEntities:
 
 tests:
   - description: "runCommand does not inspect or change the command document"
+    runOnRequirements:
+      # serverless does not currently reject invalid API versions on
+      # certain commands (CLOUDP-87926)
+      - serverless: "forbid"
     operations:
       - name: runCommand
         object: *database
@@ -43,6 +47,10 @@ tests:
               databaseName: *databaseName
 
   - description: "runCommand does not prevent sending invalid API version declarations"
+    runOnRequirements:
+      # serverless does not currently reject invalid API versions on
+      # certain commands (CLOUDP-87926)
+      - serverless: "forbid"
     operations:
       - name: runCommand
         object: *database

src/test/spec/json/versioned-api/test-commands-strict-mode.json

@@ -1,12 +1,13 @@
 {
   "description": "Test commands: strict mode",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9",
       "serverParameters": {
         "enableTestCommands": true
-      }
+      },
+      "serverless": "forbid"
     }
   ],
   "createEntities": [

src/test/spec/json/versioned-api/test-commands-strict-mode.yml

@@ -1,11 +1,13 @@
 description: "Test commands: strict mode"
 
-schemaVersion: "1.1"
+schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "4.9"
     serverParameters:
       enableTestCommands: true
+    # serverless gives a different error for unrecognized testVersion2 command
+    serverless: "forbid"
 
 createEntities:
   - client: