encryption

Author: abr-egn

.evergreen/build-nextest-archive.sh

@@ -10,4 +10,8 @@ FEATURE_FLAGS+=("${STANDARD_FEATURES[@]}")
 
 add_conditional_features
 
+if [[ "$IN_USE_ENCRYPTION" = true ]]; then
+    FEATURE_FLAGS+=("in-use-encryption" "azure-kms" "text-indexes-unstable" "aws-auth")
+fi
+
 cargo nextest archive --workspace $(features_option) --archive-file nextest-archive.tar.zst

.evergreen/cargo-test.sh

@@ -6,8 +6,22 @@ CARGO_RESULT=0
 
 . .evergreen/features.sh
 
+if [[ "$USE_NEXTEST_ARCHIVE" = true ]]; then
+  WORKSPACE_ROOT="$(pwd)"
+  if [[ "Windows_NT" = "$OS" ]]; then
+    WORKSPACE_ROOT="$(cygpath -w ${WORKSPACE_ROOT})"
+  fi
+  CARGO_OPTIONS+=("--archive-file" "nextest-archive.tar.zst" "--workspace-remap" "${WORKSPACE_ROOT}")
+fi
+
+
 cargo_test_options() {
-  echo $1 ${CARGO_OPTIONS[@]} $(features_option) -- ${TEST_OPTIONS[@]}
+  FEATURES="$(features_option)"
+  if [[ "$USE_NEXTEST_ARCHIVE" = true ]]; then
+    # Feature flags are set when the archive is built
+    FEATURES=""
+  fi
+  echo $1 ${CARGO_OPTIONS[@]} "${FEATURES}" -- ${TEST_OPTIONS[@]}
 }
 
 cargo_test() {

.evergreen/config.yml

@@ -363,7 +363,9 @@ buildvariants:
       LIBMONGOCRYPT_OS: rhel-80-64-bit
       AUTH: auth
       SSL: ssl
+      IN_USE_ENCRYPTION: true
     tasks:
+      - name: build-nextest-archive
       - .in-use-encryption
 
   - name: in-use-encryption-disable-crypt-shared
@@ -376,7 +378,9 @@ buildvariants:
       AUTH: auth
       SSL: ssl
       DISABLE_CRYPT_SHARED: true
+      IN_USE_ENCRYPTION: true
     tasks:
+      - name: build-nextest-archive
       - .in-use-encryption
 
   - name: in-use-encryption-openssl
@@ -388,8 +392,10 @@ buildvariants:
       AUTH: auth
       SSL: ssl
       OPENSSL: true
+      IN_USE_ENCRYPTION: true
     tasks:
-      - test-in-use-encryption-openssl
+      - name: build-nextest-archive
+      - test-in-use-encryption-rapid
 
   - name: load-balancer
     display_name: "Load Balancer"
@@ -1084,7 +1090,10 @@ tasks:
 
   - name: test-in-use-encryption-4.2
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1095,7 +1104,10 @@ tasks:
 
   - name: test-in-use-encryption-4.4
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1106,7 +1118,10 @@ tasks:
 
   - name: test-in-use-encryption-5.0
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1117,7 +1132,10 @@ tasks:
 
   - name: test-in-use-encryption-6.0
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1128,7 +1146,10 @@ tasks:
 
   - name: test-in-use-encryption-7.0
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1139,7 +1160,10 @@ tasks:
 
   - name: test-in-use-encryption-rapid
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1150,7 +1174,10 @@ tasks:
 
   - name: test-in-use-encryption-latest
     tags: [in-use-encryption]
+    depends_on:
+      - name: build-nextest-archive
     commands:
+      - func: "fetch nextest archive"
       - func: "install libmongocrypt"
       - func: "bootstrap mongo-orchestration"
         vars:
@@ -1159,16 +1186,6 @@ tasks:
       - func: "start csfle servers"
       - func: "run csfle tests"
 
-  - name: test-in-use-encryption-openssl
-    commands:
-      - func: "install libmongocrypt"
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          MONGODB_VERSION: rapid
-          TOPOLOGY: replica_set
-      - func: "start csfle servers"
-      - func: "run csfle tests"
-
   - name: test-load-balancer-5.0
     tags: [load-balancer]
     commands:
@@ -1326,6 +1343,7 @@ tasks:
 
   - name: build-nextest-archive
     commands:
+    - func: "install libmongocrypt"
     - command: subprocess.exec
       type: setup
       params:
@@ -1339,6 +1357,9 @@ tasks:
           - ZSTD
           - ZLIB
           - SNAPPY
+          - IN_USE_ENCRYPTION
+          - MONGOCRYPT_LIB_DIR
+          - LD_LIBRARY_PATH
     - command: s3.put
       type: setup
       params:
@@ -1603,6 +1624,7 @@ functions:
 
   "bootstrap mongo-orchestration":
     - command: subprocess.exec
+      type: setup
       params:
         binary: sh
         args:
@@ -1735,6 +1757,8 @@ functions:
         binary: bash
         args:
           - .evergreen/run-csfle-tests.sh
+        env:
+          USE_NEXTEST_ARCHIVE: "true"
         include_expansions_in_env:
           - DRIVERS_TOOLS
           - PROJECT_DIRECTORY
@@ -2022,3 +2046,14 @@ functions:
         - AWS_ACCESS_KEY_ID
         - AWS_SECRET_ACCESS_KEY
         - AWS_SESSION_TOKEN
+  
+  "fetch nextest archive":
+  - command: s3.get
+    type: setup
+    params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-nextest-archive.tar.zst
+        bucket: mciuploads
+        local_file: src/nextest-archive.tar.zst
+        optional: true

.evergreen/generate-tasks/src/main.rs

@@ -23,17 +23,7 @@ tasks:"
       - name: build-nextest-archive
         patch_optional: true
     commands:
-      - command: s3.get
-        type: setup
-        params:
-            aws_key: ${{aws_key}}
-            aws_secret: ${{aws_secret}}
-            remote_file: \
-                 ${{UPLOAD_BUCKET}}/${{build_variant}}/${{revision}}/\
-                 ${{build_id}}-nextest-archive.tar.zst
-            bucket: mciuploads
-            local_file: src/nextest-archive.tar.zst
-            optional: true
+      - func: \"fetch nextest archive\"
       - func: \"bootstrap mongo-orchestration\"
         type: setup
         vars:

.evergreen/run-csfle-tests.sh

@@ -10,13 +10,8 @@ set -o xtrace
 
 export CSFLE_TLS_CERT_DIR="${DRIVERS_TOOLS}/.evergreen/x509gen"
 
-FEATURE_FLAGS+=("in-use-encryption" "azure-kms" "text-indexes-unstable")
 CARGO_OPTIONS+=("--ignore-default-filter")
 
-if [[ "$OPENSSL" = true ]]; then
-  FEATURE_FLAGS+=("openssl-tls")
-fi
-
 if [ "$OS" = "Windows_NT" ]; then
   export CSFLE_TLS_CERT_DIR=$(cygpath ${CSFLE_TLS_CERT_DIR} --windows)
   export SSL_CERT_FILE=$(cygpath /etc/ssl/certs/ca-bundle.crt --windows)
@@ -28,16 +23,16 @@ fi
 # Add mongodb binaries to path for mongocryptd
 PATH=${PATH}:${DRIVERS_TOOLS}/mongodb/bin
 
+set -o xtrace
 set +o errexit
 
+TEST_OPTIONS=("--skip" "on_demand_aws::failure")
 cargo_test test::csfle
 
-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
+TEST_OPTIONS=()
 cargo_test on_demand_aws::failure
 
 exit ${CARGO_RESULT}

.evergreen/run-tests.sh

@@ -10,16 +10,6 @@ FEATURE_FLAGS+=("${STANDARD_FEATURES[@]}")
 
 add_conditional_features
 
-if [ "$USE_NEXTEST_ARCHIVE" = true ]; then
-  # Feature flags are set when the archive is built
-  WORKSPACE_ROOT="$(pwd)"
-  if [ "Windows_NT" == "$OS" ]; then
-    WORKSPACE_ROOT="$(cygpath -w ${WORKSPACE_ROOT})"
-  fi
-  FEATURE_FLAGS=()
-  CARGO_OPTIONS+=("--archive-file" "nextest-archive.tar.zst" "--workspace-remap" "${WORKSPACE_ROOT}")
-fi
-
 echo "cargo test options: $(cargo_test_options)"
 
 set +o errexit