handle spaces in variables

blink1073 · Sep 13, 2024 · 79c2b13 · 79c2b13
1 parent 3939570
commit 79c2b13
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 38 deletions.
diff --git a/.evergreen/run-deployed-lambda-aws-tests.sh b/.evergreen/run-deployed-lambda-aws-tests.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 source ${DRIVERS_TOOLS}/.evergreen/atlas/secrets-export.sh
 

diff --git a/.evergreen/run-fuzz.sh b/.evergreen/run-fuzz.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 FUZZTIME=10m
 

diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh
@@ -3,8 +3,8 @@
 # Script to set up encryption assets and servers.
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 if [[ -z "$1" ]]; then
     echo "usage: $0 <MONGODB_URI>"

diff --git a/.evergreen/run-mongodb-aws-test.sh b/.evergreen/run-mongodb-aws-test.sh
@@ -3,8 +3,8 @@
 # Script to set up encryption assets and servers.
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 # Supported/used environment variables:
 #  MONGODB_URI    Set the URI, including an optional username/password to use

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 export PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib64/pkgconfig
 export LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib64

diff --git a/etc/check_fmt.sh b/etc/check_fmt.sh
@@ -3,8 +3,8 @@
 # Runs go fmt on all packages in the repo and checks that *_example_test.go files have wrapped lines.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 gofmt_out="$(go fmt ./...)"
 

diff --git a/etc/check_modules.sh b/etc/check_modules.sh
@@ -5,8 +5,8 @@
 # tidy" and expect that no unrelated changes are made to the "go.mod" file.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 mods=$(find . -name go.mod)
 exit_code=0

diff --git a/etc/compile_check.sh b/etc/compile_check.sh
@@ -6,8 +6,8 @@ GC=go
 COMPILE_CHECK_DIR="internal/cmd/compilecheck"
 DEV_MIN_VERSION=1.19
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 # version will flatten a version string of upto 4 components for inequality
 # comparison.

diff --git a/etc/install-libmongocrypt.sh b/etc/install-libmongocrypt.sh
@@ -3,8 +3,8 @@
 # This script installs libmongocrypt into an "install" directory.
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 LIBMONGOCRYPT_TAG="1.11.0"
 

diff --git a/etc/run-atlas-test.sh b/etc/run-atlas-test.sh
@@ -4,8 +4,8 @@
 set -eu
 set +x
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 # Get the atlas secrets.
 . ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect

diff --git a/etc/run-awskms-test.sh b/etc/run-awskms-test.sh
@@ -3,8 +3,8 @@
 # Runs the awskms test.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 echo "Building build-kms-test ... begin"
 BUILD_TAGS="-tags=cse" \

diff --git a/etc/run-enterprise-gssapi-test.sh b/etc/run-enterprise-gssapi-test.sh
@@ -3,8 +3,8 @@
 # Runs the enterprise auth tests with gssapi credentials.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 . ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/enterprise_auth
 if [ "Windows_NT" = "${OS:-}" ]; then

diff --git a/etc/run-enterprise-plain-test.sh b/etc/run-enterprise-plain-test.sh
@@ -3,8 +3,8 @@
 # Runs the enterprise auth tests with plain credentials.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 . ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/enterprise_auth
 export MONGODB_URI="mongodb://${SASL_USER}:${SASL_PASS}@${SASL_HOST}:${SASL_PORT}/ldap?authMechanism=PLAIN"

diff --git a/etc/run-oidc-remote-test.sh b/etc/run-oidc-remote-test.sh
@@ -3,8 +3,8 @@
 # Runs oidc auth remote tests.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 OIDC_DRIVERS_TAR_FILE=/tmp/mongo-go-driver.tar.gz
 # we need to statically link libc to avoid the situation where the VM has a different

diff --git a/etc/run-oidc-test.sh b/etc/run-oidc-test.sh
@@ -7,8 +7,8 @@ echo "Running MONGODB-OIDC authentication tests"
 
 OIDC_ENV="${OIDC_ENV:-"test"}"
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 if [ $OIDC_ENV == "test" ]; then
     # Make sure DRIVERS_TOOLS is set.

diff --git a/etc/run-serverless-test.sh b/etc/run-serverless-test.sh
@@ -3,8 +3,8 @@
 # Runs the serverless tests.
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh
 AUTH="auth" \

diff --git a/etc/run.sh b/etc/run.sh
@@ -3,8 +3,8 @@
 # Go Driver task runner
 set -eu
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 TEST_TIMEOUT=1800
 

diff --git a/etc/run_docker.sh b/etc/run_docker.sh
@@ -3,8 +3,8 @@
 # Script to run a test suite in docker locally
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 if [ -z "$DRIVERS_TOOLS" ]; then
     echo "Please set DRIVERS_TOOLS env variable."

diff --git a/etc/setup-encryption.sh b/etc/setup-encryption.sh
@@ -3,8 +3,8 @@
 # Script to set up encryption assets and servers.
 set -eux
 
-# Source .env file if it exists
-test -f .env && export $(grep -v '^#' .env | xargs -0) || true
+# Source .env file if it exists.
+. ./etc/dotenv.sh
 
 if [ -z "$DRIVERS_TOOLS" ]; then
     echo "Please define DRIVERS_TOOLS variable"