Add run-with-env.sh

.evergreen/config.yml

@@ -228,6 +228,7 @@ functions:
  params:
  binary: bash
  args:
+ - src/.evergreen/scripts/run-with-env.sh
  - src/.evergreen/scripts/bootstrap-mongo-orchestration.sh
  - command: expansions.update
  params:
@@ -267,6 +268,7 @@ functions:
  working_dir: "src"
  binary: bash
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mod-wsgi-tests.sh
 
  "run mockupdb tests":
@@ -276,6 +278,7 @@ functions:
  working_dir: "src"
  binary: bash
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mockupdb-tests.sh
 
  "run doctests":
@@ -285,6 +288,7 @@ functions:
  working_dir: "src"
  binary: bash
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-doctests.sh
 
  "run tests":
@@ -295,13 +299,15 @@ functions:
  background: true
  include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/setup-encryption.sh
  - command: subprocess.exec
  params:
  working_dir: "src"
  binary: bash
  include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-tests.sh
 
  "run enterprise auth tests":
@@ -312,14 +318,15 @@ functions:
  working_dir: "src"
  include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-enterprise-auth-tests.sh
 
  "run atlas tests":
  - command: subprocess.exec
  type: test
  params:
  binary: bash
- include_expansions_in_env: ["PYTHON_BINARY", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
+ include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
  working_dir: "src"
  args:
  - .evergreen/scripts/run-with-env.sh
@@ -338,10 +345,11 @@ functions:
  - command: subprocess.exec
  type: test
  params:
- include_expansions_in_env: ["DRIVERS_TOOLS", "PYTHON_BINARY", "skip_EC2_auth_test"]
+ include_expansions_in_env: ["DRIVERS_TOOLS", "skip_EC2_auth_test"]
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - regular
 
@@ -353,6 +361,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - assume-role
 
@@ -364,6 +373,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - ec2
 
@@ -376,6 +386,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - web-identity
  - command: subprocess.exec
@@ -385,6 +396,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - AWS_ROLE_SESSION_NAME="test" .evergreen/scripts/run-mongodb-aws-test.sh
  - web-identity
 
@@ -396,6 +408,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - env-creds
 
@@ -407,6 +420,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-mongodb-aws-test.sh
  - session-creds
 
@@ -439,6 +453,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-aws-ecs-auth-test.sh
 
  "cleanup":
@@ -447,6 +462,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/cleanup.sh
 
  "fix absolute paths":
@@ -483,6 +499,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/install-dependencies.sh
 
  "assume ec2 role":
@@ -512,6 +529,7 @@ functions:
  binary: bash
  working_dir: "src"
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-ocsp-test.sh
 
  "run-ocsp-server":
@@ -529,6 +547,7 @@ functions:
  binary: bash
  include_expansions_in_env: ["MONGODB_URI"]
  args:
+ - src/.evergreen/scripts/run-with-env.sh
  - src/.evergreen/scripts/run-load-balancer.sh
  - command: expansions.update
  params:
@@ -553,6 +572,7 @@ functions:
  params:
  binary: bash
  args:
+ - src/.evergreen/scripts/run-with-env.sh
  - src/.evergreen/scripts/teardown-aws.sh
 
  "teardown atlas":
@@ -569,6 +589,7 @@ functions:
  working_dir: "src"
  binary: bash
  args:
+ - .evergreen/scripts/run-with-env.sh
  - .evergreen/scripts/run-perf-tests.sh
 
  "attach benchmark test results":

.evergreen/scripts/bootstrap-mongo-orchestration.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-. src/.evergreen/scripts/env.sh
 set -o xtrace
 
 # Enable core dumps if enabled on the machine

.evergreen/scripts/cleanup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 if [ -f "$DRIVERS_TOOLS"/.evergreen/csfle/secrets-export.sh ]; then
  . .evergreen/hatch.sh encryption:teardown
 fi

.evergreen/scripts/configure-env.sh

@@ -60,6 +60,13 @@ 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 skip_crypt_shared="${skip_crypt_shared:-}"
+export VERSION="${VERSION:-}"
+export TOPOLOGY="${TOPOLOGY:-}"
+export STORAGE_ENGINE="${STORAGE_ENGINE:-}"
+export ORCHESTRATION_FILE="${ORCHESTRATION_FILE:-}"
+export REQUIRE_API_VERSION="${REQUIRE_API_VERSION:-}"
+export LOAD_BALANCER="${LOAD_BALANCER:-}"
 
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 export PATH="$MONGODB_BINARIES:$PATH"

.evergreen/scripts/install-dependencies.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 set -o xtrace
 file="$PROJECT_DIRECTORY/.evergreen/install-dependencies.sh"
 # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
-[ -f "$file" ] && bash $file || echo "$file not available, skipping"
+[ -f "$file" ] && bash "$file" || echo "$file not available, skipping"

.evergreen/scripts/run-aws-ecs-auth-test.sh

@@ -5,9 +5,8 @@ if [ "${skip_ECS_auth_test}" = "true" ]; then
  echo "This platform does not support the ECS auth test, skipping..."
  exit 0
 fi
-. .evergreen/scripts/env.sh
 set -ex
-cd $DRIVERS_TOOLS/.evergreen/auth_aws
+cd "$DRIVERS_TOOLS"/.evergreen/auth_aws
 . ./activate-authawsvenv.sh
 . aws_setup.sh ecs
 export MONGODB_BINARIES="$MONGODB_BINARIES"

.evergreen/scripts/run-doctests.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 set -o xtrace
-PYTHON_BINARY=${PYTHON_BINARY} bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh doctest:test
+PYTHON_BINARY=${PYTHON_BINARY} bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh doctest:test

.evergreen/scripts/run-enterprise-auth-tests.sh

@@ -2,5 +2,5 @@
 
 # Disable xtrace for security reasons (just in case it was accidentally set).
 set +x
-bash ${DRIVERS_TOOLS}/.evergreen/auth_aws/setup_secrets.sh drivers/enterprise_auth
+bash "${DRIVERS_TOOLS}"/.evergreen/auth_aws/setup_secrets.sh drivers/enterprise_auth
 TEST_ENTERPRISE_AUTH=1 AUTH=auth bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh test:test-eg

.evergreen/scripts/run-load-balancer.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-. src/.evergreen/scripts/env.sh
 MONGODB_URI=${MONGODB_URI} bash "${DRIVERS_TOOLS}"/.evergreen/run-load-balancer.sh start

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

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 set -o xtrace
 export PYTHON_BINARY=${PYTHON_BINARY}
-bash ${PROJECT_DIRECTORY}/.evergreen/hatch.sh test:test-mockupdb
+bash "${PROJECT_DIRECTORY}"/.evergreen/hatch.sh test:test-mockupdb

.evergreen/scripts/run-mod-wsgi-tests.sh

@@ -2,8 +2,6 @@
 set -o xtrace
 set -o errexit
 
-. .evergreen/scripts/env.sh
-
 APACHE=$(command -v apache2 || command -v /usr/lib/apache2/mpm-prefork/apache2) || true
 if [ -n "$APACHE" ]; then
  APACHE_CONFIG=apache24ubuntu161404.conf

.evergreen/scripts/run-mongodb-aws-test.sh

@@ -3,8 +3,6 @@
 set -o xtrace
 set -o errexit # Exit the script with error if any of the commands fail
 
-set -eu
-
 ############################################
 # Main Program #
 ############################################
@@ -21,11 +19,8 @@ if [ "${skip_EC2_auth_test:-}" = "true" ] && { [ "$1" = "ec2" ] || [ "$1" = "web
  exit 0
 fi
 
-. .evergreen/scripts/env.sh
 echo "Running MONGODB-AWS authentication tests for $1"
 
-python -c "import os; print([key for key in os.environ.keys()])"
-
 # Handle credentials and environment setup.
 . "$DRIVERS_TOOLS"/.evergreen/auth_aws/aws_setup.sh "$1"
 

.evergreen/scripts/run-ocsp-test.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-set -eu
-. .evergreen/scripts/env.sh
-
 TEST_OCSP=1 \
 PYTHON_BINARY="${PYTHON_BINARY}" \
 CA_FILE="${DRIVERS_TOOLS}/.evergreen/ocsp/${OCSP_ALGORITHM}/ca.pem" \

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

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-. .evergreen/scripts/env.sh
 PROJECT_DIRECTORY=${PROJECT_DIRECTORY}
 bash "${PROJECT_DIRECTORY}"/.evergreen/run-perf-tests.sh

.evergreen/scripts/run-tests.sh

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

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

@@ -1,4 +1,4 @@
-#!/bin/bash -eu
+#!/bin/bash
 
 # Example use: bash run-with-env.sh run-tests.sh {args...}
 
@@ -9,5 +9,7 @@ else
  . src/.evergreen/scripts/env.sh
 fi
 
+set -eu
+
 # shellcheck source=/dev/null
 . "$1" "${@:2}"

.evergreen/scripts/setup-encryption.sh

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

.evergreen/scripts/teardown-aws.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. src/.evergreen/scripts/env.sh
-
 cd "${DRIVERS_TOOLS}/.evergreen/auth_aws" || exit
 if [ -f "./aws_e2e_setup.json" ]; then
  . ./activate-authawsvenv.sh