finally passing environment variable through properly

Author: baileympearson

.evergreen/config.in.yml

@@ -142,22 +142,23 @@ functions:
             bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
   "run serverless tests":
+    - command: timeout.update
+      params:
+        exec_timeout_secs: 1800
     - command: shell.exec
       type: test
       params:
         silent: true
         working_dir: src
         script: |
-          ${PREPARE_SHELL}
-
           cat <<EOT > prepare_client_encryption.sh
-          export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
-          export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
-          export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
-          export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
-          export AWS_DEFAULT_REGION='us-east-1'
-          export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
-          export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
+            export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
+            export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
+            export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
+            export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
+            export AWS_DEFAULT_REGION='us-east-1'
+            export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
+            export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
           EOT
     - command: shell.exec
       type: test
@@ -182,20 +183,8 @@ functions:
 
           MONGODB_URI="${MONGODB_URI}" \
           AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
-          MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
-    - command: timeout.update
-      params:
-        exec_timeout_secs: 1800
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: "src"
-        script: |
-          ${PREPARE_SHELL}
-          # Disable xtrace (just in case it was accidentally set).
-          set +x
+          MONGODB_API_VERSION="${MONGODB_API_VERSION}"
 
-          export CSFLE_KMS_PROVIDERS="${CSFLE_KMS_PROVIDERS}"
           export MONGODB_API_VERSION="${MONGODB_API_VERSION}"
           export AUTH="auth"
           export SSL="ssl"

.evergreen/config.yml

@@ -115,22 +115,23 @@ functions:
           NODE_VERSION=${NODE_VERSION} SKIP_DEPS=${SKIP_DEPS|1} \
             bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
   run serverless tests:
+    - command: timeout.update
+      params:
+        exec_timeout_secs: 1800
     - command: shell.exec
       type: test
       params:
         silent: true
         working_dir: src
         script: |
-          ${PREPARE_SHELL}
-
           cat <<EOT > prepare_client_encryption.sh
-          export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
-          export CSFLE_KMS_PROVIDERS=${CSFLE_KMS_PROVIDERS}
-          export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
-          export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
-          export AWS_DEFAULT_REGION='us-east-1'
-          export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
-          export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
+            export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
+            export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
+            export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
+            export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
+            export AWS_DEFAULT_REGION='us-east-1'
+            export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
+            export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
           EOT
     - command: shell.exec
       type: test
@@ -155,21 +156,8 @@ functions:
 
           MONGODB_URI="${MONGODB_URI}" \
           AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
-          MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
-    - command: timeout.update
-      params:
-        exec_timeout_secs: 1800
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: src
-        shell: bash
-        script: |
-          ${PREPARE_SHELL}
-          # Disable xtrace (just in case it was accidentally set).
-          set +x
+          MONGODB_API_VERSION="${MONGODB_API_VERSION}"
 
-          export CSFLE_KMS_PROVIDERS="${CSFLE_KMS_PROVIDERS}"
           export MONGODB_API_VERSION="${MONGODB_API_VERSION}"
           export AUTH="auth"
           export SSL="ssl"

.evergreen/run-serverless-tests.sh

@@ -14,7 +14,7 @@ npm install mongodb-client-encryption@">=2.3.0"
 
 npx mocha \
   --config test/mocha_mongodb.json \
-  test/integration/client-side-encryption/client_side_encryption.spec.test.ts --grep "Database aggregate should fail"
+  test/integration/client-side-encryption/client_side_encryption.spec.test.ts
   # test/integration/crud/crud.spec.test.js \
   # test/integration/crud/crud.prose.test.js \
   # test/integration/retryable-reads/retryable_reads.spec.test.js \