Update the pipeline to use the new AdvisoryDataV2

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/pipes/vcs_collector_utils.py

@@ -17,7 +17,7 @@
 from packageurl.contrib.purl2url import purl2url
 from packageurl.contrib.url2purl import url2purl
 
-from vulnerabilities.importer import AdvisoryData
+from vulnerabilities.importer import AdvisoryDataV2
 from vulnerabilities.importer import AffectedPackageV2
 from vulnerabilities.importer import PackageCommitPatchData
 from vulnerabilities.importer import ReferenceV2
@@ -135,11 +135,11 @@ def collect_advisories(self):
                     )
                 )
 
-            yield AdvisoryData(
+            yield AdvisoryDataV2(
                 advisory_id=vuln_id,
                 summary=summary,
                 affected_packages=affected_packages,
-                references_v2=references,
+                references=references,
                 url=self.repo_url,
             )
 

vulnerabilities/tests/pipelines/v2_importers/test_collect_fix_commit.py

@@ -40,10 +40,13 @@ class DummyCommit:
 def test_collect_fix_commits_groups_by_vuln(mock_repo, pipeline):
     commit1 = MagicMock(message="Fix CVE-2021-0001", hexsha="abc123")
     commit2 = MagicMock(message="Patch GHSA-f72r-2h5j-7639", hexsha="def456")
-    commit3 = MagicMock(message="Unrelated change", hexsha="ghi789")
+    commit3 = MagicMock(
+        message="Patch GHSA-5w93-4g67-mm43", hexsha="Github Advisory: GHSA-5w93-4g67-mm43"
+    )
+    commit4 = MagicMock(message="Unrelated change", hexsha="ghi789")
 
     pipeline.repo = MagicMock()
-    pipeline.repo.iter_commits.return_value = [commit1, commit2, commit3]
+    pipeline.repo.iter_commits.return_value = [commit1, commit2, commit3, commit4]
 
     pipeline.classify_commit_type = MagicMock(
         side_effect=lambda c: (
@@ -59,6 +62,9 @@ def test_collect_fix_commits_groups_by_vuln(mock_repo, pipeline):
 
     expected = {
         "CVE-2021-0001": [("abc123", "Fix CVE-2021-0001")],
+        "GHSA-5w93-4g67-mm43": [
+            ("Github Advisory: GHSA-5w93-4g67-mm43", "Patch GHSA-5w93-4g67-mm43")
+        ],
         "GHSA-f72r-2h5j-7639": [("def456", "Patch GHSA-f72r-2h5j-7639")],
     }
 

vulnerabilities/tests/test_data/fix_commits/expected_linux_advisory_output.json

@@ -26,7 +26,7 @@
         ]
       }
     ],
-    "references_v2": [
+    "references": [
       {
         "reference_id": "41b43c74bda19753c757036673ea9db74acf494a",
         "reference_type": "commit",
@@ -66,7 +66,7 @@
         ]
       }
     ],
-    "references_v2": [
+    "references": [
       {
         "reference_id": "49ff1042aa66bb25eda87e9a8ef82f3b0ad4eeba",
         "reference_type": "commit",