add files

Author: blink1073

.evergreen/config.yml

@@ -293,27 +293,7 @@ functions:
     - command: ec2.assume_role
       params:
         role_arn: ${aws_test_secrets_role}
-
-  "setup atlas":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        include_expansions_in_env: ["task_id", "execution"]
-        env:
-          MONGODB_VERSION: "7.0"
-          LAMBDA_STACK_NAME: dbx-python-lambda
-        args:
-          - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
-    - command: expansions.update
-      params:
-        file: atlas-expansion.yml
-
-  "teardown atlas":
-    - command: subprocess.exec
-      params:
-        binary: bash
-        args:
-          - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
+        duration_seconds: 3600
 
   "run perf tests":
     - command: subprocess.exec
@@ -350,31 +330,6 @@ post:
   - func: "upload test results"
   - func: "cleanup"
 
-task_groups:
-  - name: test_aws_lambda_task_group
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - func: setup atlas
-    teardown_task:
-      - func: teardown atlas
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-      - test-aws-lambda-deployed
-
-  - name: test_atlas_task_group_search_indexes
-    setup_group:
-      - func: fetch source
-      - func: setup system
-      - func: setup atlas
-    teardown_task:
-      - func: teardown atlas
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800
-    tasks:
-      - test-search-index-helpers
-
 tasks:
     # Wildcard task. Do you need to find out what tools are available and where?
     # Throw it here, and execute this task on all buildvariants
@@ -401,17 +356,6 @@ tasks:
         - func: "run server"
         - func: "run doctests"
 
-    - name: "test-search-index-helpers"
-      commands:
-        - func: "run server"
-          vars:
-            VERSION: "6.0"
-            TOPOLOGY: "replica_set"
-        - func: "run tests"
-          vars:
-            TEST_NAME: index_management
-            AUTH: "auth"
-
     - name: "mod-wsgi-standalone"
       tags: ["mod_wsgi"]
       commands:
@@ -467,22 +411,6 @@ tasks:
           vars:
             TEST_NAME: "data_lake"
 
-    - name: "test-aws-lambda-deployed"
-      commands:
-        - command: ec2.assume_role
-          params:
-            role_arn: ${LAMBDA_AWS_ROLE_ARN}
-            duration_seconds: 3600
-        - command: subprocess.exec
-          params:
-            working_dir: src
-            binary: bash
-            add_expansions_to_env: true
-            args:
-              - .evergreen/run-deployed-lambda-aws-tests.sh
-            env:
-              TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
-
 # }}}
     - name: "coverage-report"
       tags: ["coverage"]
@@ -637,12 +565,6 @@ buildvariants:
       batchtime: 10080  # 7 days
     - name: test-azurekms-fail
 
-- name: rhel8-test-lambda
-  display_name: FaaS Lambda
-  run_on: rhel87-small
-  tasks:
-    - name: test_aws_lambda_task_group
-
 - name: rhel8-import-time
   display_name: Import Time
   run_on: rhel87-small

.evergreen/generated_configs/tasks.yml

@@ -8,6 +8,16 @@ tasks:
           TEST_NAME: atlas_connect
     tags: [atlas_connect]
 
+  # Aws lambda tests
+  - name: test-aws-lambda-deployed
+    commands:
+      - func: assume ec2 role
+      - func: setup atlas
+      - func: run tests
+        vars:
+          TEST_NAME: aws_lambda
+    tags: [aws_lambda]
+
   # Aws tests
   - name: test-auth-aws-4.4-regular
     commands:
@@ -696,11 +706,13 @@ tasks:
         vars:
           TEST_NAME: enterprise_auth
           AUTH: auth
+          FOO: ${THIS THING}
       - func: assume ec2 role
       - func: run tests
         vars:
           TEST_NAME: enterprise_auth
           AUTH: auth
+          FOO: ${THIS THING}
     tags: [enterprise_auth]
 
   # Kms tests
@@ -1109,6 +1121,19 @@ tasks:
           SUB_TEST_NAME: gke
     tags: [auth_oidc, auth_oidc_remote]
 
+  # Search index tests
+  - name: test-search-index-helpers
+    commands:
+      - func: assume ec2 role
+      - func: setup atlas
+      - func: run server
+        vars:
+          TEST_NAME: index_management
+      - func: run tests
+        vars:
+          TEST_NAME: index_management
+    tags: [index_managment]
+
   # Server tests
   - name: test-4.0-standalone-auth-ssl-sync
     commands:

.evergreen/generated_configs/variants.yml

@@ -154,6 +154,14 @@ buildvariants:
     expansions:
       PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 
+  # Aws lambda tests
+  - name: faas-lambda
+    tasks:
+      - name: .aws_lambda
+    display_name: FaaS Lambda
+    run_on:
+      - rhel87-small
+
   # Compression tests
   - name: compression-snappy-rhel8-python3.9-no-c
     tasks:
@@ -1005,7 +1013,7 @@ buildvariants:
   # Search index tests
   - name: search-index-helpers-rhel8-python3.9
     tasks:
-      - name: test_atlas_task_group_search_indexes
+      - name: .index_management
     display_name: Search Index Helpers RHEL8 Python3.9
     run_on:
       - rhel87-small

.evergreen/run-deployed-lambda-aws-tests.sh

@@ -680,7 +680,7 @@ def create_search_index_variants():
     python = CPYTHONS[0]
     return [
         create_variant(
-            ["test_atlas_task_group_search_indexes"],
+            [".index_management"],
             get_display_name("Search Index Helpers", host, python=python),
             python=python,
             host=host,
@@ -780,6 +780,11 @@ def create_alternative_hosts_variants():
     return variants
 
 
+def create_aws_lambda_variants():
+    host = HOSTS["rhel8"]
+    return [create_variant([".aws_lambda"], display_name="FaaS Lambda", host=host)]
+
+
 ##############
 # Tasks
 ##############
@@ -910,6 +915,29 @@ def _create_ocsp_task(algo, variant, server_type, base_task_name):
     return EvgTask(name=task_name, tags=tags, commands=commands)
 
 
+def create_aws_lambda_tasks():
+    assume_func = FunctionCall(func="assume ec2 role")
+    atlas_func = FunctionCall(func="setup atlas")
+    vars = dict(TEST_NAME="aws_lambda")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-aws-lambda-deployed"
+    tags = ["aws_lambda"]
+    commands = [assume_func, atlas_func, test_func]
+    return [EvgTask(name=task_name, tags=tags, commands=commands)]
+
+
+def create_search_index_tasks():
+    assume_func = FunctionCall(func="assume ec2 role")
+    atlas_func = FunctionCall(func="setup atlas")
+    server_func = FunctionCall(func="run server", vars=dict(TEST_NAME="index_management"))
+    vars = dict(TEST_NAME="index_management")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-search-index-helpers"
+    tags = ["index_managment"]
+    commands = [assume_func, atlas_func, server_func, test_func]
+    return [EvgTask(name=task_name, tags=tags, commands=commands)]
+
+
 def create_atlas_connect_tasks():
     vars = dict(TEST_NAME="atlas_connect")
     assume_func = FunctionCall(func="assume ec2 role")
@@ -920,7 +948,7 @@ def create_atlas_connect_tasks():
 
 
 def create_enterprise_auth_tasks():
-    vars = dict(TEST_NAME="enterprise_auth", AUTH="auth")
+    vars = dict(TEST_NAME="enterprise_auth", AUTH="auth", FOO="${THIS THING}")
     server_func = FunctionCall(func="run server", vars=vars)
     assume_func = FunctionCall(func="assume ec2 role")
     test_func = FunctionCall(func="run tests", vars=vars)

.evergreen/scripts/generate_config.py

@@ -22,14 +22,6 @@ def start_server():
     if "VERSION" in os.environ:
         os.environ["MONGODB_VERSION"] = os.environ["VERSION"]
 
-    if opts.auth:
-        extra_opts.append("--auth")
-
-    if opts.verbose:
-        extra_opts.append("-v")
-    elif opts.quiet:
-        extra_opts.append("-q")
-
     if test_name == "auth_aws":
         set_env("AUTH_AWS")
 
@@ -51,6 +43,10 @@ def start_server():
             if not found:
                 raise ValueError("Please provide an orchestration file")
 
+    elif test_name == "index_management":
+        os.environ["TOPOLOGY"] = "replica_set"
+        os.environ["MONGODB_VERSION"] = "6.0"
+
     if not os.environ.get("TEST_CRYPT_SHARED"):
         set_env("SKIP_CRYPT_SHARED")
 
@@ -62,6 +58,14 @@ def start_server():
             set_env("TLS_PEM_KEY_FILE", certs / "server.pem")
             set_env("TLS_CA_FILE", certs / "ca.pem")
 
+    if opts.auth:
+        extra_opts.append("--auth")
+
+    if opts.verbose:
+        extra_opts.append("-v")
+    elif opts.quiet:
+        extra_opts.append("-q")
+
     cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/run-orchestration.sh", *extra_opts]
     run_command(cmd, cwd=DRIVERS_TOOLS)
 

.evergreen/scripts/run_server.py

@@ -6,10 +6,13 @@
 import platform
 import shutil
 import sys
+import tarfile
+import tempfile
 from datetime import datetime
+from shutil import which
 
 import pytest
-from utils import DRIVERS_TOOLS, LOGGER, ROOT, run_command
+from utils import DRIVERS_TOOLS, LOGGER, ROOT, create_archive, run_command
 
 AUTH = os.environ.get("AUTH", "noauth")
 SSL = os.environ.get("SSL", "nossl")
@@ -82,6 +85,28 @@ def handle_pymongocrypt() -> None:
     LOGGER.info(f"libmongocrypt version: {pymongocrypt.libmongocrypt_version()})")
 
 
+def handle_aws_lambda() -> None:
+    env = os.environ.copy()
+    target_dir = ROOT / "test/lambda"
+    env["TEST_LAMBDA_DIRECTORY"] = str(target_dir)
+    archive = create_archive()
+    with tempfile.TemporaryDirectory() as td:
+        # Unpack the archive
+        fid = tarfile.open(archive)
+        fid.extractall(td)
+        fid.close()
+        # Build the c extensions.
+        docker = which("docker") or which("podman")
+        if not docker:
+            raise ValueError("Could not find docker!")
+        image = "quay.io/pypa/manylinux2014_x86_64:latest"
+        run_command(f'{docker} run --rm -v "{td}:/src" {image} /src/test/lambda/build_internal.sh')
+        shutil.copytree(td, ROOT / "test/lambda/mongodb")
+
+    script_name = "run-deployed-lambda-aws-tests.sh"
+    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/aws_lambda/{script_name}", env=env)
+
+
 def run() -> None:
     # Handle green framework first so they can patch modules.
     if GREEN_FRAMEWORK:
@@ -123,6 +148,11 @@ def run() -> None:
         test_oidc_send_to_remote(SUB_TEST_NAME)
         return
 
+    # Run deployed aws lambda tests.
+    if TEST_NAME == "aws_lambda":
+        handle_aws_lambda()
+        return
+
     if os.environ.get("DEBUG_LOG"):
         TEST_ARGS.extend(f"-o log_cli_level={logging.DEBUG} -o log_cli=1".split())
 

.evergreen/scripts/run_tests.py

@@ -172,6 +172,16 @@ def handle_test_env() -> None:
         if not config:
             AUTH = "noauth"
 
+    if test_name in ["aws_lambda", "index_management"]:
+        env = os.environ.copy()
+        env["MONGODB_VERSION"] = "7.0"
+        env["LAMBDA_STACK_NAME"] = "dbx-python-lambda"
+        write_env("LAMBDA_STACK_NAME", env["LAMBDA_STACK_NAME"])
+    #    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh", env=env, cwd=DRIVERS_TOOLS)
+
+    if test_name == "index_management":
+        AUTH = "auth"
+
     if AUTH != "noauth":
         if test_name == "data_lake":
             config = read_env(f"{DRIVERS_TOOLS}/.evergreen/atlas_data_lake/secrets-export.sh")
@@ -381,7 +391,7 @@ def handle_test_env() -> None:
         # Use --capture=tee-sys so pytest prints test output inline:
         # https://docs.pytest.org/en/stable/how-to/capture-stdout-stderr.html
         TEST_ARGS = f"-v --capture=tee-sys --durations=5 {TEST_ARGS}"
-        TEST_SUITE = TEST_SUITE_MAP[test_name]
+        TEST_SUITE = TEST_SUITE_MAP.get(test_name)
         if TEST_SUITE:
             TEST_ARGS = f"-m {TEST_SUITE} {TEST_ARGS}"
 

.evergreen/scripts/setup_tests.py

@@ -38,6 +38,10 @@
 elif TEST_NAME == "serverless":
     run_command(f"bash {DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh")
 
+# Tear down atlas cluster if applicable.
+if TEST_NAME in ["aws_lambda", "index_management"]:
+    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh")
+
 # Tear down auth_aws if applicable.
 # We do not run web-identity hosts on macos, because the hosts lack permissions,
 # so there is no reason to run the teardown, which would error with a 401.