Skip to content

RUST-2024 Fix serverless CSFLE tests #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2024
Merged

RUST-2024 Fix serverless CSFLE tests #1200

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
086c6ab
rolling test result merge
abr-egn Sep 9, 2024
24fc6b9
more fixes
abr-egn Sep 10, 2024
49f728a
undo patchable
abr-egn Sep 10, 2024
d3903a9
revert drivers tools redirect
abr-egn Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .evergreen/cargo-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ cargo_test() {
TAIL_PID=$!
LOG_UNCAPTURED=${LOG_PATH} RUST_BACKTRACE=1 cargo nextest run --profile ci $(cargo_test_options $1)
((CARGO_RESULT = ${CARGO_RESULT} || $?))
mv target/nextest/ci/junit.xml $2
if [[ -f "results.xml" ]]; then
mv results.xml previous.xml
merge-junit -o results.xml previous.xml target/nextest/ci/junit.xml
else
mv target/nextest/ci/junit.xml results.xml
fi
kill ${TAIL_PID}
rm ${LOG_PATH}
}
25 changes: 16 additions & 9 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,16 +1571,23 @@ functions:
params:
working_dir: src
shell: bash
add_expansions_to_env: true
include_expansions_in_env:
- DRIVERS_TOOLS
- PROJECT_DIRECTORY
- MONGODB_URI
- MONGOCRYPT_LIB_DIR
- OPENSSL
- OS
- LD_LIBRARY_PATH
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- CSFLE_LOCAL_KEY
- CRYPT_SHARED_LIB_PATH
- DISABLE_CRYPT_SHARED
- AZURE_IMDS_MOCK_PORT
- SERVERLESS_ATLAS_USER
- SERVERLESS_ATLAS_PASSWORD
script: |
${PREPARE_SHELL}

# Exported without xtrace to avoid leaking credentials
set +o xtrace
export SERVERLESS_ATLAS_USER=${SERVERLESS_ATLAS_USER}
export SERVERLESS_ATLAS_PASSWORD=${SERVERLESS_ATLAS_PASSWORD}
set -o xtrace

export SINGLE_MONGOS_LB_URI=${SERVERLESS_URI}
. .evergreen/generate-uri.sh
export SERVERLESS=serverless
Expand Down
3 changes: 2 additions & 1 deletion .evergreen/fetch-drivers-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ if [[ -z "$DRIVERS_TOOLS" ]]; then
fi

rm -rf $DRIVERS_TOOLS
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
#git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can likely revert since mongodb-labs/drivers-evergreen-tools#491 was merged.

git clone -b RUST-2024/serverless-csfle https://github.com/abr-egn/drivers-evergreen-tools.git $DRIVERS_TOOLS
2 changes: 1 addition & 1 deletion .evergreen/run-atlas-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ source "${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh" drivers/a

set +o errexit

cargo_test atlas_connectivity results.xml
cargo_test atlas_connectivity

exit $CARGO_RESULT
12 changes: 5 additions & 7 deletions .evergreen/run-aws-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ FEATURE_FLAGS+=("aws-auth")

set +o errexit

cargo_test auth_aws auth_aws.xml
cargo_test lambda_examples::auth::test_handler lambda_handler.xml
cargo_test spec::auth spec.xml
cargo_test uri_options uri_options.xml
cargo_test connection_string connection_string.xml

merge-junit -o results.xml auth_aws.xml lambda_handler.xml spec.xml uri_options.xml connection_string.xml
cargo_test auth_aws
cargo_test lambda_examples::auth::test_handler
cargo_test spec::auth
cargo_test uri_options
cargo_test connection_string

exit $CARGO_RESULT
8 changes: 3 additions & 5 deletions .evergreen/run-connection-string-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ FEATURE_FLAGS+=("aws-auth")

set +o errexit

cargo_test spec::auth spec.xml
cargo_test uri_options uri_options.xml
cargo_test connection_string connection_string.xml

merge-junit -o results.xml spec.xml uri_options.xml connection_string.xml
cargo_test spec::auth
cargo_test uri_options
cargo_test connection_string

exit ${CARGO_RESULT}
8 changes: 3 additions & 5 deletions .evergreen/run-csfle-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ fi

set +o errexit

cargo_test test::csfle prose.xml
cargo_test test::spec::client_side_encryption spec.xml
cargo_test test::csfle
cargo_test test::spec::client_side_encryption

# Unset variables for on-demand credential failure tests.
unset AWS_ACCESS_KEY_ID
unset AWS_SECRET_ACCESS_KEY
cargo_test test::csfle::on_demand_aws_failure failure.xml

merge-junit -o results.xml prose.xml spec.xml failure.xml
cargo_test test::csfle::on_demand_aws_failure

exit ${CARGO_RESULT}
2 changes: 1 addition & 1 deletion .evergreen/run-plain-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ source .evergreen/cargo-test.sh

set +o errexit

MONGO_PLAIN_AUTH_TEST=1 cargo_test plain results.xml
MONGO_PLAIN_AUTH_TEST=1 cargo_test plain

exit $CARGO_RESULT
2 changes: 1 addition & 1 deletion .evergreen/run-search-index-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ export INDEX_MANAGEMENT_TEST_PROSE=1

set +o errexit

cargo_test test::spec::index_management results.xml
cargo_test test::spec::index_management

exit ${CARGO_RESULT}
22 changes: 10 additions & 12 deletions .evergreen/run-serverless-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@ export SERVERLESS="serverless"

set +o errexit

cargo_test test::spec::crud crud.xml
cargo_test test::spec::retryable_reads retryable_reads.xml
cargo_test test::spec::retryable_writes retryable_writes.xml
cargo_test test::spec::versioned_api versioned_api.xml
cargo_test test::spec::sessions sessions.xml
cargo_test test::spec::transactions transactions.xml
cargo_test test::spec::load_balancers load_balancers.xml
cargo_test test::cursor cursor.xml
cargo_test test::spec::collection_management coll.xml
cargo_test test::spec::command_monitoring_unified monitoring.xml

merge-junit -o results.xml crud.xml retryable_reads.xml retryable_writes.xml versioned_api.xml sessions.xml transactions.xml load_balancers.xml cursor.xml coll.xml monitoring.xml
cargo_test test::spec::crud
cargo_test test::spec::retryable_reads
cargo_test test::spec::retryable_writes
cargo_test test::spec::versioned_api
cargo_test test::spec::sessions
cargo_test test::spec::transactions
cargo_test test::spec::load_balancers
cargo_test test::cursor
cargo_test test::spec::collection_management
cargo_test test::spec::command_monitoring_unified

exit $CARGO_RESULT
2 changes: 1 addition & 1 deletion .evergreen/run-sync-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ echo "cargo test options: $(cargo_test_options)"

set +o errexit

cargo_test sync results.xml
cargo_test sync

exit $CARGO_RESULT
2 changes: 1 addition & 1 deletion .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ echo "cargo test options: $(cargo_test_options)"

set +o errexit

cargo_test "" results.xml
cargo_test ""

# cargo-nextest doesn't support doc tests
RUST_BACKTRACE=1 cargo test --doc $(cargo_test_options)
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-x509-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ export SUBJECT=$(echo "$SUBJECT" | awk '{$1=$1;print}')

set +o errexit

MONGO_X509_USER="$SUBJECT" cargo_test x509_auth results.xml
MONGO_X509_USER="$SUBJECT" cargo_test x509_auth

exit ${CARGO_RESULT}
3 changes: 2 additions & 1 deletion src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"replicaset",
"sharded",
"load-balanced"
]
],
"serverless": "forbid"
}
],
"database_name": "default",
Expand Down
1 change: 1 addition & 0 deletions src/test/spec/json/client-side-encryption/legacy/fle2v2-Rangev2-Compact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ runOn:
- minServerVersion: "8.0.0" # Require range v2 support on server.
# FLE 2 Encrypted collections are not supported on standalone.
topology: [ "replicaset", "sharded", "load-balanced" ]
serverless: forbid # Skip on serverless until CLOUDP-267864 is resolved.
database_name: "default"
collection_name: &collection_name "default"
data: []
Expand Down