Fix/84 preserve fix links - #90
Open
atomicturtle wants to merge 6 commits into
Open
Conversation
Bugzilla-only ingest dropped RHEL-* keys that appear on the RH errata page; keep both and map each ticket id to the correct source URL.
Accept general Jira keys (not only RHEL-*), refuse inventing Bugzilla URLs for unrecognized tickets, and cover URL-only CSAF references.
Reject CVE strings and URLs mislabeled as Red Hat Bugzilla ID so they are not stored as fix tickets.
rockythorn
requested changes
Sep 1, 2026
rockythorn
left a comment
Collaborator
There was a problem hiding this comment.
Review: Request changes (one blocking issue)
CSAF parsing tests pass (test_rhcsaf). Fix link collection logic is correct.
What works
fix_source_url()correctly routes Bugzilla numeric IDs to bugzilla.redhat.com and Jira keys (RHEL-, OCPBUGS-) to issues.redhat.com. Returns empty string for unrecognized IDs — good, doesn't invent URLs._ticket_id_from_reference()extracts ticket IDs from both summary text and URL parsing. Handles URL-only Jira refs._collect_fix_ticket_ids()consolidates tickets from vulnerability.ids[], vulnerability.references[], and document.references[].- Non-numeric Bugzilla IDs correctly rejected (CVE strings, URLs, whitespace).
- Tests are thorough with good edge cases.
Blocking issue
test_rh_matcher_activities fails with ModuleNotFoundError: No module named 'apollo.rhcsaf'.
The PR adds from apollo.rhcsaf import fix_source_url to rh_matcher_activities.py, but the rpmworker Bazel target doesn't depend on rhcsaf. Add to apollo/rpmworker/BUILD.bazel:
deps = [
...
"//apollo/rhcsaf:rhcsaf_lib",
]
2 tasks
test_rh_matcher_activities imports fix_source_url through the matcher module; without this dep Bazel cannot load apollo.rhcsaf.
Contributor
Author
|
Addressed the Bazel miss: This stays scoped to CSAF fix-link ingest for review. It is not a production Apollo cutover change. |
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.
Closes issue #84
Ingest dropped Jira fix references (
RHEL-*/issues.redhat.com) fromdocument.references, so cloned RLSAs only retained Bugzilla tickets.This change:
document.referencesbugzilla.redhat.comvsissues.redhat.com)AdvisoryFixrows on Rocky clones