CXX-2690 deprecate sharded-replicaset topology type (#975)

joshbsiegel · web-flow · commit f7403c08ea7b · 2023-06-13T09:54:42.000-04:00
diff --git a/data/change-streams/unified/change-streams-errors.json b/data/change-streams/unified/change-streams-errors.json
@@ -145,7 +145,7 @@
           "minServerVersion": "4.1.11",
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
@@ -190,7 +190,7 @@
           "minServerVersion": "4.2",
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
diff --git a/data/change-streams/unified/change-streams-pre_and_post_images.json b/data/change-streams/unified/change-streams-pre_and_post_images.json
@@ -6,7 +6,7 @@
       "minServerVersion": "6.0.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/data/change-streams/unified/change-streams-resume-allowlist.json b/data/change-streams/unified/change-streams-resume-allowlist.json
@@ -6,7 +6,7 @@
       "minServerVersion": "3.6",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/data/change-streams/unified/change-streams-resume-errorLabels.json b/data/change-streams/unified/change-streams-resume-errorLabels.json
@@ -6,7 +6,7 @@
       "minServerVersion": "4.3.1",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ],
       "serverless": "forbid"
diff --git a/data/retryable-writes/unified/bulkWrite-serverErrors.json b/data/retryable-writes/unified/bulkWrite-serverErrors.json
@@ -63,7 +63,7 @@
         {
           "minServerVersion": "4.1.7",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/data/retryable-writes/unified/insertOne-serverErrors.json b/data/retryable-writes/unified/insertOne-serverErrors.json
@@ -63,7 +63,7 @@
         {
           "minServerVersion": "4.1.7",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/data/sessions/unified/snapshot-sessions-unsupported-ops.json b/data/sessions/unified/snapshot-sessions-unsupported-ops.json
@@ -6,7 +6,7 @@
       "minServerVersion": "5.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/data/sessions/unified/snapshot-sessions.json b/data/sessions/unified/snapshot-sessions.json
@@ -6,7 +6,7 @@
       "minServerVersion": "5.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/data/unified-format/valid-pass/poc-crud.json b/data/unified-format/valid-pass/poc-crud.json
@@ -322,7 +322,7 @@
           "minServerVersion": "4.1.0",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ],
           "serverless": "forbid"
         }
diff --git a/data/unified-format/valid-pass/poc-retryable-writes.json b/data/unified-format/valid-pass/poc-retryable-writes.json
@@ -253,7 +253,7 @@
         {
           "minServerVersion": "4.1.7",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
@@ -345,7 +345,7 @@
         {
           "minServerVersion": "4.1.7",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
@@ -414,7 +414,7 @@
         {
           "minServerVersion": "4.1.7",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/data/unified-format/valid-pass/poc-sessions.json b/data/unified-format/valid-pass/poc-sessions.json
@@ -264,7 +264,7 @@
         {
           "minServerVersion": "4.1.8",
           "topologies": [
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/data/unified-format/valid-pass/poc-transactions-convenient-api.json b/data/unified-format/valid-pass/poc-transactions-convenient-api.json
@@ -11,7 +11,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/data/unified-format/valid-pass/poc-transactions-mongos-pin-auto.json b/data/unified-format/valid-pass/poc-transactions-mongos-pin-auto.json
@@ -5,7 +5,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
diff --git a/data/unified-format/valid-pass/poc-transactions.json b/data/unified-format/valid-pass/poc-transactions.json
@@ -11,7 +11,7 @@
     {
       "minServerVersion": "4.1.8",
       "topologies": [
-        "sharded-replicaset"
+        "sharded"
       ]
     }
   ],
@@ -93,7 +93,7 @@
           "minServerVersion": "4.3.4",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
@@ -203,7 +203,7 @@
           "minServerVersion": "4.3.4",
           "topologies": [
             "replicaset",
-            "sharded-replicaset"
+            "sharded"
           ]
         }
       ],
diff --git a/data/versioned-api/test-commands-strict-mode.json b/data/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": [
@@ -71,4 +72,4 @@
       ]
     }
   ]
-}
+}
diff --git a/data/versioned-api/transaction-handling.json b/data/versioned-api/transaction-handling.json
@@ -6,7 +6,7 @@
       "minServerVersion": "4.9",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
+        "sharded",
         "load-balanced"
       ]
     }
@@ -92,7 +92,7 @@
         {
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }
@@ -221,7 +221,7 @@
         {
           "topologies": [
             "replicaset",
-            "sharded-replicaset",
+            "sharded",
             "load-balanced"
           ]
         }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`	`"minServerVersion": "4.1.11",`
`146`	`146`	`"topologies": [`
`147`	`147`	`"replicaset",`
`148`		`- "sharded-replicaset",`
	`148`	`+ "sharded",`
`149`	`149`	`"load-balanced"`
`150`	`150`	`]`
`151`	`151`	`}`
`@@ -190,7 +190,7 @@`
`190`	`190`	`"minServerVersion": "4.2",`
`191`	`191`	`"topologies": [`
`192`	`192`	`"replicaset",`
`193`		`- "sharded-replicaset",`
	`193`	`+ "sharded",`
`194`	`194`	`"load-balanced"`
`195`	`195`	`]`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`{`
`64`	`64`	`"minServerVersion": "4.1.7",`
`65`	`65`	`"topologies": [`
`66`		`- "sharded-replicaset"`
	`66`	`+ "sharded"`
`67`	`67`	`]`
`68`	`68`	`}`
`69`	`69`	`],`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"minServerVersion": "5.0",`
`7`	`7`	`"topologies": [`
`8`	`8`	`"replicaset",`
`9`		`- "sharded-replicaset"`
	`9`	`+ "sharded"`
`10`	`10`	`]`
`11`	`11`	`}`
`12`	`12`	`],`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@`
`322`	`322`	`"minServerVersion": "4.1.0",`
`323`	`323`	`"topologies": [`
`324`	`324`	`"replicaset",`
`325`		`- "sharded-replicaset"`
	`325`	`+ "sharded"`
`326`	`326`	`],`
`327`	`327`	`"serverless": "forbid"`
`328`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@`
`253`	`253`	`{`
`254`	`254`	`"minServerVersion": "4.1.7",`
`255`	`255`	`"topologies": [`
`256`		`- "sharded-replicaset"`
	`256`	`+ "sharded"`
`257`	`257`	`]`
`258`	`258`	`}`
`259`	`259`	`],`
`@@ -345,7 +345,7 @@`
`345`	`345`	`{`
`346`	`346`	`"minServerVersion": "4.1.7",`
`347`	`347`	`"topologies": [`
`348`		`- "sharded-replicaset"`
	`348`	`+ "sharded"`
`349`	`349`	`]`
`350`	`350`	`}`
`351`	`351`	`],`
`@@ -414,7 +414,7 @@`
`414`	`414`	`{`
`415`	`415`	`"minServerVersion": "4.1.7",`
`416`	`416`	`"topologies": [`
`417`		`- "sharded-replicaset"`
	`417`	`+ "sharded"`
`418`	`418`	`]`
`419`	`419`	`}`
`420`	`420`	`],`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@`
`264`	`264`	`{`
`265`	`265`	`"minServerVersion": "4.1.8",`
`266`	`266`	`"topologies": [`
`267`		`- "sharded-replicaset"`
	`267`	`+ "sharded"`
`268`	`268`	`]`
`269`	`269`	`}`
`270`	`270`	`],`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`"minServerVersion": "4.1.8",`
`13`	`13`	`"topologies": [`
`14`		`- "sharded-replicaset"`
	`14`	`+ "sharded"`
`15`	`15`	`]`
`16`	`16`	`}`
`17`	`17`	`],`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.1.8",`
`7`	`7`	`"topologies": [`
`8`		`- "sharded-replicaset"`
	`8`	`+ "sharded"`
`9`	`9`	`]`
`10`	`10`	`}`
`11`	`11`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "Test commands: strict mode",`
`3`		`- "schemaVersion": "1.1",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.9",`
`7`	`7`	`"serverParameters": {`
`8`	`8`	`"enableTestCommands": true`
`9`		`- }`
	`9`	`+ },`
	`10`	`+ "serverless": "forbid"`
`10`	`11`	`}`
`11`	`12`	`],`
`12`	`13`	`"createEntities": [`
`@@ -71,4 +72,4 @@`
`71`	`72`	`]`
`72`	`73`	`}`
`73`	`74`	`]`
`74`		`-}`
	`75`	`+}`