GODRIVER-2965 Add serverselector internal package

prestonvasquez · Jun 3, 2024 · 8e280f8 · 8e280f8
1 parent 0df40b1
commit 8e280f8
Show file tree

Hide file tree

Showing 20 changed files with 606 additions and 601 deletions.
diff --git a/internal/driverutil/description.go b/internal/driverutil/description.go
diff --git a/internal/integration/initial_dns_seedlist_discovery_test.go b/internal/integration/initial_dns_seedlist_discovery_test.go
@@ -19,8 +19,8 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/internal/assert"
-	"go.mongodb.org/mongo-driver/internal/driverutil"
 	"go.mongodb.org/mongo-driver/internal/integration/mtest"
+	"go.mongodb.org/mongo-driver/internal/serverselector"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
@@ -249,7 +249,7 @@ func getSSLSettings(mt *mtest.T, test seedlistTest) *tls.Config {
 }
 
 func getServerByAddress(address string, topo *topology.Topology) (description.Server, error) {
-	selectByName := driverutil.ServerSelectorFunc(
+	selectByName := serverselector.Func(
 		func(_ description.Topology, servers []description.Server) ([]description.Server, error) {
 			for _, s := range servers {
 				if s.Addr.String() == address {

diff --git a/internal/integration/unified_runner_events_helper_test.go b/internal/integration/unified_runner_events_helper_test.go
@@ -13,8 +13,8 @@ import (
 
 	"go.mongodb.org/mongo-driver/event"
 	"go.mongodb.org/mongo-driver/internal/assert"
-	"go.mongodb.org/mongo-driver/internal/driverutil"
 	"go.mongodb.org/mongo-driver/internal/integration/mtest"
+	"go.mongodb.org/mongo-driver/internal/serverselector"
 	"go.mongodb.org/mongo-driver/mongo/address"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
 	"go.mongodb.org/mongo-driver/x/mongo/driver/description"
@@ -165,7 +165,7 @@ func getPrimaryAddress(mt *mtest.T, topo *topology.Topology, failFast bool) addr
 		cancel()
 	}
 
-	primary, err := topo.SelectServer(ctx, &driverutil.ReadPrefServerSelector{ReadPref: readpref.Primary()})
+	primary, err := topo.SelectServer(ctx, &serverselector.ReadPref{ReadPref: readpref.Primary()})
 	assert.Nil(mt, err, "SelectServer error: %v", err)
 	return primary.(*topology.SelectedServer).Description().Addr
 }
diff --git a/internal/integtest/integtest.go b/internal/integtest/integtest.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 
 	"go.mongodb.org/mongo-driver/event"
-	"go.mongodb.org/mongo-driver/internal/driverutil"
 	"go.mongodb.org/mongo-driver/internal/require"
+	"go.mongodb.org/mongo-driver/internal/serverselector"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 	"go.mongodb.org/mongo-driver/x/mongo/driver"
@@ -102,7 +102,7 @@ func MonitoredTopology(t *testing.T, dbName string, monitor *event.CommandMonito
 		_ = monitoredTopology.Connect()
 
 		err = operation.NewCommand(bsoncore.BuildDocument(nil, bsoncore.AppendInt32Element(nil, "dropDatabase", 1))).
-			Database(dbName).ServerSelector(&driverutil.WriteServerSelector{}).Deployment(monitoredTopology).Execute(context.Background())
+			Database(dbName).ServerSelector(&serverselector.Write{}).Deployment(monitoredTopology).Execute(context.Background())
 
 		require.NoError(t, err)
 	}
@@ -126,7 +126,7 @@ func Topology(t *testing.T) *topology.Topology {
 			_ = liveTopology.Connect()
 
 			err = operation.NewCommand(bsoncore.BuildDocument(nil, bsoncore.AppendInt32Element(nil, "dropDatabase", 1))).
-				Database(DBName(t)).ServerSelector(&driverutil.WriteServerSelector{}).
+				Database(DBName(t)).ServerSelector(&serverselector.Write{}).
 				Deployment(liveTopology).Execute(context.Background())
 			require.NoError(t, err)
 		}