ec2

Author: baileympearson

.evergreen/config.in.yml

@@ -536,30 +536,23 @@ functions:
           - .evergreen/run-mongodb-aws-test-copy.sh
 
   "run aws auth test with aws EC2 credentials":
-    - command: shell.exec
-      type: test
+    - command: ec2.assume_role
       params:
-        working_dir: "src"
-        shell: bash
-        script: |
-          ${PREPARE_SHELL}
-          # Write an empty prepare_mongodb_aws so no auth environment variables
-          # are set.
-          echo "" > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
-          set -ex
-          cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate-authawsvenv.sh
-          python aws_tester.py ec2
-    - command: shell.exec
+        role_arn: ${OIDC_AWS_ROLE_ARN}
+    - command: subprocess.exec
       type: test
       params:
+        include_expansions_in_env:
+          - MONGODB_URI
+          - DRIVERS_TOOLS
+          - MONGODB_AWS_SDK
         env:
-          MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
-        working_dir: "src"
-        script: |
-          ${PREPARE_SHELL}
-          export IS_EC2=true
-          ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
+          AWS_CREDENTIAL_TYPE: ec2
+          IS_EC2: 'true'
+        working_dir: src
+        binary: bash
+        args:
+          - .evergreen/run-mongodb-aws-test-copy.sh
 
   "run aws auth test with aws credentials as environment variables":
     - command: ec2.assume_role
@@ -616,34 +609,6 @@ functions:
         args: 
           - .evergreen/run-mongodb-aws-test-copy.sh
 
-    # - command: shell.exec
-    #   type: test
-    #   params:
-    #     working_dir: "src"
-    #     silent: true
-    #     shell: bash
-    #     script: |
-    #       set -ex
-    #       cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-    #       . ./activate-authawsvenv.sh
-    #       python aws_tester.py web-identity
-    #       cd -
-    #       cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
-    #         export AWS_WEB_IDENTITY_TOKEN_FILE=${iam_web_identity_token_file}
-    #         export AWS_ROLE_ARN=${iam_auth_assume_web_role_name}
-    #         export AWS_ROLE_SESSION_NAME='test'
-    #         export MONGODB_URI="mongodb://localhost:27017/aws?authMechanism=MONGODB-AWS"
-    #       EOF
-    # - command: shell.exec
-    #   type: test
-    #   params:
-    #     env:
-    #       MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
-    #     working_dir: "src"
-    #     script: |
-    #       ${PREPARE_SHELL}
-    #       ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
-
   "run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME unset":
     - command: ec2.assume_role
       params:

.evergreen/config.yml

@@ -477,30 +477,23 @@ functions:
         args:
           - .evergreen/run-mongodb-aws-test-copy.sh
   run aws auth test with aws EC2 credentials:
-    - command: shell.exec
-      type: test
+    - command: ec2.assume_role
       params:
-        working_dir: src
-        shell: bash
-        script: |
-          ${PREPARE_SHELL}
-          # Write an empty prepare_mongodb_aws so no auth environment variables
-          # are set.
-          echo "" > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
-          set -ex
-          cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
-          . ./activate-authawsvenv.sh
-          python aws_tester.py ec2
-    - command: shell.exec
+        role_arn: ${OIDC_AWS_ROLE_ARN}
+    - command: subprocess.exec
       type: test
       params:
+        include_expansions_in_env:
+          - MONGODB_URI
+          - DRIVERS_TOOLS
+          - MONGODB_AWS_SDK
         env:
-          MONGODB_AWS_SDK: ${MONGODB_AWS_SDK}
+          AWS_CREDENTIAL_TYPE: ec2
+          IS_EC2: 'true'
         working_dir: src
-        script: |
-          ${PREPARE_SHELL}
-          export IS_EC2=true
-          ${PROJECT_DIRECTORY}/.evergreen/run-mongodb-aws-test.sh
+        binary: bash
+        args:
+          - .evergreen/run-mongodb-aws-test-copy.sh
   run aws auth test with aws credentials as environment variables:
     - command: ec2.assume_role
       params:

.evergreen/generate_evergreen_tasks.js

@@ -339,7 +339,7 @@ for (const VERSION of AWS_AUTH_VERSIONS) {
   const awsFuncs = [
     { func: 'run aws auth test with regular aws credentials' }, // done
     { func: 'run aws auth test with assume role credentials' }, // done
-    { func: 'run aws auth test with aws EC2 credentials', onlySdk: true },
+    { func: 'run aws auth test with aws EC2 credentials', onlySdk: true }, // done
     { func: 'run aws auth test with aws credentials as environment variables' }, // done
     { func: 'run aws auth test with aws credentials and session token as environment variables' },  // done
     { func: 'run aws ECS auth test' },