Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brief Design Summary
This PR adds optional
--policy-json PATHsupport tosbom-diff-risk compare.When provided, the command writes a policy-only JSON sidecar using the same policy-related sections already present in the full
report.json. The sidecar includespolicy_evaluation, policy finding lists,rule_catalog,summary.policywhen policy evaluation is applied, and provenance policy sections when those sections are relevant.The implementation reuses the existing report rendering helpers and does not create a second policy finding schema. Existing
--out-json,--summary-json, Markdown, and SARIF behavior remain unchanged.Files Changed
tools/sbom-diff-and-risk/src/sbom_diff_risk/cli.pytools/sbom-diff-and-risk/src/sbom_diff_risk/report_json.pytools/sbom-diff-and-risk/tests/test_cli_policy_json.pytools/sbom-diff-and-risk/tests/test_cli_exit_codes.pytools/sbom-diff-and-risk/README.mdtools/sbom-diff-and-risk/docs/report-schema.mdtools/sbom-diff-and-risk/docs/policy-decision-ci-cookbook.mdTests Added/Updated
Added CLI coverage for:
report.jsonpolicy_evaluation.applied: falseValidation
Results:
python -m pytest: 161 passedpython -m build: producedsbom_diff_and_risk-0.8.0.tar.gzandsbom_diff_and_risk-0.8.0-py3-none-any.whlpython -m twine check: passed for wheel and sdistgit diff --check: passedoutputs/policy.jsonmatches fullreport.jsonpolicy sections and has nocomponentsorrisks0.8.0Out of Scope