From 2bc53da2409a747f2bf9aa0113c03a1463d24fee Mon Sep 17 00:00:00 2001
From: Preston Vasquez <24281431+prestonvasquez@users.noreply.github.com>
Date: Tue, 8 Aug 2023 14:42:41 -0600
Subject: [PATCH] GODRIVER-2572 Resolve misaligned server selectors

---
 mongo/description/server_selector.go | 36 +++++++++++++---------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/mongo/description/server_selector.go b/mongo/description/server_selector.go
index 1562741d25..76f14de769 100644
--- a/mongo/description/server_selector.go
+++ b/mongo/description/server_selector.go
@@ -177,7 +177,7 @@ func (selector writeServerSelector) String() string {
 	return selector.info().String()
 }
 
-func (writeServerSelector) SelectServer(t Topology, s []Server) ([]Server, error) {
+func (writeServerSelector) SelectServer(t Topology, candidates []Server) ([]Server, error) {
 	switch t.Kind {
 	case Single, LoadBalanced:
 		return candidates, nil
@@ -218,26 +218,24 @@ func (selector readPrefServerSelector) String() string {
 	return selector.info().String()
 }
 
-func (selector readPrefServerSelector) SelectServer(t Topology, s []Server) ([]Server, error) {
-	return ServerSelectorFunc(func(t Topology, candidates []Server) ([]Server, error) {
-		if t.Kind == LoadBalanced {
-			// In LoadBalanced mode, there should only be one server in the topology and it must be selected. We check
-			// this before checking MaxStaleness support because there's no monitoring in this mode, so the candidate
-			// server wouldn't have a wire version set, which would result in an error.
-			return candidates, nil
-		}
+func (selector readPrefServerSelector) SelectServer(t Topology, candidates []Server) ([]Server, error) {
+	if t.Kind == LoadBalanced {
+		// In LoadBalanced mode, there should only be one server in the topology and it must be selected. We check
+		// this before checking MaxStaleness support because there's no monitoring in this mode, so the candidate
+		// server wouldn't have a wire version set, which would result in an error.
+		return candidates, nil
+	}
 
-		switch t.Kind {
-		case Single:
-			return candidates, nil
-		case ReplicaSetNoPrimary, ReplicaSetWithPrimary:
-			return selectForReplicaSet(selector.rp, selector.isOutputAggregate, t, candidates)
-		case Sharded:
-			return selectByKind(candidates, Mongos), nil
-		}
+	switch t.Kind {
+	case Single:
+		return candidates, nil
+	case ReplicaSetNoPrimary, ReplicaSetWithPrimary:
+		return selectForReplicaSet(selector.rp, selector.isOutputAggregate, t, candidates)
+	case Sharded:
+		return selectByKind(candidates, Mongos), nil
+	}
 
-		return nil, nil
-	})
+	return nil, nil
 }
 
 // OutputAggregateSelector selects servers based on the provided read preference