[DSPX-3302] (4/5) xtest conftest: --scenario and --instance flags by dmihalcik-virtru · Pull Request #453 · opentdf/tests

dmihalcik-virtru · 2026-05-15T15:53:06Z

Summary

Fourth PR in the five-part stack. Adds two new pytest CLI options to xtest/conftest.py:

--scenario PATH — when set, defaults --sdks-encrypt, --sdks-decrypt, and --containers from the scenario file's sdks and suite blocks. CLI-passed options always win.
--instance NAME — propagated to OTDF_LOCAL_INSTANCE_NAME so any nested otdf-local invocation agrees on the instance.

The authoritative entry point remains otdf-local scenario run <path> (PR 3), which sets these flags for you. This PR lets pytest accept them directly when running scenario-aware sessions outside the wrapper (e.g., a developer iterating with pytest --scenario foo.yaml -k some_test).

The --scenario import of otdf_sdk_mgr.schema is guarded with a try/except so minimal pytest environments that don't have otdf-sdk-mgr installed silently no-op.

Stack

(base) Shared schema — chore(xtest): Shared Scenario/Instance Pydantic schema in otdf-sdk-mgr #450
(base) Platform installer + install scenario — [DSPX-3302] (2/5) Manage platform service + install scenario in otdf-sdk-mgr #451
(base) otdf-local multi-instance refactor — [DSPX-3302] (3/5) otdf-local multi-instance refactor #452
This PR — xtest conftest integration
Claude plugin

Test plan

cd xtest && uv run pytest --collect-only -q → 103 tests still collect cleanly
uv run pytest --help shows --scenario and --instance under custom options
No regressions to existing --sdks-encrypt / --sdks-decrypt / --containers parametrization

Jira: https://virtru.atlassian.net/browse/DSPX-3302

🤖 Generated with Claude Code

coderabbitai · 2026-05-15T15:53:13Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: d97ead62-2441-47b1-93a4-3b9a782bebb0

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch DSPX-3302-04-xtest-conftest

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

gemini-code-assist

Code Review

This pull request introduces new pytest CLI options, --scenario and --instance, and implements logic in pytest_configure to handle scenario-based defaults and environment variable propagation. The review feedback suggests using explicit is None checks for CLI options to ensure that user-provided empty strings are respected as overrides, rather than being ignored in favor of defaults. Additionally, a redundant import os statement was identified for removal.

gemini-code-assist · 2026-05-15T15:59:44Z

+    import os
+
+    instance = config.getoption("--instance")
+    if instance:
+        os.environ["OTDF_LOCAL_INSTANCE_NAME"] = instance


The import os statement is redundant as it is already imported at the top of the file (line 18). Additionally, the check if instance: should be replaced with if instance is not None: to correctly handle cases where an empty string is explicitly passed via the CLI, ensuring it is respected and not ignored in favor of scenario defaults.

Suggested change

import os

instance = config.getoption("--instance")

if instance:

os.environ["OTDF_LOCAL_INSTANCE_NAME"] = instance

instance = config.getoption("--instance")

if instance is not None:

os.environ["OTDF_LOCAL_INSTANCE_NAME"] = instance

References

Redundant imports should be removed to maintain code cleanliness and avoid confusion.

When implementing configuration overrides, ensure that explicit user input (even if empty) is prioritized over default values.

gemini-code-assist · 2026-05-15T15:59:45Z

+    if not config.getoption("--sdks-encrypt") and scenario.sdks.encrypt:
+        config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())
+    if not config.getoption("--sdks-decrypt") and scenario.sdks.decrypt:
+        config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())
+    if not config.getoption("--containers") and scenario.suite.containers:
+        config.option.containers = scenario.suite.containers
+    if not instance and scenario.instance.metadata.name:
+        os.environ["OTDF_LOCAL_INSTANCE_NAME"] = scenario.instance.metadata.name


Use is None checks for CLI options to ensure that explicit overrides (including empty strings) are respected and not overwritten by scenario defaults. This maintains the 'CLI wins' principle described in the function's docstring.

Suggested change

if not config.getoption("--sdks-encrypt") and scenario.sdks.encrypt:

config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())

if not config.getoption("--sdks-decrypt") and scenario.sdks.decrypt:

config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())

if not config.getoption("--containers") and scenario.suite.containers:

config.option.containers = scenario.suite.containers

if not instance and scenario.instance.metadata.name:

os.environ["OTDF_LOCAL_INSTANCE_NAME"] = scenario.instance.metadata.name

if config.getoption("--sdks-encrypt") is None and scenario.sdks.encrypt:

config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())

if config.getoption("--sdks-decrypt") is None and scenario.sdks.decrypt:

config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())

if config.getoption("--containers") is None and scenario.suite.containers:

config.option.containers = scenario.suite.containers

if instance is None and scenario.instance.metadata.name:

os.environ["OTDF_LOCAL_INSTANCE_NAME"] = scenario.instance.metadata.name

References

When implementing configuration overrides, ensure that explicit user input (even if empty) is prioritized over default values.

gemini-code-assist

Code Review

This pull request introduces new CLI options, --scenario and --instance, to the pytest configuration and implements a pytest_configure hook to manage scenario-based defaults and environment variable propagation. The review feedback highlights that using falsiness checks for CLI options prevents users from overriding scenario defaults with empty values; it is recommended to use is None checks instead to ensure CLI-passed options always take precedence. Additionally, a redundant local import of the os module was identified.

gemini-code-assist · 2026-05-15T15:59:50Z

+    import os
+
+    instance = config.getoption("--instance")
+    if instance:
+        os.environ["OTDF_LOCAL_INSTANCE_NAME"] = instance
+
+    scenario_path = config.getoption("--scenario")
+    if not scenario_path:
+        return
+    try:
+        from otdf_sdk_mgr.schema import load_scenario
+    except ImportError:
+        # otdf-sdk-mgr may not be installed in a minimal pytest env.
+        return
+    scenario = load_scenario(scenario_path)
+    if not config.getoption("--sdks-encrypt") and scenario.sdks.encrypt:
+        config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())
+    if not config.getoption("--sdks-decrypt") and scenario.sdks.decrypt:
+        config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())
+    if not config.getoption("--containers") and scenario.suite.containers:
+        config.option.containers = scenario.suite.containers
+    if not instance and scenario.instance.metadata.name:
+        os.environ["OTDF_LOCAL_INSTANCE_NAME"] = scenario.instance.metadata.name


The current implementation uses falsiness checks (if not ...) to determine if CLI options were provided. This prevents users from explicitly overriding scenario defaults with empty values (e.g., --sdks-encrypt "" to run no encryption SDKs), as an empty string is falsy and will be replaced by the scenario's default. Using is None checks ensures that only unprovided options are populated from the scenario file, adhering to the principle that CLI-passed options always win.

Additionally, the local import os is redundant as it is already imported at the top of the file (line 18).

instance = config.getoption("--instance") if instance is not None: os.environ["OTDF_LOCAL_INSTANCE_NAME"] = instance scenario_path = config.getoption("--scenario") if not scenario_path: return try: from otdf_sdk_mgr.schema import load_scenario except ImportError: # otdf-sdk-mgr may not be installed in a minimal pytest env. return scenario = load_scenario(scenario_path) if config.getoption("--sdks-encrypt") is None and scenario.sdks.encrypt: config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys()) if config.getoption("--sdks-decrypt") is None and scenario.sdks.decrypt: config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys()) if config.getoption("--containers") is None and scenario.suite.containers: config.option.containers = scenario.suite.containers if instance is None and scenario.instance.metadata.name: os.environ["OTDF_LOCAL_INSTANCE_NAME"] = scenario.instance.metadata.name

gemini-code-assist

Code Review

This pull request introduces new --scenario and --instance CLI options to the pytest configuration, along with a new pytest_configure function to handle scenario-based defaults and environment variable propagation. The review identifies a potential issue where the current logic for applying scenario defaults to SDK flags ignores the general --sdks CLI flag, and provides a code suggestion to ensure that CLI-provided options correctly take precedence.

gemini-code-assist · 2026-05-15T16:01:35Z

+    if not config.getoption("--sdks-encrypt") and scenario.sdks.encrypt:
+        config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())
+    if not config.getoption("--sdks-decrypt") and scenario.sdks.decrypt:
+        config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())


The current logic for applying scenario defaults to --sdks-encrypt and --sdks-decrypt does not account for the general --sdks CLI flag. Since pytest_generate_tests (lines 199-203 and 214-218) uses --sdks as a fallback when the specific flags are missing, programmatically setting config.option.sdks_encrypt or config.option.sdks_decrypt from the scenario file will cause any CLI-provided --sdks value to be ignored. To ensure that "CLI-passed options always win" as stated in the PR description, these defaults should only be applied if neither the specific flag nor the general --sdks flag was provided on the command line.

Suggested change

if not config.getoption("--sdks-encrypt") and scenario.sdks.encrypt:

config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())

if not config.getoption("--sdks-decrypt") and scenario.sdks.decrypt:

config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())

if not config.getoption("--sdks-encrypt") and not config.getoption("--sdks") and scenario.sdks.encrypt:

config.option.sdks_encrypt = " ".join(scenario.sdks.encrypt.keys())

if not config.getoption("--sdks-decrypt") and not config.getoption("--sdks") and scenario.sdks.decrypt:

config.option.sdks_decrypt = " ".join(scenario.sdks.decrypt.keys())

gemini-code-assist

Code Review

This pull request enhances the pytest configuration by adding --scenario and --instance CLI options. A new pytest_configure hook is implemented to propagate the instance name via environment variables and to load default values for SDK and container settings from a scenario file when provided. The review feedback points out a redundant local import of the os module that should be removed to maintain code cleanliness and follow PEP 8 standards.

gemini-code-assist · 2026-05-15T16:05:16Z

+    via `OTDF_LOCAL_INSTANCE_NAME` so any child `otdf-local` invocation sees
+    the same instance.
+    """
+    import os


The os module is already imported at the top of the file (line 18). This local import is redundant and can be removed to improve code clarity and adhere to Python's best practices (PEP 8), which recommend placing all imports at the top of the module.

github-actions · 2026-05-15T16:16:47Z

X-Test Results

✅ go-v0.15.0
✅ js-main
✅ js-v0.15.0
✅ java-main
✅ go-main
✅ java-v0.15.0

github-actions · 2026-05-15T16:57:30Z

X-Test Results

✅ java@main-v0.15.0
✅ java@main-main
✅ js@main-v0.15.0
✅ js@main-main
✅ go@v0.30.0-main
✅ go@main-main
✅ go@main-v0.15.0
✅ go@v0.30.0-v0.15.0
✅ js@v0.4.0-main
✅ js@v0.4.0-v0.15.0

Adds two new pytest CLI options so xtest can be driven by a scenarios.yaml and run against a specific otdf-local instance. --scenario PATH When set, defaults --sdks-encrypt, --sdks-decrypt, and --containers from the scenario's `sdks` and `suite` blocks. Options explicitly passed on the CLI always override. --instance NAME Propagated to OTDF_LOCAL_INSTANCE_NAME so child `otdf-local` invocations within the test see the same instance the scenario expects. If otdf-sdk-mgr is not installed (minimal pytest environments), the --scenario flag silently no-ops via an ImportError guard. The flag shape is invariant either way so CI configs don't fork. This is the consumer side of the PR 3 / scenario-driven flow: the authoritative entry point remains `otdf-local scenario run <path>`, which sets these flags for you; this PR lets pytest accept them directly when running scenario-aware sessions outside the wrapper. Refs: https://virtru.atlassian.net/browse/DSPX-3302 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

sonarqubecloud · 2026-05-15T17:03:26Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

github-actions · 2026-05-15T17:22:26Z

X-Test Results

✅ java@main-v0.15.0
✅ java@main-main
✅ js@main-main
✅ js@main-v0.15.0
✅ go@v0.30.0-main
✅ go@main-v0.15.0
✅ go@main-main
✅ js@v0.4.0-main
✅ go@v0.30.0-v0.15.0
✅ js@v0.4.0-v0.15.0

dmihalcik-virtru mentioned this pull request May 15, 2026

[DSPX-3302] (5/5) Claude plugin: bug-repro skills for OpenTDF #454

Draft

7 tasks

gemini-code-assist Bot reviewed May 15, 2026

View reviewed changes

dmihalcik-virtru force-pushed the DSPX-3302-03-multi-instance branch from c69afd6 to a8ef24a Compare May 15, 2026 16:36

dmihalcik-virtru force-pushed the DSPX-3302-04-xtest-conftest branch from 6d2e83c to f23ccce Compare May 15, 2026 16:37

dmihalcik-virtru force-pushed the DSPX-3302-03-multi-instance branch from a8ef24a to 78b2ca6 Compare May 15, 2026 16:58

dmihalcik-virtru force-pushed the DSPX-3302-04-xtest-conftest branch from f23ccce to 6498765 Compare May 15, 2026 17:02

dmihalcik-virtru mentioned this pull request May 18, 2026

[DSPX-3302] (6/6) feature-orchestrate skill + cells-of-effort spec #455

Draft

6 tasks

Conversation

dmihalcik-virtru commented May 15, 2026

Summary

Stack

Test plan

Uh oh!

coderabbitai Bot commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot May 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot May 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot May 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot May 15, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot May 15, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented May 15, 2026

X-Test Results

Uh oh!

github-actions Bot commented May 15, 2026

X-Test Results

Uh oh!

sonarqubecloud Bot commented May 15, 2026

Quality Gate passed

Uh oh!

github-actions Bot commented May 15, 2026

X-Test Results

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

coderabbitai Bot commented May 15, 2026 •

edited

Loading