From 5ea51e64a91b28ea0423d7b5c1baba8bcc0362e8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 23 Sep 2024 21:13:32 -0500 Subject: [PATCH 1/2] GODRIVER-3358 Do not override authSource from TXT record --- .evergreen/config.yml | 2 +- x/mongo/driver/connstring/connstring.go | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index aa32be7055..f15feac4cc 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -145,7 +145,7 @@ functions: # If this was a patch build, doing a fresh clone would not actually test the patch cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS else - git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS + git clone --branch GODRIVER-3358 https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config - command: shell.exec diff --git a/x/mongo/driver/connstring/connstring.go b/x/mongo/driver/connstring/connstring.go index 67af28fa77..fd69eb4904 100644 --- a/x/mongo/driver/connstring/connstring.go +++ b/x/mongo/driver/connstring/connstring.go @@ -297,10 +297,6 @@ func (u *ConnString) setDefaultAuthParams(dbName string) error { } fallthrough case "mongodb-aws", "mongodb-x509", "mongodb-oidc": - // dns.LookupTXT will get "authSource=admin" from Atlas hosts. - if u.AuthSource == "admin" { - u.AuthSource = "$external" - } if u.AuthSource == "" { u.AuthSource = "$external" } else if u.AuthSource != "$external" { From eac11d8567af3f04d39b284c0f17dfd7c206025d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 27 Sep 2024 06:22:08 -0500 Subject: [PATCH 2/2] GODRIVER-3358 Do not override authSource from TXT record --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f15feac4cc..aa32be7055 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -145,7 +145,7 @@ functions: # If this was a patch build, doing a fresh clone would not actually test the patch cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS else - git clone --branch GODRIVER-3358 https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS + git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config - command: shell.exec