PYTHON-5196 Convert OIDC tests to use new test scripts

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -1042,6 +1042,8 @@ tasks:
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
 
+  # Oidc tests
+
   # Server tests
   - name: test-4.0-standalone-auth-ssl-sync
     commands:

.evergreen/run-mongodb-oidc-remote-test.sh

@@ -5,17 +5,7 @@ set -eu
 
 echo "Running MONGODB-OIDC authentication tests"
 
-OIDC_ENV=${OIDC_ENV:-"test"}
-
-if [ $OIDC_ENV == "test" ]; then
-    # Make sure DRIVERS_TOOLS is set.
-    if [ -z "$DRIVERS_TOOLS" ]; then
-        echo "Must specify DRIVERS_TOOLS"
-        exit 1
-    fi
-    source ${DRIVERS_TOOLS}/.evergreen/auth_oidc/secrets-export.sh
-
-elif [ $OIDC_ENV == "azure" ]; then
+if [ $OIDC_ENV == "azure" ]; then
     source ./env.sh
 
 elif [ $OIDC_ENV == "gcp" ]; then
@@ -29,5 +19,5 @@ else
     exit 1
 fi
 
-COVERAGE=1 bash ./.evergreen/just.sh setup-tests auth_oidc
+bash ./.evergreen/just.sh setup-tests auth_oidc remote
 bash ./.evergreen/just.sh run-tests "${@:1}"

.evergreen/run-mongodb-oidc-test.sh

@@ -886,6 +886,11 @@ def create_aws_tasks():
 
 def create_oidc_tasks():
     tasks = []
+    for sub_test in ["test", "azure", "gcp", "eks", "aks", "gke"]:
+        vars = dict(TEST_NAME="auth_oidc", SUB_TEST_NAME=sub_test)
+        test_func = FunctionCall(func="run tests", vars=vars)
+        task_name = f"test-auth-oidc-{sub_test}"
+        tasks.append(EvgTask(name=task_name, tags=["oidc"], commands=[test_func]))
     tasks.append([])
 
 

.evergreen/scripts/generate_config.py

@@ -2,9 +2,16 @@
 
 import os
 
-from utils import DRIVERS_TOOLS, LOGGER, ROOT, read_env, run_command, write_env
+from utils import (
+    DRIVERS_TOOLS,
+    LOGGER,
+    TMP_DRIVER_FILE,
+    create_archive,
+    read_env,
+    run_command,
+    write_env,
+)
 
-TMP_DRIVER_FILE = "/tmp/mongo-python-driver.tgz"  # noqa: S108
 DIRS = dict(
     gcp=f"{DRIVERS_TOOLS}/.evergreen/csfle/gcpkms",
     azure=f"{DRIVERS_TOOLS}/.evergreen/csfle/azurekms",
@@ -45,12 +52,6 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None:
     LOGGER.info("Setting up GCP VM...")
 
 
-def _create_archive() -> None:
-    run_command("git add .", cwd=ROOT)
-    run_command('git commit -m "add files"', check=False, cwd=ROOT)
-    run_command(f"git archive -o {TMP_DRIVER_FILE} HEAD", cwd=ROOT)
-
-
 def _load_kms_config(sub_test_target: str) -> dict[str, str]:
     target_dir = DIRS[sub_test_target]
     config = read_env(f"{target_dir}/secrets-export.sh")
@@ -87,7 +88,7 @@ def setup_kms(sub_test_name: str) -> None:
         run_command("./setup-secrets.sh", cwd=kms_dir)
 
     if success:
-        _create_archive()
+        create_archive()
         if sub_test_target == "azure":
             os.environ["AZUREKMS_VMNAME_PREFIX"] = "PYTHON_DRIVER"
 

.evergreen/scripts/kms_tester.py

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+import os
+
+from utils import (
+    DRIVERS_TOOLS,
+    TMP_DRIVER_FILE,
+    run_command,
+)
+
+K8S_NAMES = ["aks", "gke", "eks"]
+
+
+def _get_target_dir(sub_test_name: str) -> str:
+    if sub_test_name == "test":
+        target_dir = "auth_oidc"
+    elif sub_test_name == "azure":
+        target_dir = "auth_oidc/azure"
+    elif sub_test_name == "gcp":
+        target_dir = "auth_oidc/gcp"
+    elif sub_test_name in K8S_NAMES:
+        target_dir = "auth_oidc/k8s"
+    else:
+        raise ValueError(f"Invalid sub test name '{sub_test_name}'")
+    return f"{DRIVERS_TOOLS}/.evergreen/{target_dir}"
+
+
+def setup_oidc(sub_test_name: str) -> None:
+    target_dir = _get_target_dir(sub_test_name)
+    env = os.environ.copy()
+    if sub_test_name == "azure":
+        env["AZUREOIDC_VMNAME_PREFIX"] = "PYTHON_DRIVER"
+    run_command(f"bash {target_dir}/setup.sh", env=env)
+    if sub_test_name in K8S_NAMES:
+        run_command(f"bash {target_dir}/setup-pod.sh")
+        run_command(f"bash {target_dir}/run-self-test.sh")
+
+
+def test_oidc_remote(sub_test_name: str) -> None:
+    env = os.environ.copy()
+    target_dir = _get_target_dir(sub_test_name)
+    if sub_test_name in ["azure", "gcp"]:
+        upper_name = sub_test_name.upper()
+        env[f"{upper_name}OIDC_DRIVERS_TAR_FILE"] = TMP_DRIVER_FILE
+        env[
+            f"{upper_name}OIDC_TEST_CMD"
+        ] = f"OIDC_ENV={sub_test_name} ./.evergreen/run-mongodb-oidc-test.sh"
+    elif sub_test_name in K8S_NAMES:
+        env["K8S_DRIVERS_TAR_FILE"] = TMP_DRIVER_FILE
+        env["K8S_TEST_CMD"] = "OIDC_ENV=k8s ./.evergreen/run-mongodb-oidc-test.sh"
+
+    run_command(f"bash {target_dir}/run-driver-test.sh")
+
+
+def teardown_oidc(sub_test_name: str) -> None:
+    target_dir = _get_target_dir(sub_test_name)
+    if sub_test_name in K8S_NAMES:
+        run_command(f"bash {target_dir}/teardown-pod.sh")
+    run_command(f"bash {target_dir}/teardown.sh")

.evergreen/scripts/oidc_tester.py

@@ -33,9 +33,9 @@ def start_server():
         set_env("LOAD_BALANCER")
 
     elif test_name == "auth_oidc":
-        cmd = ["bash", f"{DRIVERS_TOOLS}/.evergreen/auth_oidc/start-local-server.sh"]
-        run_command(cmd, cwd=DRIVERS_TOOLS)
-        return
+        raise ValueError(
+            "OIDC auth does not use run-orchestration directly, do not use run-server!"
+        )
 
     elif test_name == "ocsp":
         opts.ssl = True

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

@@ -113,7 +113,7 @@ def run() -> None:
         return
 
     # Run remote oidc tests.
-    if TEST_NAME == "auth_oidc" and SUB_TEST_NAME in [""]:
+    if TEST_NAME == "auth_oidc" and SUB_TEST_NAME not in ["test", "test-remote"]:
         from oidc_tester import test_oidc_remote
 
         test_oidc_remote(SUB_TEST_NAME)

.evergreen/scripts/run_server.py

@@ -239,8 +239,10 @@ def handle_test_env() -> None:
         cmd = f'bash "{DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh" start'
         run_command(cmd)
 
-    if test_name == "oidc":
-        pass
+    if test_name == "auth_oidc":
+        from oidc_helper import setup_oidc
+
+        setup_oidc(sub_test_name)
 
     if test_name == "ocsp":
         if sub_test_name: