PYTHON-5206 Convert Atlas Connect and Enterprise Auth tests to use new test scripts

Author: blink1073

.evergreen/config.yml

@@ -267,28 +267,6 @@ functions:
         binary: bash
         args: [.evergreen/just.sh, run-tests]
 
-  "run enterprise auth tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        working_dir: "src"
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-enterprise-auth-tests.sh
-
-  "run atlas tests":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "PYTHON_BINARY"]
-        working_dir: "src"
-        args:
-          - .evergreen/scripts/run-with-env.sh
-          - .evergreen/scripts/run-atlas-tests.sh
-
   "cleanup":
     - command: subprocess.exec
       params:
@@ -452,13 +430,6 @@ tasks:
           vars:
             TEST_NAME: serverless
 
-    - name: "test-enterprise-auth"
-      tags: ["enterprise-auth"]
-      commands:
-        - func: "run server"
-        - func: "assume ec2 role"
-        - func: "run enterprise auth tests"
-
     - name: "test-search-index-helpers"
       commands:
         - func: "run server"
@@ -518,12 +489,6 @@ tasks:
             TOPOLOGY: "replica_set"
         - func: "run tests"
 
-    - name: "atlas-connect"
-      tags: ["atlas-connect"]
-      commands:
-        - func: "assume ec2 role"
-        - func: "run atlas tests"
-
     - name: atlas-data-lake-tests
       commands:
         - func: "bootstrap data lake"

.evergreen/scripts/generate_config.py

@@ -464,7 +464,6 @@ def create_compression_variants():
 
 
 def create_enterprise_auth_variants():
-    expansions = dict(AUTH="auth")
     variants = []
 
     # All python versions across platforms.
@@ -475,10 +474,8 @@ def create_enterprise_auth_variants():
             host = HOSTS["win64"]
         else:
             host = DEFAULT_HOST
-        display_name = get_display_name("Auth Enterprise", host, python=python, **expansions)
-        variant = create_variant(
-            ["test-enterprise-auth"], display_name, host=host, python=python, expansions=expansions
-        )
+        display_name = get_display_name("Auth Enterprise", host, python=python)
+        variant = create_variant([".enterprise_auth"], display_name, host=host, python=python)
         variants.append(variant)
 
     return variants
@@ -723,7 +720,7 @@ def create_atlas_connect_variants():
     host = DEFAULT_HOST
     return [
         create_variant(
-            ["atlas-connect"],
+            [".atlas_connect"],
             get_display_name("Atlas connect", host, python=python),
             python=python,
             host=host,
@@ -915,6 +912,25 @@ def _create_ocsp_task(algo, variant, server_type, base_task_name):
     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")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-atlas-connect"
+    tags = ["atlas_connect"]
+    return [EvgTask(name=task_name, tags=tags, commands=[assume_func, test_func])]
+
+
+def create_enterprise_auth_tasks():
+    vars = dict(TEST_NAME="enterprise_auth", AUTH="auth")
+    server_func = FunctionCall(func="run server", vars=vars)
+    assume_func = FunctionCall(func="assume ec2 role")
+    test_func = FunctionCall(func="run tests", vars=vars)
+    task_name = "test-enterprise-ath"
+    tags = ["enterprise_auth"]
+    return [EvgTask(name=task_name, tags=tags, commands=[server_func, assume_func, test_func])]
+
+
 def create_ocsp_tasks():
     tasks = []
     tests = [

.evergreen/scripts/run-atlas-tests.sh

@@ -112,6 +112,10 @@ def setup_libmongocrypt():
         run_command("chmod +x libmongocrypt/nocrypto/bin/mongocrypt.dll")
 
 
+def get_secrets(name: str) -> None:
+    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh {name}")
+
+
 def handle_test_env() -> None:
     opts, _ = get_test_options("Set up the test environment and services.")
     test_name = opts.test_name
@@ -345,6 +349,12 @@ def handle_test_env() -> None:
         else:
             run_command(f"bash {auth_aws_dir}/setup-secrets.sh")
 
+    if test_name == "atlas_connect":
+        get_secrets("drivers/atlas_connect")
+
+    if test_name == "enterprise_auth":
+        get_secrets("drivers/enterprise_auth")
+
     if test_name == "perf":
         # PYTHON-4769 Run perf_test.py directly otherwise pytest's test collection negatively
         # affects the benchmark results.

.evergreen/scripts/run-direct-tests.sh

@@ -30,7 +30,7 @@ class Distro:
 
 # Map the test name to a test suite.
 TEST_SUITE_MAP = {
-    "atlas": "atlas",
+    "atlas_connect": "atlas_connect",
     "auth_aws": "auth_aws",
     "auth_oidc": "auth_oidc",
     "data_lake": "data_lake",

.evergreen/scripts/run-enterprise-auth-tests.sh

@@ -28,7 +28,7 @@
 import pymongo
 from pymongo.ssl_support import HAS_SNI
 
-pytestmark = pytest.mark.atlas
+pytestmark = pytest.mark.atlas_connect
 
 
 URIS = {