Try again

Author: jyemin

.evergreen/.evg.yml

@@ -788,11 +788,13 @@ functions:
       type: test
       params:
         working_dir: "src"
+        env:
+          AWS_ACCESS_KEY_ID: ${aws_access_key_id}
+          AWS_SECRET_ACCESS_KEY: ${aws_secret_access_key}
         script: |
           ${PREPARE_SHELL}
           set +o xtrace
-          MONGODB_URI="${MONGODB_URI}" AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} \
-          .evergreen/run-csfle-aws-from-environment.sh
+          MONGODB_URI="${MONGODB_URI}" .evergreen/run-csfle-aws-from-environment.sh
 
   "run csfle tests with mongocryptd":
     - command: shell.exec
@@ -810,15 +812,16 @@ functions:
           GCP_PRIVATE_KEY: ${gcp_private_key}
           AZUREKMS_KEY_VAULT_ENDPOINT: ${testazurekms_keyvaultendpoint}
           AZUREKMS_KEY_NAME: ${testazurekms_keyname}
-          AWS_TEMP_ACCESS_KEY_ID: ${CSFLE_AWS_TEMP_ACCESS_KEY_ID}
-          AWS_TEMP_SECRET_ACCESS_KEY: ${CSFLE_AWS_TEMP_SECRET_ACCESS_KEY}
-          AWS_TEMP_SESSION_TOKEN: ${CSFLE_AWS_TEMP_SESSION_TOKEN}
         script: |
           ${PREPARE_SHELL}
           . ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
           
-          MONGODB_URI="${MONGODB_URI}" JAVA_VERSION="${JAVA_VERSION}" \
-          .evergreen/run-csfle-tests-with-mongocryptd.sh
+          # These will be echoed: is that ok?
+          export AWS_TEMP_ACCESS_KEY_ID=${CSFLE_AWS_TEMP_ACCESS_KEY_ID}
+          export AWS_TEMP_SECRET_ACCESS_KEY=${CSFLE_AWS_TEMP_SECRET_ACCESS_KEY}
+          export  WS_TEMP_SESSION_TOKEN=${CSFLE_AWS_TEMP_SESSION_TOKEN}
+          
+          MONGODB_URI="${MONGODB_URI}" JAVA_VERSION="${JAVA_VERSION}" .evergreen/run-csfle-tests-with-mongocryptd.sh
 
   "publish snapshot":
     - command: shell.exec