Skip to content

Commit 8f06715

Browse files
committed
Append TLS options to LB URIs if necessary
1 parent 4521cc4 commit 8f06715

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,12 @@ functions:
297297
export KMS_TLS_CA_FILE="${client_side_encryption_kms_tls_ca_file}"
298298
export KMS_TLS_CERTIFICATE_KEY_FILE="${client_side_encryption_kms_tls_certificate_key_file}"
299299
export PATH="${PHP_PATH}/bin:$PATH"
300-
export MONGODB_SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}"
301-
export MONGODB_MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}"
302300
303301
API_VERSION=${API_VERSION} \
304302
CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
305303
MONGODB_URI="${MONGODB_URI}" \
304+
MONGODB_SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
305+
MONGODB_MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
306306
PHP_VERSION=${PHP_VERSION} \
307307
SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} \
308308
SSL=${SSL} \

.evergreen/run-tests.sh

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH:-}" # Optional path to crypt_shar
77
DRIVER_MONGODB_VERSION=${DRIVER_MONGODB_VERSION:-} # Required if IS_MATRIX_TESTING is "true"
88
IS_MATRIX_TESTING=${IS_MATRIX_TESTING:-} # Specify "true" to enable matrix testing. Defaults to empty string. If "true", DRIVER_MONGODB_VERSION and MONGODB_VERSION will also be checked.
99
MONGODB_URI=${MONGODB_URI:-} # Connection string (including credentials and topology info)
10+
MONGODB_SINGLE_MONGOS_LB_URI=${MONGODB_SINGLE_MONGOS_LB_URI:-} # Single-mongos LB connection string
11+
MONGODB_MULTI_MONGOS_LB_URI=${MONGODB_MULTI_MONGOS_LB_URI:-} # Multi-mongos LB connection string
1012
MONGODB_VERSION=${MONGODB_VERSION:-} # Required if IS_MATRIX_TESTING is "true"
1113
SKIP_CRYPT_SHARED="${SKIP_CRYPT_SHARED:-no}" # Specify "yes" to ignore CRYPT_SHARED_LIB_PATH. Defaults to "no"
1214
SSL=${SSL:-no} # Specify "yes" to enable SSL. Defaults to "no"
@@ -44,14 +46,25 @@ fi
4446
# Enable verbose output to see skipped and incomplete tests
4547
PHPUNIT_OPTS="${PHPUNIT_OPTS} -v --configuration phpunit.evergreen.xml"
4648

47-
# Determine if MONGODB_URI already has a query string
48-
SUFFIX=$(echo "$MONGODB_URI" | grep -Eo "\?(.*)" | cat)
49-
5049
if [ "$SSL" = "yes" ]; then
50+
SSL_OPTS="ssl=true&sslallowinvalidcertificates=true"
51+
52+
# Determine if MONGODB_URI already has a query string
53+
SUFFIX=$(echo "$MONGODB_URI" | grep -Eo "\?(.*)" | cat)
54+
5155
if [ -z "$SUFFIX" ]; then
52-
MONGODB_URI="${MONGODB_URI}/?ssl=true&sslallowinvalidcertificates=true"
56+
MONGODB_URI="${MONGODB_URI}/?${SSL_OPTS}"
5357
else
54-
MONGODB_URI="${MONGODB_URI}&ssl=true&sslallowinvalidcertificates=true"
58+
MONGODB_URI="${MONGODB_URI}&${SSL_OPTS}"
59+
fi
60+
61+
# Assume LB URIs already have a query string (e.g. "?loadBalanced=true")
62+
if [ -n "${MONGODB_SINGLE_MONGOS_LB_URI}" ]; then
63+
MONGODB_SINGLE_MONGOS_LB_URI="${MONGODB_SINGLE_MONGOS_LB_URI}&${SSL_OPTS}"
64+
fi
65+
66+
if [ -n "${MONGODB_MULTI_MONGOS_LB_URI}" ]; then
67+
MONGODB_MULTI_MONGOS_LB_URI="${MONGODB_MULTI_MONGOS_LB_URI}&${SSL_OPTS}"
5568
fi
5669
fi
5770

@@ -65,6 +78,8 @@ export SYMFONY_DEPRECATIONS_HELPER=999999
6578
export API_VERSION="${API_VERSION}"
6679
export CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}"
6780
export MONGODB_URI="${MONGODB_URI}"
81+
export MONGODB_SINGLE_MONGOS_LB_URI="${MONGODB_SINGLE_MONGOS_LB_URI}"
82+
export MONGODB_MULTI_MONGOS_LB_URI="${MONGODB_MULTI_MONGOS_LB_URI}"
6883

6984
# Run the tests, and store the results in a junit result file
7085
case "$TESTS" in

0 commit comments

Comments
 (0)