RUST-2055 Use cargo-nextest to filter CSFLE tests (#1306)

Author: isabelatkinson

.evergreen/config.yml

@@ -238,7 +238,7 @@ buildvariants:
 
   - name: gcp-kms
     display_name: "GCP KMS"
-    patchable: false
+    # patchable: false
     run_on:
       # The GCP CLI is not available on RHEL/Ubuntu machines.
       - debian11-small
@@ -1678,25 +1678,21 @@ functions:
           echo "Untarring test contents ... end"
 
   "run gcp kms test":
-    - command: shell.exec
+    - command: subprocess.exec
       type: test
       params:
-        working_dir: src
-        shell: bash
-        script: |
-          ${PREPARE_SHELL}
-
-          set +o xtrace
-          export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
-          export GCPKMS_PROJECT=${GCPKMS_PROJECT}
-          export GCPKMS_ZONE=${GCPKMS_ZONE}
-          export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
-          set -o xtrace
-
-          export GCPKMS_CMD="ON_DEMAND_GCP_CREDS_SHOULD_SUCCEED=1 \
-            RUST_BACKTRACE=1 LD_LIBRARY_PATH=./test-contents/lib \
-            ./test-contents/test-exe on_demand_gcp_credentials --nocapture"
-          $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
+        working_dir: ${DRIVERS_TOOLS}
+        binary: bash
+        include_expansions_in_env:
+          - GCPKMS_GCLOUD
+          - GCPKMS_PROJECT
+          - GCPKMS_ZONE
+          - GCPKMS_INSTANCENAME
+          - DRIVERS_TOOLS
+        env:
+          GCPKMS_CMD: "RUST_BACKTRACE=1 LD_LIBRARY_PATH=./test-contents/lib ./test-contents/test-exe on_demand_gcp::success -- --no-capture"
+        args:
+          - .evergreen/csfle/gcpkms/run-command.sh
 
   "assume ec2 role":
     - command: ec2.assume_role

.evergreen/run-csfle-tests.sh

@@ -10,7 +10,8 @@ set -o xtrace
 
 export CSFLE_TLS_CERT_DIR="${DRIVERS_TOOLS}/.evergreen/x509gen"
 
-FEATURE_FLAGS+=("in-use-encryption" "aws-auth" "azure-kms")
+FEATURE_FLAGS+=("in-use-encryption" "azure-kms")
+CARGO_OPTIONS+=("--ignore-default-filter")
 
 if [[ "$OPENSSL" = true ]]; then
   FEATURE_FLAGS+=("openssl-tls")
@@ -32,9 +33,12 @@ set +o errexit
 cargo_test test::csfle
 cargo_test test::spec::client_side_encryption
 
+FEATURE_FLAGS+=("aws-auth")
+cargo_test on_demand_aws::success
+
 # 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
+cargo_test on_demand_aws::failure
 
 exit ${CARGO_RESULT}

src/test.rs

@@ -18,7 +18,8 @@ mod coll;
 ))]
 mod compression;
 #[cfg(feature = "in-use-encryption")]
-pub(crate) mod csfle;
+#[path = "test/csfle.rs"]
+pub(crate) mod csfle_skip_local; // see modules for requirements
 mod cursor;
 mod db;
 mod documentation_examples;
@@ -30,6 +31,8 @@ pub(crate) mod spec;
 mod timeseries;
 pub(crate) mod util;
 
+#[cfg(feature = "in-use-encryption")]
+pub(crate) use self::csfle_skip_local as csfle;
 pub(crate) use self::{
     spec::{run_spec_test, RunOn, Serverless, Topology},
     util::{