staticcheck: fix warnings in mongo

Author: prestonvasquez

mongo/collection_test.go

@@ -25,11 +25,11 @@ import (
 )
 
 const (
-	testDbName = "unitTestDb"
+	testDBName = "unitTestDB"
 )
 
 func setupColl(name string, opts ...options.Lister[options.CollectionOptions]) *Collection {
-	db := setupDb(testDbName)
+	db := setupDB(testDBName)
 	return db.Collection(name, opts...)
 }
 
@@ -72,7 +72,7 @@ func TestCollection(t *testing.T) {
 		rcLocal := readconcern.Local()
 		wc1 := &writeconcern.WriteConcern{W: 10}
 
-		db := setupDb("foo", options.Database().SetReadPreference(rpPrimary).SetReadConcern(rcLocal))
+		db := setupDB("foo", options.Database().SetReadPreference(rpPrimary).SetReadConcern(rcLocal))
 		coll := db.Collection("bar", options.Collection().SetWriteConcern(wc1))
 		expected := &Collection{
 			readPreference: rpPrimary,
@@ -143,7 +143,7 @@ func TestCollection(t *testing.T) {
 	t.Run("database accessor", func(t *testing.T) {
 		coll := setupColl("bar")
 		dbName := coll.Database().Name()
-		assert.Equal(t, testDbName, dbName, "expected db name %v, got %v", testDbName, dbName)
+		assert.Equal(t, testDBName, dbName, "expected db name %v, got %v", testDBName, dbName)
 	})
 	t.Run("nil document error", func(t *testing.T) {
 		coll := setupColl("foo")

mongo/database.go

@@ -29,9 +29,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/session"
 )
 
-var (
-	defaultRunCmdOpts = []options.Lister[options.RunCmdOptions]{options.RunCmd().SetReadPreference(readpref.Primary())}
-)
+var defaultRunCmdOpts = []options.Lister[options.RunCmdOptions]{options.RunCmd().SetReadPreference(readpref.Primary())}
 
 // Database is a handle to a MongoDB database. It is safe for concurrent use by multiple goroutines.
 type Database struct {
@@ -576,8 +574,8 @@ func (db *Database) ListCollectionNames(
 // The opts parameter can be used to specify options for change stream creation (see the options.ChangeStreamOptions
 // documentation).
 func (db *Database) Watch(ctx context.Context, pipeline any,
-	opts ...options.Lister[options.ChangeStreamOptions]) (*ChangeStream, error) {
-
+	opts ...options.Lister[options.ChangeStreamOptions],
+) (*ChangeStream, error) {
 	csConfig := changeStreamConfig{
 		readConcern:    db.readConcern,
 		readPreference: db.readPreference,
@@ -700,7 +698,7 @@ func (db *Database) createCollectionWithEncryptedFields(
 		defer conn.Close()
 		wireVersionRange := conn.Description().WireVersion
 		if wireVersionRange.Max < QEv2WireVersion {
-			return fmt.Errorf("Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption. Got maxWireVersion %v but need maxWireVersion >= %v", wireVersionRange.Max, QEv2WireVersion)
+			return fmt.Errorf("driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption. Got maxWireVersion %v but need maxWireVersion >= %v", wireVersionRange.Max, QEv2WireVersion)
 		}
 	}
 
@@ -897,8 +895,8 @@ func (db *Database) createCollectionOperation(
 // See https://www.mongodb.com/docs/manual/core/views/ for more information
 // about views.
 func (db *Database) CreateView(ctx context.Context, viewName, viewOn string, pipeline any,
-	opts ...options.Lister[options.CreateViewOptions]) error {
-
+	opts ...options.Lister[options.CreateViewOptions],
+) error {
 	pipelineArray, _, err := marshalAggregatePipeline(pipeline, db.bsonOpts, db.registry)
 	if err != nil {
 		return err
@@ -979,7 +977,7 @@ func (db *Database) GridFSBucket(opts ...options.Lister[options.BucketOptions])
 		b.rp = bo.ReadPreference
 	}
 
-	var collOpts = options.Collection().SetWriteConcern(b.wc).SetReadConcern(b.rc).SetReadPreference(b.rp)
+	collOpts := options.Collection().SetWriteConcern(b.wc).SetReadConcern(b.rc).SetReadPreference(b.rp)
 
 	b.chunksColl = db.Collection(b.name+".chunks", collOpts)
 	b.filesColl = db.Collection(b.name+".files", collOpts)

mongo/database_test.go

@@ -22,7 +22,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/topology"
 )
 
-func setupDb(name string, opts ...options.Lister[options.DatabaseOptions]) *Database {
+func setupDB(name string, opts ...options.Lister[options.DatabaseOptions]) *Database {
 	client := setupClient()
 	return client.Database(name, opts...)
 }
@@ -42,7 +42,7 @@ func compareDbs(t *testing.T, expected, got *Database) {
 func TestDatabase(t *testing.T) {
 	t.Run("initialize", func(t *testing.T) {
 		name := "foo"
-		db := setupDb(name)
+		db := setupDB(name)
 		assert.Equal(t, name, db.Name(), "expected db name %v, got %v", name, db.Name())
 		assert.NotNil(t, db.Client(), "expected valid client, got nil")
 	})
@@ -64,7 +64,7 @@ func TestDatabase(t *testing.T) {
 				writeConcern:   wc2,
 				registry:       reg,
 			}
-			got := setupDb("foo", opts)
+			got := setupDB("foo", opts)
 			compareDbs(t, expected, got)
 		})
 		t.Run("inherit", func(t *testing.T) {
@@ -85,7 +85,7 @@ func TestDatabase(t *testing.T) {
 		})
 	})
 	t.Run("replaceErrors for disconnected topology", func(t *testing.T) {
-		db := setupDb("foo")
+		db := setupDB("foo")
 
 		topo, ok := db.client.deployment.(*topology.Topology)
 		require.True(t, ok, "client deployment is not a topology")
@@ -138,7 +138,7 @@ func TestDatabase(t *testing.T) {
 		})
 	})
 	t.Run("nil document error", func(t *testing.T) {
-		db := setupDb("foo")
+		db := setupDB("foo")
 
 		err := db.RunCommand(bgCtx, nil).Err()
 		assert.True(t, errors.Is(err, ErrNilDocument), "expected error %v, got %v", ErrNilDocument, err)