address review

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -1043,12 +1043,12 @@ tasks:
     tags: [ocsp, ocsp-rsa]
 
   # Oidc tests
-  - name: test-auth-oidc-test
+  - name: test-auth-oidc-default
     commands:
       - func: run tests
         vars:
           TEST_NAME: auth_oidc
-          SUB_TEST_NAME: test
+          SUB_TEST_NAME: default
     tags: [auth_oidc]
   - name: test-auth-oidc-azure
     commands:

.evergreen/scripts/configure-env.sh

@@ -78,6 +78,8 @@ EOT
 rm -rf $DRIVERS_TOOLS
 BRANCH=master
 ORG=mongodb-labs
+BRANCH=PYTHON-5196
+ORG=blink1073
 git clone --branch $BRANCH https://github.com/$ORG/drivers-evergreen-tools.git $DRIVERS_TOOLS
 
 cat <<EOT > ${DRIVERS_TOOLS}/.env

.evergreen/scripts/generate_config.py

@@ -886,12 +886,12 @@ def create_aws_tasks():
 
 def create_oidc_tasks():
     tasks = []
-    for sub_test in ["test", "azure", "gcp", "eks", "aks", "gke"]:
+    for sub_test in ["default", "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}"
         tags = ["auth_oidc"]
-        if sub_test != "test":
+        if sub_test != "default":
             tags.append("auth_oidc_remote")
         tasks.append(EvgTask(name=task_name, tags=tags, commands=[test_func]))
     return tasks

.evergreen/scripts/oidc_tester.py

@@ -9,7 +9,7 @@
 
 
 def _get_target_dir(sub_test_name: str) -> str:
-    if sub_test_name == "test":
+    if sub_test_name == "default":
         target_dir = "auth_oidc"
     elif sub_test_name.startswith("azure"):
         target_dir = "auth_oidc/azure"
@@ -42,11 +42,9 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
         return None
 
     source_file = None
-    if sub_test_name == "test":
+    if sub_test_name == "default":
         source_file = f"{target_dir}/secrets-export.sh"
-    elif sub_test_name == "azure-remote":
-        source_file = "./env.sh"
-    elif sub_test_name == "gcp-remote":
+    elif sub_test_name in ["azure-remote", "gcp-remote"]:
         source_file = "./secrets-export.sh"
     if sub_test_name in K8S_REMOTE_NAMES:
         return os.environ.copy()
@@ -58,7 +56,7 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
     write_env("MONGODB_URI", config["MONGODB_URI"])
     write_env("DB_IP", config["MONGODB_URI"])
 
-    if sub_test_name == "test":
+    if sub_test_name == "default":
         write_env("OIDC_TOKEN_FILE", config["OIDC_TOKEN_FILE"])
         write_env("OIDC_TOKEN_DIR", config["OIDC_TOKEN_DIR"])
         if "OIDC_DOMAIN" in config:

CONTRIBUTING.md

@@ -247,7 +247,7 @@ the pages will re-render and the browser will automatically refresh.
 - Run `just setup-tests auth_oidc <oidc-test-type>` to set up the OIDC test.
 - Run the tests with `just run-tests`.
 
-The supported types are [`test`, `azure`, `gcp`, `eks`, `aks`, and `gke`].
+The supported types are [`default`, `azure`, `gcp`, `eks`, `aks`, and `gke`].
 
 ### KMS tests