Skip to content

Commit c87ad16

Browse files
committed
add openssl as another auth option
1 parent d9e6468 commit c87ad16

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

.evergreen/config.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ functions:
378378
SINGLE_THREAD=${SINGLE_THREAD} \
379379
ASYNC_RUNTIME=${ASYNC_RUNTIME} \
380380
MONGODB_API_VERSION=${MONGODB_API_VERSION} \
381+
TLS_FEATURE=${TLS_FEATURE} \
381382
.evergreen/run-tests.sh
382383
383384
"run serverless tests":
@@ -405,6 +406,7 @@ functions:
405406
SINGLE_THREAD=${SINGLE_THREAD} \
406407
ASYNC_RUNTIME=${ASYNC_RUNTIME} \
407408
MONGODB_API_VERSION=${MONGODB_API_VERSION} \
409+
TLS_FEATURE=${TLS_FEATURE} \
408410
.evergreen/run-serverless-tests.sh
409411
410412
"run atlas tests":
@@ -1352,15 +1354,23 @@ axes:
13521354
display_name: Authentication and TLS
13531355
values:
13541356
- id: "auth-and-tls"
1355-
display_name: Auth TLS
1357+
display_name: Auth TLS (Default)
13561358
variables:
13571359
AUTH: "auth"
13581360
SSL: "ssl"
1361+
TLS_FEATURE: ""
1362+
- id: "openssl-auth-and-tls"
1363+
display_name: Auth TLS (OpenSSL)
1364+
variables:
1365+
AUTH: "auth"
1366+
SSL: "ssl"
1367+
TLS_FEATURE: "openssl-tls"
13591368
- id: "noauth-and-notls"
13601369
display_name: NoAuth NoTLS
13611370
variables:
13621371
AUTH: "noauth"
13631372
SSL: "nossl"
1373+
TLS_FEATURE: ""
13641374

13651375
- id: "tls-crate"
13661376
display_name: TLS crate
@@ -1553,10 +1563,11 @@ buildvariants:
15531563
- ubuntu-18.04-arm64
15541564
- macos-10.14
15551565
- windows-64-vs2017
1556-
auth-and-tls: "auth-and-tls"
1557-
tls-crate: "*"
1566+
auth-and-tls:
1567+
- auth-and-tls
1568+
- openssl-auth-and-tls
15581569
async-runtime: "*"
1559-
display_name: "${os} X.509 auth (${tls-crate}) with ${async-runtime}"
1570+
display_name: "${os} X.509 ${auth-and-tls} with ${async-runtime}"
15601571
tasks:
15611572
- "test-x509-auth"
15621573

.evergreen/run-async-std-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ echo "cargo test options: ${OPTIONS}"
1616
set +o errexit
1717
CARGO_EXIT=0
1818

19-
RUST_BACKTRACE=1 cargo test --no-default-features --features async-std-runtime $OPTIONS | tee async-tests.json
19+
RUST_BACKTRACE=1 cargo test --no-default-features --features async-std-runtime,${TLS_FEATURE} $OPTIONS | tee async-tests.json
2020
(( CARGO_EXIT = CARGO_EXIT || $? ))
2121
cat async-tests.json | cargo2junit > async-tests.xml
22-
RUST_BACKTRACE=1 cargo test sync --no-default-features --features sync $OPTIONS | tee sync-tests.json
22+
RUST_BACKTRACE=1 cargo test sync --no-default-features --features sync,${TLS_FEATURE} $OPTIONS | tee sync-tests.json
2323
(( CARGO_EXIT = CARGO_EXIT || $? ))
2424
cat sync-tests.json | cargo2junit > sync-tests.xml
25-
RUST_BACKTRACE=1 cargo test --doc sync --no-default-features --features sync $OPTIONS | tee sync-doc-tests.json
25+
RUST_BACKTRACE=1 cargo test --doc sync --no-default-features --features sync,${TLS_FEATURE} $OPTIONS | tee sync-doc-tests.json
2626
(( CARGO_EXIT = CARGO_EXIT || $? ))
2727
cat sync-doc-tests.json | cargo2junit > sync-doc-tests.xml
2828

.evergreen/run-serverless-tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ if [ "$SINGLE_THREAD" = true ]; then
2222
OPTIONS="$OPTIONS --test-threads=1"
2323
fi
2424

25+
FEATURE_FLAGS=${FEATURE_FLAGS},${TLS_FEATURE}
26+
2527
echo "cargo test options: ${DEFAULT_FEATURES} --features $FEATURE_FLAGS ${OPTIONS}"
2628

2729
cargo_test() {

.evergreen/run-tokio-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [ "$SINGLE_THREAD" = true ]; then
1111
OPTIONS="$OPTIONS --test-threads=1"
1212
fi
1313

14-
FEATURE_FLAGS="zstd-compression,snappy-compression,zlib-compression"
14+
FEATURE_FLAGS="zstd-compression,snappy-compression,zlib-compression,${TLS_FEATURE}"
1515

1616
echo "cargo test options: --features $FEATURE_FLAGS ${OPTIONS}"
1717

0 commit comments

Comments
 (0)