POC for DRIVERS-2609 (#2714)

Author: comandeo-mongo

spec/spec_tests/data/change_streams_unified/change-streams-clusterTime.yml

@@ -15,7 +15,7 @@ createEntities:
 
 runOnRequirements:
   - minServerVersion: "4.0.0"
-    topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
+    topologies: [ replicaset, load-balanced, sharded ]
     serverless: forbid
 
 initialData:

spec/spec_tests/data/change_streams_unified/change-streams-disambiguatedPaths.yml

@@ -15,7 +15,7 @@ createEntities:
 
 runOnRequirements:
   - minServerVersion: "6.1.0"
-    topologies: [ replicaset, sharded-replicaset, load-balanced, sharded ]
+    topologies: [ replicaset, load-balanced, sharded ]
     serverless: forbid
 
 initialData:

spec/spec_tests/data/change_streams_unified/change-streams-errors.yml

@@ -74,7 +74,7 @@ tests:
   - description: Change Stream should error when _id is projected out
     runOnRequirements:
       - minServerVersion: "4.1.11"
-        topologies: [ replicaset, sharded-replicaset, load-balanced ]
+        topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: createChangeStream
         object: *collection0
@@ -93,7 +93,7 @@ tests:
   - description: change stream errors on ElectionInProgress
     runOnRequirements:
       - minServerVersion: "4.2"
-        topologies: [ replicaset, sharded-replicaset, load-balanced ]
+        topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: failPoint
         object: testRunner

spec/spec_tests/data/change_streams_unified/change-streams-pre_and_post_images.yml

@@ -4,7 +4,7 @@ schemaVersion: "1.4"
 
 runOnRequirements:
   - minServerVersion: "6.0.0"
-    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    topologies: [ replicaset, sharded, load-balanced ]
     serverless: forbid
 
 createEntities:

spec/spec_tests/data/change_streams_unified/change-streams-resume-allowlist.yml

@@ -5,7 +5,7 @@ schemaVersion: "1.7"
 
 runOnRequirements:
   - minServerVersion: "3.6"
-    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    topologies: [ replicaset, sharded, load-balanced ]
     serverless: forbid
 
 createEntities:

spec/spec_tests/data/change_streams_unified/change-streams-resume-errorLabels.yml

@@ -5,7 +5,7 @@ schemaVersion: "1.7"
 
 runOnRequirements:
   - minServerVersion: "4.3.1"
-    topologies: [ replicaset, sharded-replicaset, load-balanced ]
+    topologies: [ replicaset, sharded, load-balanced ]
     serverless: forbid
 
 createEntities:

spec/spec_tests/data/change_streams_unified/change-streams-showExpandedEvents.yml

@@ -2,7 +2,7 @@ description: "change-streams-showExpandedEvents"
 schemaVersion: "1.7"
 runOnRequirements:
   - minServerVersion: "6.0.0"
-    topologies: [ replicaset, sharded-replicaset, sharded ]
+    topologies: [ replicaset, sharded ]
     serverless: forbid
 createEntities:
   - client:
@@ -276,7 +276,8 @@ tests:
 
   - description: "when showExpandedEvents is true, shardCollection events are reported"
     runOnRequirements:
-      - topologies: [ sharded-replicaset, sharded ]
+      # Note: minServerVersion is specified in top-level runOnRequirements
+      - topologies: [ sharded ]
     operations:
       - name: dropCollection
         object: *shardedDb

spec/spec_tests/data/retryable_writes/unified/bulkWrite-serverErrors.yml

@@ -33,7 +33,7 @@ tests:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.7"
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner

spec/spec_tests/data/retryable_writes/unified/insertOne-serverErrors.yml

@@ -33,7 +33,7 @@ tests:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.7"
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner

spec/spec_tests/data/sessions_unified/snapshot-sessions-unsupported-ops.yml

@@ -4,7 +4,7 @@ schemaVersion: "1.0"
 
 runOnRequirements:
   - minServerVersion: "5.0"
-    topologies: [replicaset, sharded-replicaset]
+    topologies: [replicaset, sharded]
 
 createEntities:
   - client:

spec/spec_tests/data/sessions_unified/snapshot-sessions.yml

@@ -4,7 +4,7 @@ schemaVersion: "1.0"
 
 runOnRequirements:
   - minServerVersion: "5.0"
-    topologies: [replicaset, sharded-replicaset]
+    topologies: [replicaset, sharded]
 
 createEntities:
   - client:

spec/spec_tests/data/transactions_unified/mongos-unpin.yml

@@ -4,7 +4,7 @@ schemaVersion: '1.4'
 
 runOnRequirements:
   - minServerVersion: '4.2'
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:

spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml

@@ -231,7 +231,7 @@ tests:
   - description: "estimatedDocumentCount appends declared API version"
     # See: https://jira.mongodb.org/browse/SERVER-63850
     runOnRequirements:
-      - minServerVersion: "5.0.8"
+      - minServerVersion: "5.0.9"
         maxServerVersion: "5.0.99"
       - minServerVersion: "5.3.2"
     operations:

spec/spec_tests/data/versioned_api/crud-api-version-1.yml

@@ -225,7 +225,7 @@ tests:
   - description: "estimatedDocumentCount appends declared API version"
     # See: https://jira.mongodb.org/browse/SERVER-63850
     runOnRequirements:
-      - minServerVersion: "5.0.8"
+      - minServerVersion: "5.0.9"
         maxServerVersion: "5.0.99"
       - minServerVersion: "5.3.2"
     operations:

spec/spec_tests/data/versioned_api/transaction-handling.yml

@@ -1,10 +1,10 @@
 description: "Transaction handling"
 
-schemaVersion: "1.1"
+schemaVersion: "1.3"
 
 runOnRequirements:
   - minServerVersion: "4.9"
-    topologies: [ replicaset, sharded-replicaset ]
+    topologies: [ replicaset, sharded, load-balanced ]
 
 createEntities:
   - client:
@@ -46,7 +46,7 @@ initialData:
 tests:
   - description: "All commands in a transaction declare an API version"
     runOnRequirements:
-      - topologies: [ replicaset, sharded-replicaset ]
+      - topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: startTransaction
         object: *session
@@ -87,7 +87,7 @@ tests:
                 <<: *expectedApiVersion
   - description: "abortTransaction includes an API version"
     runOnRequirements:
-      - topologies: [ replicaset, sharded-replicaset ]
+      - topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: startTransaction
         object: *session