fix: report all rule 6.1.36 conflicts - #1004
Merged
tziemek merged 2 commits intoSep 17, 2026
Merged
Conversation
bshek-xitaso
force-pushed
the
fix/6-1-36-report-all-conflicts
branch
2 times, most recently
from
September 14, 2026 14:49
512285f to
c69245c
Compare
bshek-xitaso
marked this pull request as ready for review
September 14, 2026 15:04
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No unresolved review issues were identified.
Pull request overview
Updates CSAF 2.1 rule 6.1.36 validation to report all conflicting remediation combinations.
Changes:
- Collects all validation findings.
- Centralizes conflict error creation.
- Updates expected test results.
File summaries
| File | Description |
|---|---|
csaf-rs/src/validations/test_6_1_36.rs |
Implements comprehensive conflict collection and updates tests. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
tziemek
approved these changes
Sep 15, 2026
bshek-xitaso
marked this pull request as draft
September 15, 2026 13:57
bshek-xitaso
force-pushed
the
fix/6-1-36-report-all-conflicts
branch
from
September 15, 2026 16:39
c69245c to
864d3bd
Compare
bshek-xitaso
marked this pull request as ready for review
September 15, 2026 16:45
bshek-xitaso
marked this pull request as draft
September 15, 2026 23:15
tziemek
approved these changes
Sep 16, 2026
bshek-xitaso
marked this pull request as ready for review
September 16, 2026 08:34
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.
This PR addresses #369 (comment) and resolves #369.
It adds a logic for collecting and reporting all the found errors resolving #369 (comment).
The existing OASIS test expectations are updated accordingly.
It also includes a small refactoring (centralizing the three error helper functions into a single one; improving variable names and comments for readability).