Fixes

Author: NoahStapp

.evergreen/config.yml

@@ -288,6 +288,14 @@ functions:
           - .evergreen/scripts/run-doctests.sh
 
   "run tests":
+    - command: subprocess.exec
+      params:
+          working_dir: "src"
+          binary: bash
+          background: true
+          include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
+          args:
+            - .evergreen/scripts/setup-encryption.sh
     - command: subprocess.exec
       params:
         working_dir: "src"
@@ -314,6 +322,7 @@ functions:
         include_expansions_in_env: ["PYTHON_BINARY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
         working_dir: "src"
         args:
+          - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/run-atlas-tests.sh
 
   "get aws auth secrets":
@@ -344,7 +353,8 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - .evergreen/scripts/run-mongodb-aws-test.sh assume-role
+          - .evergreen/scripts/run-mongodb-aws-test.sh
+          - assume-role
 
   "run aws auth test with aws EC2 credentials":
     - command: subprocess.exec
@@ -354,19 +364,29 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - .evergreen/scripts/run-mongodb-aws-test.sh ec2
+          - .evergreen/scripts/run-mongodb-aws-test.sh
+          - ec2
 
   "run aws auth test with aws web identity credentials":
+    - # Test with and without AWS_ROLE_SESSION_NAME set.
     - command: subprocess.exec
       type: test
       params:
         include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
         binary: bash
         working_dir: "src"
         args:
-          # Test with and without AWS_ROLE_SESSION_NAME set.
-          - .evergreen/scripts/run-mongodb-aws-test.sh web-identity
-          - AWS_ROLE_SESSION_NAME="test" .evergreen/scripts/run-mongodb-aws-test.sh web-identity
+          - .evergreen/scripts/run-mongodb-aws-test.sh
+          - web-identity
+    - command: subprocess.exec
+      type: test
+      params:
+        include_expansions_in_env: [ "DRIVERS_TOOLS", "skip_EC2_auth_test" ]
+        binary: bash
+        working_dir: "src"
+        args:
+          - AWS_ROLE_SESSION_NAME="test" .evergreen/scripts/run-mongodb-aws-test.sh
+          - web-identity
 
   "run aws auth test with aws credentials as environment variables":
     - command: subprocess.exec
@@ -376,7 +396,8 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - .evergreen/scripts/run-mongodb-aws-test.sh env-creds
+          - .evergreen/scripts/run-mongodb-aws-test.sh
+          - env-creds
 
   "run aws auth test with aws credentials and session token as environment variables":
     - command: subprocess.exec
@@ -386,7 +407,8 @@ functions:
         binary: bash
         working_dir: "src"
         args:
-          - .evergreen/scripts/run-mongodb-aws-test.sh session-creds
+          - .evergreen/scripts/run-mongodb-aws-test.sh
+          - session-creds
 
   "run oidc auth test with test credentials":
     - command: subprocess.exec
@@ -497,7 +519,7 @@ functions:
       params:
         background: true
         binary: bash
-        include_expansions_in_env: ["SERVER_TYPE", "OCSP_ALGORITHM"]
+        include_expansions_in_env: [SERVER_TYPE, OCSP_ALGORITHM]
         args:
           - ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
 

.evergreen/scripts/configure-env.sh

@@ -41,6 +41,25 @@ export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 export AUTH="${AUTH:-noauth}"
 export SSL="${SSL:-nossl}"
 export PYTHON_BINARY="${PYTHON_BINARY:-}"
+export test_encryption="${test_encryption:-}"
+export test_encryption_pyopenssl="${test_encryption_pyopenssl:-}"
+export test_crypt_shared="${test_crypt_shared:-}"
+export test_pyopenssl="${test_pyopenssl:-}"
+export SETDEFAULTENCODING="${SETDEFAULTENCODING:-}"
+export test_loadbalancer="${test_loadbalancer:-}"
+export test_serverless="${test_serverless:-}"
+export TEST_INDEX_MANAGEMENT="${TEST_INDEX_MANAGEMENT:-}"
+export SKIP_CSOT_TESTS="${SKIP_CSOT_TESTS:-}"
+export MONGODB_STARTED="${MONGODB_STARTED:-}"
+export DISABLE_TEST_COMMANDS="${DISABLE_TEST_COMMANDS:-}"
+export GREEN_FRAMEWORK="${GREEN_FRAMEWORK:-}"
+export NO_EXT="${NO_EXT:-}"
+export COVERAGE="${COVERAGE:-}"
+export COMPRESSORS="${COMPRESSORS:-}"
+export TEST_DATA_LAKE="${TEST_DATA_LAKE:-}"
+export TEST_SUITES="${TEST_SUITES:-}"
+export MONGODB_API_VERSION="${MONGODB_API_VERSION:-}"
+export SKIP_HATCH="${SKIP_HATCH:-}"
 
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 export PATH="$MONGODB_BINARIES:$PATH"

.evergreen/scripts/run-atlas-tests.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 # Disable xtrace for security reasons (just in case it was accidentally set).
 set +x
 set -o errexit

.evergreen/scripts/run-with-env.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -eu
+
+# Example use: bash run-with-env.sh run-tests.sh {args...}
+
+# Parameter expansion to get just the current directory's name
+if [ "${PWD##*/}" == "src" ]; then
+  . .evergreen/scripts/env.sh
+else
+    . src/.evergreen/scripts/env.sh
+fi
+
+# shellcheck source=/dev/null
+. "$1" "${@:2}"

.evergreen/scripts/setup-encryption.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eu
+
+. .evergreen/scripts/env.sh
+if [ -n "${test_encryption}" ]; then
+  ./.evergreen/hatch.sh encryption:setup &
+fi