Sync with master

.evergreen/atlas

@@ -0,0 +1 @@
+../.mod/drivers-evergreen-tools/.evergreen/atlas

.evergreen/config.yml

@@ -123,7 +123,14 @@ functions:
  export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
  export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
  export RVM_RUBY="${RVM_RUBY}"
- export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
+
+ if [[ -n "${USE_PROXY_SERVERLESS}" ]];
+ then
+ export SERVERLESS_DRIVERS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
+ else
+ export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
+ fi
+
  export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
  export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
  export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
@@ -179,7 +186,7 @@ functions:
  IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}"
  IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}"
  IAM_AUTH_ECS_SUBNET_B="${iam_auth_ecs_subnet_b}"
- IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition}"
+ IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition_ubuntu2004}"
 
  IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}"
  IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}"
@@ -453,7 +460,7 @@ functions:
  working_dir: "src"
  script: |
  ${PREPARE_SHELL}
- SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
+ CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
 
 pre:
  - func: "fetch source"
@@ -482,6 +489,8 @@ task_groups:
  script: |
  ${PREPARE_SHELL}
 
+ echo "Setting up Atlas cluster"
+
  DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
  DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
  DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
@@ -492,6 +501,8 @@ task_groups:
  task_id="${task_id}" \
  execution="${execution}" \
  $DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
+
+ echo "MONGODB_URI=${MONGODB_URI}"
  - command: expansions.update
  params:
  file: src/atlas-expansion.yml
@@ -513,6 +524,52 @@ task_groups:
  tasks:
  - test-full-atlas-task
 
+ - name: test_aws_lambda_task_group
+ setup_group_can_fail_task: true
+ setup_group_timeout_secs: 1800 # 30 minutes
+ setup_group:
+ - func: fetch source
+ - func: create expansions
+ - command: shell.exec
+ params:
+ shell: "bash"
+ working_dir: "src"
+ script: |
+ ${PREPARE_SHELL}
+
+ echo "Setting up Atlas cluster"
+
+ DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
+ DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
+ DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
+ DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
+ DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
+ LAMBDA_STACK_NAME="dbx-ruby-lambda" \
+ MONGODB_VERSION="7.0" \
+ task_id="${task_id}" \
+ execution="${execution}" \
+ $DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
+ - command: expansions.update
+ params:
+ file: src/atlas-expansion.yml
+ teardown_group:
+ - command: shell.exec
+ params:
+ shell: "bash"
+ working_dir: "src"
+ script: |
+ ${PREPARE_SHELL}
+
+ DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
+ DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
+ DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
+ LAMBDA_STACK_NAME="dbx-ruby-lambda" \
+ task_id="${task_id}" \
+ execution="${execution}" \
+ $DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
+ tasks:
+ - test-aws-lambda-deployed
+
  - name: testgcpkms_task_group
  setup_group_can_fail_task: true
  setup_group_timeout_secs: 1800 # 30 minutes
@@ -702,6 +759,38 @@ tasks:
  export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
  export AZUREKMS_PRIVATEKEYPATH="/tmp/testazurekms_private_key_file"
  AZUREKMS_CMD="TEST_FLE_AZURE_AUTO=1 RVM_RUBY=ruby-3.1 FLE=helper TOPOLOGY=standalone MONGODB_VERSION=6.0 MONGO_RUBY_DRIVER_AZURE_TENANT_ID="${MONGO_RUBY_DRIVER_AZURE_TENANT_ID}" MONGO_RUBY_DRIVER_AZURE_CLIENT_ID="${MONGO_RUBY_DRIVER_AZURE_CLIENT_ID}" MONGO_RUBY_DRIVER_AZURE_CLIENT_SECRET="${MONGO_RUBY_DRIVER_AZURE_CLIENT_SECRET}" MONGO_RUBY_DRIVER_AZURE_IDENTITY_PLATFORM_ENDPOINT="${MONGO_RUBY_DRIVER_AZURE_IDENTITY_PLATFORM_ENDPOINT}" MONGO_RUBY_DRIVER_AZURE_KEY_VAULT_ENDPOINT="${testazurekms_keyvaultendpoint}" MONGO_RUBY_DRIVER_AZURE_KEY_NAME="${testazurekms_keyname}" ./.evergreen/run-tests-azure.sh" .evergreen/csfle/azurekms/run-command.sh
+
+ - name: "test-aws-lambda-deployed"
+ commands:
+ - command: ec2.assume_role
+ params:
+ role_arn: ${LAMBDA_AWS_ROLE_ARN}
+ duration_seconds: 3600
+ - command: shell.exec
+ type: test
+ params:
+ working_dir: "src"
+ shell: "bash"
+ script: |
+ ${PREPARE_SHELL}
+ export MONGODB_URI=${MONGODB_URI}
+ .evergreen/run-tests-deployed-lambda.sh
+ env:
+ TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/spec/faas/ruby-sam-app
+ AWS_REGION: us-east-1
+ PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
+ DRIVERS_TOOLS: ${DRIVERS_TOOLS}
+ DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
+ DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
+ DRIVERS_ATLAS_LAMBDA_USER: ${DRIVERS_ATLAS_LAMBDA_USER}
+ DRIVERS_ATLAS_LAMBDA_PASSWORD: ${DRIVERS_ATLAS_LAMBDA_PASSWORD}
+ DRIVERS_ATLAS_GROUP_ID: ${DRIVERS_ATLAS_GROUP_ID}
+ AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+ AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+ AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
+ LAMBDA_STACK_NAME: "dbx-ruby-lambda"
+ RVM_RUBY: ruby-3.2
+ MONGODB_URI: ${MONGODB_URI}
 axes:
 
  - id: preload
@@ -890,7 +979,7 @@ axes:
  display_name: jruby-9.4
  variables:
  RVM_RUBY: "jruby-9.4"
- 
+
  - id: "os"
  display_name: OS
  values:
@@ -900,6 +989,9 @@ axes:
  - id: ubuntu2204
  display_name: "Ubuntu 22.04"
  run_on: ubuntu2204-small
+ - id: ubuntu2004
+ display_name: "Ubuntu 20.04"
+ run_on: ubuntu2004-small
  - id: rhel8
  display_name: "RHEL 8"
  run_on: rhel80-small
@@ -1112,6 +1204,16 @@ axes:
  - id: no
  display_name: No
 
+ - id: serverless-project
+ display_name: serverless project
+ values:
+ - id: original
+ display_name: Original
+ - id: proxy
+ display_name: Proxy
+ variables:
+ USE_PROXY_SERVERLESS: 1
+
 buildvariants:
  - matrix_name: "auth/ssl"
  matrix_spec:
@@ -1304,24 +1406,21 @@ buildvariants:
  tasks:
  - name: "test-mlaunch"
 
- # The X.509 tests are failing with exceptions being expected, but never
- # raised. (RUBY-3267)
- #
- # - matrix_name: "x509-tests"
- # matrix_spec:
- # auth-and-ssl: "x509"
- # ruby: "ruby-3.2"
- # # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
- # # the server for certain auth mechanisms. Once run-tests.sh is made smart
- # # enough to install mongosh, and then use either mongo or mongosh
- # # (depending on server version and what's available), we can bump this to
- # # the latest stable db version.
- # mongodb-version: "5.3"
- # topology: standalone
- # os: rhel8
- # display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
- # tasks:
- # - name: "test-mlaunch"
+ - matrix_name: "x509-tests"
+ matrix_spec:
+ auth-and-ssl: "x509"
+ ruby: "ruby-3.2"
+ # needs the latest_5x_mdb because run-tests.sh uses `mongo` to configure
+ # the server for certain auth mechanisms. Once run-tests.sh is made smart
+ # enough to install mongosh, and then use either mongo or mongosh
+ # (depending on server version and what's available), we can bump this to
+ # the latest stable db version.
+ mongodb-version: "5.3"
+ topology: standalone
+ os: rhel8
+ display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
+ tasks:
+ - name: "test-mlaunch"
 
  - matrix_name: "jruby-auth"
  matrix_spec:
@@ -1451,7 +1550,7 @@ buildvariants:
  # (depending on server version and what's available), we can bump this to
  # the latest stable db version.
  mongodb-version: "5.3"
- os: rhel8
+ os: ubuntu2004
  display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
  tasks:
  - name: "test-aws-auth"
@@ -1689,6 +1788,15 @@ buildvariants:
  ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
  fle: path
  os: rhel8
- display_name: "Atlas serverless ${ruby} single mongos"
+ serverless-project: [ original, proxy ]
+ display_name: "Atlas serverless ${ruby} ${serverless-project}"
  tasks:
  - name: test-serverless
+
+ - matrix_name: "aws-lambda"
+ matrix_spec:
+ ruby: "ruby-3.2"
+ os: ubuntu2204
+ display_name: "AWS Lambda"
+ tasks:
+ - name: test_aws_lambda_task_group

.evergreen/config/axes.yml.erb

@@ -186,7 +186,7 @@ axes:
  display_name: jruby-9.4
  variables:
  RVM_RUBY: "jruby-9.4"
- 
+
  - id: "os"
  display_name: OS
  values:
@@ -196,6 +196,9 @@ axes:
  - id: ubuntu2204
  display_name: "Ubuntu 22.04"
  run_on: ubuntu2204-small
+ - id: ubuntu2004
+ display_name: "Ubuntu 20.04"
+ run_on: ubuntu2004-small
  - id: rhel8
  display_name: "RHEL 8"
  run_on: rhel80-small
@@ -402,3 +405,13 @@ axes:
  API_VERSION_REQUIRED: 1
  - id: no
  display_name: No
+
+ - id: serverless-project
+ display_name: serverless project
+ values:
+ - id: original
+ display_name: Original
+ - id: proxy
+ display_name: Proxy
+ variables:
+ USE_PROXY_SERVERLESS: 1