fix all non-CSFLE builds

Author: baileympearson

.evergreen/run-custom-csfle-tests.sh

@@ -1,7 +1,6 @@
 #! /usr/bin/env bash
 set +o xtrace # Do not write AWS credentials to stderr
 
-export CLIENT_ENCRYPTION=true
 source .evergreen/setup-fle.sh
 
 # Initiail checks for running these tests

.evergreen/run-serverless-tests.sh

@@ -4,7 +4,6 @@ source secrets-export.sh
 source serverless.env
 
 # next, set up FLE
-export CLIENT_ENCRYPTION=true
 export TEST_CSFLE=true
 source .evergreen/setup-fle.sh
 

.evergreen/run-socks5-tests.sh

@@ -9,7 +9,6 @@ function setup_fle() {
   set -o xtrace   # Write all commands first to stderr
   set -o errexit  # Exit the script with error if any of the commands fail
 
-  export CLIENT_ENCRYPTION=true
   source .evergreen/setup-fle.sh
 
   export CSFLE_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"

.evergreen/run-tests.sh

@@ -17,9 +17,10 @@ TEST_NPM_SCRIPT=${TEST_NPM_SCRIPT:-check:integration-coverage}
 COMPRESSOR=${COMPRESSOR:-}
 SKIP_DEPS=${SKIP_DEPS:-true}
 
-export RUN_WITH_MONGOCRYPTD
-export CLIENT_ENCRYPTION
-source .evergreen/setup-fle.sh
+if [[ -n "${CLIENT_ENCRYPTION}" ]]; then
+  export RUN_WITH_MONGOCRYPTD
+  source .evergreen/setup-fle.sh
+fi
 
 # ssl setup
 SSL=${SSL:-nossl}

.evergreen/setup-fle.sh

@@ -13,16 +13,10 @@ else
   echo "CRYPT_SHARED_LIB_PATH not set; using mongocryptd"
 fi
 
-# only run FLE tets on hosts we explicitly choose to test on
-if [[ -z "${CLIENT_ENCRYPTION}" ]]; then
-  unset AWS_ACCESS_KEY_ID;
-  unset AWS_SECRET_ACCESS_KEY;
-else
-  pushd "$DRIVERS_TOOLS/.evergreen/csfle"
-  . ./activate-kmstlsvenv.sh
-  # Get access to the AWS temporary credentials:
-  echo "adding temporary AWS credentials to environment"
-  # CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
-  source set-temp-creds.sh
-  popd
-fi
+pushd "$DRIVERS_TOOLS/.evergreen/csfle"
+. ./activate-kmstlsvenv.sh
+# Get access to the AWS temporary credentials:
+echo "adding temporary AWS credentials to environment"
+# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
+source set-temp-creds.sh
+popd