Skip to content

PYTHON-6004 Scope OIDC test failpoints to the auth_oidc appName #3044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blink1073 merged 1 commit into from
Sep 8, 2026
Merged

PYTHON-6004 Scope OIDC test failpoints to the auth_oidc appName #3044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .evergreen/scripts/oidc_tester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

K8S_NAMES = ["aks", "gke", "eks"]
K8S_REMOTE_NAMES = [f"{n}-remote" for n in K8S_NAMES]
OIDC_APP_NAME = "auth_oidc"


def _get_target_dir(sub_test_name: str) -> str:
Expand All @@ -29,7 +30,14 @@ def _get_target_dir(sub_test_name: str) -> str:
return f"{DRIVERS_TOOLS}/.evergreen/{target_dir}"


def _with_appname(uri: str, appname: str) -> str:
"""Append ``appName`` so the failpoint's ``appName`` filter matches."""
separator = "&" if "?" in uri else "?"
return f"{uri}{separator}appName={appname}"


def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
write_env("OIDC_APP_NAME", OIDC_APP_NAME)
target_dir = _get_target_dir(sub_test_name)
env = os.environ.copy()

Expand Down Expand Up @@ -59,12 +67,15 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
elif sub_test_name in ["azure-remote", "gcp-remote"]:
source_file = "./secrets-export.sh"
if sub_test_name in K8S_REMOTE_NAMES:
write_env(
"MONGODB_URI_SINGLE", _with_appname(os.environ["MONGODB_URI_SINGLE"], OIDC_APP_NAME)
)
return os.environ.copy()
if source_file is None:
return None

config = read_env(source_file)
write_env("MONGODB_URI_SINGLE", config["MONGODB_URI_SINGLE"])
write_env("MONGODB_URI_SINGLE", _with_appname(config["MONGODB_URI_SINGLE"], OIDC_APP_NAME))
write_env("MONGODB_URI", config["MONGODB_URI"])
write_env("DB_IP", config["MONGODB_URI"])

Expand Down
6 changes: 4 additions & 2 deletions test/asynchronous/test_auth_oidc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
DOMAIN = os.environ.get("OIDC_DOMAIN", "")
TOKEN_DIR = os.environ.get("OIDC_TOKEN_DIR", "")
TOKEN_FILE = os.environ.get("OIDC_TOKEN_FILE", "")
APP_NAME = os.environ.get("OIDC_APP_NAME", "auth_oidc")

# Generate unified tests.
globals().update(generate_test_classes(get_test_path("auth", "unified"), module=__name__))
Expand Down Expand Up @@ -104,15 +105,16 @@ def get_token(self, username=None):

@asynccontextmanager
async def fail_point(self, command_args):
cmd_on = dict(configureFailPoint="failCommand", appName="auth_oidc")
cmd_on = dict(configureFailPoint="failCommand")
cmd_on.update(command_args)
cmd_on["data"]["appName"] = APP_NAME
client = AsyncMongoClient(self.uri_admin)
await client.admin.command(cmd_on)
try:
yield
finally:
await client.admin.command(
"configureFailPoint", cmd_on["configureFailPoint"], mode="off", appName="auth_oidc"
"configureFailPoint", cmd_on["configureFailPoint"], mode="off", appName=APP_NAME
)
await client.close()

Expand Down
6 changes: 4 additions & 2 deletions test/test_auth_oidc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
DOMAIN = os.environ.get("OIDC_DOMAIN", "")
TOKEN_DIR = os.environ.get("OIDC_TOKEN_DIR", "")
TOKEN_FILE = os.environ.get("OIDC_TOKEN_FILE", "")
APP_NAME = os.environ.get("OIDC_APP_NAME", "auth_oidc")

# Generate unified tests.
globals().update(generate_test_classes(get_test_path("auth", "unified"), module=__name__))
Expand Down Expand Up @@ -104,15 +105,16 @@ def get_token(self, username=None):

@contextmanager
def fail_point(self, command_args):
cmd_on = dict(configureFailPoint="failCommand", appName="auth_oidc")
cmd_on = dict(configureFailPoint="failCommand")
cmd_on.update(command_args)
cmd_on["data"]["appName"] = APP_NAME
client = MongoClient(self.uri_admin)
client.admin.command(cmd_on)
try:
yield
finally:
client.admin.command(
"configureFailPoint", cmd_on["configureFailPoint"], mode="off", appName="auth_oidc"
"configureFailPoint", cmd_on["configureFailPoint"], mode="off", appName=APP_NAME
)
client.close()

Expand Down
Loading