From 84b23d6336153248fbe33c3f73257b9be119b35c Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 13 May 2025 17:16:13 -0500 Subject: [PATCH 1/2] INTPYTHON-622 Fix handling of assumed credentials --- .evergreen/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a81edd1..b208147 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -52,7 +52,7 @@ functions: "assume role": - command: ec2.assume_role params: - role_arn: ${assume_role_arn} + role_arn: ${drivers_test_secrets_role} "execute tests": - command: subprocess.exec @@ -86,6 +86,7 @@ functions: pre_error_fails_task: true post_error_fails_task: true pre: + - func: "assume role" - func: "fetch source" - func: "fetch secrets" post: @@ -198,7 +199,6 @@ tasks: tags: [local] commands: - func: "fetch repo" - - func: "assume role" - func: "setup local atlas" - func: "execute tests" @@ -206,7 +206,6 @@ tasks: tags: [remote] commands: - func: "fetch repo" - - func: "assume role" - func: "setup remote atlas" - func: "execute tests" From 9f25beb3094deae84d88d00f9ad05e347b8a86d2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 13 May 2025 17:22:21 -0500 Subject: [PATCH 2/2] use it in more places --- .evergreen/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b208147..876d562 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -68,7 +68,7 @@ functions: type: test retry_on_failure: true params: - include_expansions_in_env: [DIR] + include_expansions_in_env: [DIR, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN] working_dir: "src" binary: bash args: @@ -78,7 +78,7 @@ functions: - command: subprocess.exec type: test params: - include_expansions_in_env: [DIR] + include_expansions_in_env: [DIR, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN] working_dir: "src" binary: bash args: [.evergreen/setup-remote.sh]