Merge branch 'main' into RUST-1529-no-ff

Author: JamieTsai1024

.evergreen/aws-lambda-test/README.md

@@ -33,7 +33,7 @@ To deploy the application, you need the folllowing tools:
 
 * SAM CLI - [Install the SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
 * Docker - [Install Docker community edition](https://hub.docker.com/search/?type=edition&offering=community)
-* [Rust](https://www.rust-lang.org/) version 1.81.0 or newer
+* [Rust](https://www.rust-lang.org/) version 1.82.0 or newer
 * [cargo-lambda](https://github.com/cargo-lambda/cargo-lambda) for cross-compilation
 
 To build and deploy your application for the first time, run the following in your shell:

.evergreen/compile-only.sh

@@ -17,7 +17,7 @@ cargo $TOOLCHAIN build
 
 # Test with all features.
 if [ "$RUST_VERSION" != "" ]; then
-  cargo $TOOLCHAIN build --features openssl-tls,sync,aws-auth,zlib-compression,zstd-compression,snappy-compression,in-use-encryption,tracing-unstable
+  cargo $TOOLCHAIN build --features openssl-tls,sync,aws-auth,gssapi-auth,zlib-compression,zstd-compression,snappy-compression,in-use-encryption,tracing-unstable
 else
   cargo $TOOLCHAIN build --all-features
 fi

.evergreen/config.yml

@@ -199,8 +199,9 @@ buildvariants:
       # Configuring SSL: ssl causes errors in bootstrap mongo-orchestration.
     tasks:
       # The Stable API was introduced in MongoDB version 5.0. Drivers Evergreen Tools only supports
-      # setting REQUIRE_API_VERSION on standalones.
+      # setting REQUIRE_API_VERSION on standalones and sharded clusters.
       - .standalone !.4.0 !.4.2 !.4.4
+      - .sharded !.4.0 !.4.2 !.4.4
 
   - name: sync-api
     display_name: "Sync API"
@@ -256,6 +257,14 @@ buildvariants:
     # Limit the test to only schedule every 14 days to reduce external resource usage.
     batchtime: 20160
 
+  - name: gssapi-auth
+    display_name: "GSSAPI Authentication"
+    patchable: true
+    run_on:
+      - ubuntu2004-small
+    tasks:
+      - test-gssapi-auth
+
   - name: x509-auth
     display_name: "x509 Authentication"
     patchable: false
@@ -267,17 +276,6 @@ buildvariants:
     tasks:
       - name: test-x509-auth
 
-  # - name: serverless
-  #   display_name: "Serverless"
-  #   run_on:
-  #     - rhel80-small
-  #   expansions:
-  #     LIBMONGOCRYPT_OS: rhel-80-64-bit
-  #     AUTH: auth
-  #     SSL: ssl
-  #   tasks:
-  #     - serverless-task-group
-
   - name: oidc-linux
     display_name: "OIDC Linux"
     patchable: true
@@ -407,43 +405,6 @@ buildvariants:
 # Task Groups #
 ###############
 task_groups:
-  - name: serverless-task-group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: "fetch source"
-      - func: "create expansions"
-      - func: "prepare resources"
-      - func: "windows fix"
-      - func: "fix absolute paths"
-      - func: "init test-results"
-      - func: "make files executable"
-      - func: "install rust"
-      - func: "install junit dependencies"
-      - command: shell.exec
-        params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
-      - command: expansions.update
-        params:
-          file: serverless-expansion.yml
-    teardown_group:
-      - command: shell.exec
-        params:
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-      - func: "upload test results"
-      - func: "upload-mo-artifacts"
-      - func: "cleanup"
-
-    tasks:
-      - "test-serverless"
-      - "test-in-use-encryption-serverless"
-
   - name: azure-kms-task-group
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800 # 30 minutes
@@ -819,7 +780,7 @@ tasks:
       - func: "compile only"
         vars:
           # Our minimum supported Rust version. This should be updated whenever the MSRV is bumped.
-          RUST_VERSION: 1.81.0
+          RUST_VERSION: 1.82.0
 
   - name: check-cargo-deny
     commands:
@@ -971,6 +932,10 @@ tasks:
   #       vars:
   #         AWS_ROLE_SESSION_NAME: test
 
+  - name: test-gssapi-auth
+    commands:
+      - func: "run gssapi auth test"
+
   - name: test-atlas-connectivity
     commands:
       - func: "run atlas tests"
@@ -1012,10 +977,6 @@ tasks:
           TOPOLOGY: server
       - func: "run x509 tests"
 
-  - name: test-serverless
-    commands:
-      - func: "run serverless tests"
-
   - name: test-tokio-sync
     tags: [sync]
     commands:
@@ -1112,18 +1073,6 @@ tasks:
       - func: "start csfle servers"
       - func: "run csfle tests"
 
-  - name: test-in-use-encryption-serverless
-    commands:
-      - command: expansions.update
-        params:
-          file: src/expansion.yml
-      - command: expansions.update
-        params:
-          file: serverless-expansion.yml
-      - func: "install libmongocrypt"
-      - func: "start csfle servers"
-      - func: "run csfle serverless tests"
-
   - name: test-load-balancer-5.0
     tags: [load-balancer]
     commands:
@@ -1439,6 +1388,17 @@ functions:
         env:
           AWS_AUTH_TYPE: web-identity
 
+  "run gssapi auth test":
+    - command: subprocess.exec
+      type: test
+      params:
+        binary: bash
+        working_dir: ${PROJECT_DIRECTORY}
+        args:
+          - .evergreen/run-gssapi-tests.sh
+        include_expansions_in_env:
+          - PROJECT_DIRECTORY
+
   "run x509 tests":
     - command: shell.exec
       type: test
@@ -1578,23 +1538,6 @@ functions:
           - PROJECT_DIRECTORY
           - MONGODB_URI
 
-  "run serverless tests":
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: src
-        shell: bash
-        include_expansions_in_env:
-          - SERVERLESS_ATLAS_USER
-          - SERVERLESS_ATLAS_PASSWORD
-        script: |
-          ${PREPARE_SHELL}
-
-          export SINGLE_MONGOS_LB_URI=${SERVERLESS_URI}
-          . .evergreen/generate-uri.sh
-
-          .evergreen/run-serverless-tests.sh
-
   "run atlas tests":
     - command: ec2.assume_role
       params:
@@ -1670,35 +1613,6 @@ functions:
           - DISABLE_CRYPT_SHARED
           - AZURE_IMDS_MOCK_PORT
 
-  "run csfle serverless tests":
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: src
-        shell: bash
-        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: |
-          export SINGLE_MONGOS_LB_URI=${SERVERLESS_URI}
-          . .evergreen/generate-uri.sh
-          export SERVERLESS=serverless
-
-          .evergreen/run-csfle-tests.sh
-
   "build and upload gcp kms test":
     - command: shell.exec
       params:

.evergreen/run-gssapi-tests.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o xtrace
+set -o errexit # Exit the script with error if any of the commands fail
+
+echo "Running MONGODB-GSSAPI authentication tests"
+
+cd ${PROJECT_DIRECTORY}
+source .evergreen/env.sh
+source .evergreen/cargo-test.sh
+
+FEATURE_FLAGS+=("gssapi-auth")
+
+set +o errexit
+
+cargo_test spec::auth
+cargo_test uri_options
+cargo_test connection_string
+
+exit $CARGO_RESULT