Skip to content

Commit 802676e

Browse files
committed
fix eks handling
1 parent d3e8b53 commit 802676e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.evergreen/scripts/oidc_tester.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ def _get_target_dir(sub_test_name: str) -> str:
2525
def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
2626
target_dir = _get_target_dir(sub_test_name)
2727
env = os.environ.copy()
28+
29+
if sub_test_name == "eks" and "AWS_ACCESS_KEY_ID" in os.environ:
30+
# Store AWS creds for kubectl access.
31+
for key in ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]:
32+
if key in os.environ:
33+
write_env(key, os.environ[key])
34+
2835
if sub_test_name == "azure":
2936
env["AZUREOIDC_VMNAME_PREFIX"] = "PYTHON_DRIVER"
3037
if "-remote" not in sub_test_name:
@@ -34,12 +41,6 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
3441
run_command(f"bash {target_dir}/run-self-test.sh")
3542
return None
3643

37-
if sub_test_name == "eks" and "AWS_ACCESS_KEY_ID" in os.environ:
38-
# Store AWS creds for kubectl access.
39-
for key in ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]:
40-
if key in os.environ:
41-
write_env(key, os.environ[key])
42-
4344
source_file = None
4445
if sub_test_name == "test":
4546
source_file = f"{target_dir}/secrets-export.sh"

0 commit comments

Comments
 (0)