From 9546f18ebca1bda4a63c7ea7989bc32c83c9c86b Mon Sep 17 00:00:00 2001 From: cyrus-mc Date: Wed, 22 Jul 2020 09:09:02 -0700 Subject: [PATCH] Merge writeOpts and tlsAuthOpts after call to ApplyURI (#9519) --- plugins/database/mongodb/connection_producer.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/database/mongodb/connection_producer.go b/plugins/database/mongodb/connection_producer.go index fbae8c4dcb..5915177020 100644 --- a/plugins/database/mongodb/connection_producer.go +++ b/plugins/database/mongodb/connection_producer.go @@ -132,8 +132,7 @@ func createClient(ctx context.Context, connURL string, clientOptions *options.Cl clientOptions.SetSocketTimeout(1 * time.Minute) clientOptions.SetConnectTimeout(1 * time.Minute) - opts := clientOptions.ApplyURI(connURL) - client, err = mongo.Connect(ctx, opts) + client, err = mongo.Connect(ctx, options.MergeClientOptions(options.Client().ApplyURI(connURL), clientOptions)) if err != nil { return nil, err }