From ca7c67dab423653d4be032a7a65f5651d3733ecc Mon Sep 17 00:00:00 2001
From: "slav.babanin" <slav.babanin@mongodb.com>
Date: Tue, 22 Jul 2025 17:45:14 -0700
Subject: [PATCH 1/2] Use secrets manager to initialize atlas connect
 variables.

JAVA-5921
---
 .evergreen/.evg.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
index 2dd37c1cd7..a46df671ff 100644
--- a/.evergreen/.evg.yml
+++ b/.evergreen/.evg.yml
@@ -232,6 +232,17 @@ functions:
           cd $DRIVERS_TOOLS/.evergreen/auth_aws
           ./setup_secrets.sh drivers/aws_auth
 
+  "add-atlas-connect-variables-to-file":
+    - command: shell.exec
+      type: "test"
+      params:
+        include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
+        shell: "bash"
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
+
   "start-csfle-servers":
     - command: ec2.assume_role
       params:
@@ -1465,6 +1476,7 @@ tasks:
 
   - name: "atlas-connectivity-task"
     commands:
+      - func: "add-atlas-connect-variables-to-file"
       - command: shell.exec
         type: "test"
         params:
@@ -1473,7 +1485,7 @@ tasks:
           script: |
             # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
             # The connection strings are pipe-delimited
-            MONGODB_URIS="${atlas_free_tier_uri}|${atlas_replica_set_uri}|${atlas_sharded_uri}|${atlas_tls_v11_uri}|${atlas_tls_v12_uri}|${atlas_free_tier_uri_srv}|${atlas_replica_set_uri_srv}|${atlas_sharded_uri_srv}|${atlas_tls_v11_uri_srv}|${atlas_tls_v12_uri_srv}" \
+            MONGODB_URIS="${atlas_free}|${atlas_repl}|${atlas_shrd}|${atlas_tls11}|${atlas_tls12}|${atlas_srv_free}|${atlas_srv_repl}|${atlas_srv_shrd}|${atlas_srv_tls11}|${atlas_srv_tls12}" \
             JAVA_VERSION="8" \
             .evergreen/run-connectivity-tests.sh
 

From c94a706a0e2fb3ed265760a0658300642cbb2c12 Mon Sep 17 00:00:00 2001
From: "slav.babanin" <slav.babanin@mongodb.com>
Date: Tue, 22 Jul 2025 18:27:31 -0700
Subject: [PATCH 2/2] Add assume role.

---
 .evergreen/.evg.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
index a46df671ff..778c5c89a2 100644
--- a/.evergreen/.evg.yml
+++ b/.evergreen/.evg.yml
@@ -1476,6 +1476,7 @@ tasks:
 
   - name: "atlas-connectivity-task"
     commands:
+      - func: "assume-aws-test-secrets-role"
       - func: "add-atlas-connect-variables-to-file"
       - command: shell.exec
         type: "test"