upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge writeOpts and tlsAuthOpts after call to ApplyURI (#9519)

Browse source
This commit is contained in:
cyrus-mc 2020-07-22 09:09:02 -07:00 committed by GitHub
parent 4b81ede3e3
commit 9546f18ebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/database/mongodb/connection_producer.go
View file

@ -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
}