From 1f9758d2f57dd0643a9d4f6786700f6cc3f170e7 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Tue, 17 Oct 2023 05:36:48 -0500
Subject: [PATCH] cleanup

---
 .evergreen/config.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ee90943e0a..f7c666266b 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -712,6 +712,21 @@ functions:
             python ./lib/aws_assign_instance_profile.py
           fi
 
+  add-aws-auth-variables-to-file:
+    - command: ec2.assume_role
+      params:
+        role_arn: ${aws_test_secrets_role}
+    - 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}
+          cd $DRIVERS_TOOLS/.evergreen/auth_aws
+          ./setup_secrets.sh drivers/aws_auth
+
   run-aws-auth-test-with-regular-aws-credentials:
     - command: shell.exec
       type: test
@@ -800,21 +815,6 @@ functions:
           export PROJECT_DIRECTORY="$ECS_SRC_DIR"
           $AUTH_AWS_DIR/aws_setup.sh ecs
 
-  run-aws-auth-get-secrets:
-    - command: ec2.assume_role
-      params:
-        role_arn: ${aws_test_secrets_role}
-    - 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}
-          cd $DRIVERS_TOOLS/.evergreen/auth_aws
-          ./setup_secrets.sh drivers/aws_auth
-
   run-aws-auth-test-with-aws-web-identity-credentials:
     - command: shell.exec
       type: test
@@ -1795,13 +1795,13 @@ tasks:
           AUTH: "auth"
           ORCHESTRATION_FILE: "auth-aws.json"
           TOPOLOGY: "server"
-      - func: run-aws-auth-get-secrets
+      - func: add-aws-auth-variables-to-file
       - func: run-aws-auth-test-with-regular-aws-credentials
       - func: run-aws-auth-test-with-assume-role-credentials
       - func: run-aws-auth-test-with-aws-credentials-as-environment-variables
       - func: run-aws-auth-test-with-aws-credentials-and-session-token-as-environment-variables
       - func: run-aws-auth-test-with-aws-EC2-credentials
-      #- func: run-aws-ECS-auth-test
+      - func: run-aws-ECS-auth-test
       - func: run-aws-auth-test-with-aws-web-identity-credentials
 
   - name: "test-standalone-versioned-api"