GODRIVER-2690 Fix linting errors

mongodb · Sep 14, 2023 · 648b34d · 648b34d
1 parent 3a05351
commit 648b34d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/benchmark/multi.go b/benchmark/multi.go
@@ -21,7 +21,7 @@ func MultiFindMany(ctx context.Context, tm TimerManager, iters int) error {
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {
@@ -87,7 +87,7 @@ func multiInsertCase(ctx context.Context, tm TimerManager, iters int, data strin
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {

diff --git a/benchmark/operation_test.go b/benchmark/operation_test.go
@@ -41,7 +41,7 @@ func BenchmarkClientWrite(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {
@@ -85,7 +85,7 @@ func BenchmarkClientBulkWrite(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {
@@ -134,7 +134,7 @@ func BenchmarkClientRead(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {

diff --git a/benchmark/single.go b/benchmark/single.go
@@ -49,7 +49,7 @@ func SingleRunCommand(ctx context.Context, tm TimerManager, iters int) error {
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	cmd := bson.D{{handshake.LegacyHelloLowercase, true}}
 
@@ -130,7 +130,7 @@ func singleInsertCase(ctx context.Context, tm TimerManager, iters int, data stri
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {

diff --git a/cmd/testkms/main.go b/cmd/testkms/main.go
@@ -87,7 +87,7 @@ func main() {
 	if err != nil {
 		panic(fmt.Sprintf("Connect error: %v", err))
 	}
-	defer keyVaultClient.Disconnect(context.Background())
+	defer func() { _ = keyVaultClient.Disconnect(context.Background()) }()
 
 	kmsProvidersMap := map[string]map[string]interface{}{
 		provider: {},

diff --git a/mongo/crud_examples_test.go b/mongo/crud_examples_test.go
@@ -1085,7 +1085,7 @@ func ExampleCollection_Find_primitiveRegex() {
 		panic(err)
 	}
 
-	defer client.Disconnect(ctx)
+	defer func() { _ = client.Disconnect(ctx) }()
 
 	type Pet struct {
 		Type string `bson:"type"`
@@ -1126,7 +1126,7 @@ func ExampleCollection_Find_regex() {
 		panic(err)
 	}
 
-	defer client.Disconnect(ctx)
+	defer func() { _ = client.Disconnect(ctx) }()
 
 	type Pet struct {
 		Type string `bson:"type"`

diff --git a/mongo/database_test.go b/mongo/database_test.go
@@ -98,7 +98,7 @@ func TestDatabase(t *testing.T) {
 	t.Run("TransientTransactionError label", func(t *testing.T) {
 		client := setupClient(options.Client().ApplyURI("mongodb://nonexistent").SetServerSelectionTimeout(3 * time.Second))
 		err := client.Connect(bgCtx)
-		defer client.Disconnect(bgCtx)
+		defer func() { _ = client.Disconnect(bgCtx) }()
 		assert.Nil(t, err, "expected nil, got %v", err)
 
 		t.Run("negative case of non-transaction", func(t *testing.T) {

diff --git a/mongo/integration/errors_test.go b/mongo/integration/errors_test.go
@@ -88,7 +88,7 @@ func TestErrors(t *testing.T) {
 			integtest.AddTestServerAPIVersion(clientOpts)
 			client, err := mongo.Connect(context.Background(), clientOpts)
 			assert.Nil(mt, err, "Connect error: %v", err)
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 
 			// A connection getting closed should manifest as an io.EOF error.
 			err = client.Ping(context.Background(), mtest.PrimaryRp)

diff --git a/mongo/integration/unified/admin_helpers.go b/mongo/integration/unified/admin_helpers.go
@@ -90,7 +90,7 @@ func runCommandOnHost(ctx context.Context, host string, commandFn func(context.C
 	if err != nil {
 		return fmt.Errorf("error creating client to host %q: %v", host, err)
 	}
-	defer client.Disconnect(ctx)
+	defer func() { _ = client.Disconnect(ctx) }()
 
 	return commandFn(ctx, client)
 }

diff --git a/mongo/ocsp_test.go b/mongo/ocsp_test.go
@@ -34,7 +34,7 @@ func TestOCSP(t *testing.T) {
 		clientOpts := createOCSPClientOptions(cs.Original)
 		client, err := Connect(bgCtx, clientOpts)
 		assert.Nil(t, err, "Connect error: %v", err)
-		defer client.Disconnect(bgCtx)
+		defer func() { _ = client.Disconnect(bgCtx) }()
 
 		err = client.Ping(bgCtx, readpref.Primary())
 		if shouldSucceed {
@@ -49,7 +49,7 @@ func TestOCSP(t *testing.T) {
 		clientOpts := createInsecureOCSPClientOptions(cs.Original)
 		client, err := Connect(bgCtx, clientOpts)
 		assert.Nil(t, err, "Connect error: %v", err)
-		defer client.Disconnect(bgCtx)
+		defer func() { _ = client.Disconnect(bgCtx) }()
 
 		err = client.Ping(bgCtx, readpref.Primary())
 		assert.Nil(t, err, "Ping error: %v", err)

diff --git a/mongo/options/example_test.go b/mongo/options/example_test.go
@@ -59,7 +59,7 @@ func ExampleClientOptions_SetLoggerOptions_customLogger() {
 		log.Fatalf("error connecting to MongoDB: %v", err)
 	}
 
-	defer client.Disconnect(context.TODO())
+	defer func() { _ = client.Disconnect(context.TODO()) }()
 
 	// Make a database request to test our logging solution.
 	coll := client.Database("test").Collection("test")

diff --git a/x/mongo/driver/topology/topology.go b/x/mongo/driver/topology/topology.go
@@ -546,7 +546,7 @@ func (t *Topology) SelectServer(ctx context.Context, ss description.ServerSelect
 
 					return nil, err
 				}
-				defer t.Unsubscribe(sub)
+				defer func() { _ = t.Unsubscribe(sub) }()
 			}
 
 			suitable, selectErr = t.selectServerFromSubscription(ctx, sub.Updates, selectionState)