Skip to content

Commit f7b37be

Browse files
committed
Rename AVID to advisory_uid in API
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 67e971a commit f7b37be

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

CHANGELOG.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Release notes
44
next release
55
---------------------
66

7-
- WARNING: Vulnerablecode V1 API and UI has stopped supporting Ubuntu OVAL advisories, please shift to V3 API for new Ubuntu advisories.
7+
- WARNING: Vulnerablecode V1 API and UI has stopped supporting Ubuntu OVAL advisories, please shift to V3 API for new Ubuntu advisories.
8+
- Add attribute ``pipeline_id`` to AdvisoryV2 to track the pipeline that created the advisory, also rename existing ``datasource_id`` and AVIDs.
89

910
Version v38.6.0
1011
---------------------

vulnerabilities/api_v3.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class AdvisoryV3Serializer(serializers.ModelSerializer):
113113
weaknesses = AdvisoryWeaknessSerializer(many=True)
114114
references = AdvisoryReferenceSerializer(many=True)
115115
severities = AdvisorySeveritySerializer(many=True)
116-
advisory_id = serializers.CharField(source="avid", read_only=True)
116+
advisory_uid = serializers.CharField(source="avid", read_only=True)
117117
related_ssvc_trees = serializers.SerializerMethodField()
118118

119119
def get_related_ssvc_trees(self, obj):
@@ -143,6 +143,7 @@ class Meta:
143143
model = AdvisoryV2
144144
fields = [
145145
"advisory_id",
146+
"advisory_uid",
146147
"url",
147148
"aliases",
148149
"summary",
@@ -270,6 +271,7 @@ def get_affected_by_vulnerabilities(self, package):
270271
result.append(
271272
{
272273
"advisory_id": advisory.advisory_id.split("/")[-1],
274+
"advisory_uid": advisory.avid,
273275
"aliases": [alias.alias for alias in advisory.aliases.all()],
274276
"summary": advisory.summary,
275277
"severity": advisory.weighted_severity,
@@ -313,6 +315,7 @@ def get_fixing_vulnerabilities(self, package):
313315
results.append(
314316
{
315317
"advisory_id": advisory.advisory_id.split("/")[-1],
318+
"advisory_uid": advisory.avid,
316319
}
317320
)
318321
return results
@@ -337,6 +340,7 @@ def return_fixing_advisories_data(self, advisories):
337340
result.append(
338341
{
339342
"advisory_id": advisory.identifier,
343+
"advisory_uid": advisory.advisory.avid,
340344
}
341345
)
342346

@@ -364,6 +368,7 @@ def return_advisories_data(self, package, advisories_qs, advisories):
364368
result.append(
365369
{
366370
"advisory_id": advisory.identifier,
371+
"advisory_uid": advisory.advisory.avid,
367372
"aliases": [alias.alias for alias in advisory.aliases],
368373
"weighted_severity": advisory.weighted_severity,
369374
"exploitability": advisory.exploitability,
@@ -471,6 +476,7 @@ def create(self, request, *args, **kwargs):
471476

472477
class AffectedByAdvisoryV3Serializer(AdvisoryV3Serializer):
473478
fixed_by_packages = serializers.SerializerMethodField()
479+
advisory_uid = serializers.CharField(source="avid", read_only=True)
474480

475481
def get_fixed_by_packages(self, obj):
476482
return list(
@@ -483,6 +489,7 @@ class Meta:
483489
model = AdvisoryV2
484490
fields = [
485491
"advisory_id",
492+
"advisory_uid",
486493
"url",
487494
"aliases",
488495
"summary",
@@ -623,8 +630,8 @@ def get_affected_advisories_bulk(packages):
623630

624631
grouped.append(
625632
{
626-
"avid": primary.avid,
627633
"advisory_id": identifier,
634+
"advisory_uid": primary.avid,
628635
"aliases": aliases,
629636
"weighted_severity": weighted_severity,
630637
"exploitability": exploitability,
@@ -699,7 +706,9 @@ def get_fixing_advisories_bulk(packages):
699706
grouped = []
700707

701708
for adv_id in groups:
702-
grouped.append({"advisory_id": adv_id.split("/")[-1]})
709+
grouped.append(
710+
{"advisory_id": adv_id.split("/")[-1], "advisory_uid": adv_id.split("/")[-1]}
711+
)
703712

704713
result[package.id] = grouped
705714

vulnerabilities/pipelines/exporters/federate_vulnerabilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
from operator import attrgetter
1515
from pathlib import Path
1616

17-
from aboutcode.federated import DataFederation
1817
from aboutcode.pipeline import LoopProgress
1918
from django.conf import settings
2019
from django.utils import timezone
2120

21+
from aboutcode.federated import DataFederation
2222
from vulnerabilities.pipelines import VulnerableCodePipeline
2323
from vulnerabilities.pipes import export
2424
from vulnerabilities.pipes import federatedcode

vulnerabilities/pipelines/v2_improvers/reference_collect_commits.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
#
99
from collections import defaultdict
1010

11-
from aboutcode.federated import get_core_purl
1211
from aboutcode.pipeline import LoopProgress
1312
from django.db.models import Prefetch
1413
from packageurl.contrib.purl2url import purl2url
1514
from packageurl.contrib.url2purl import url2purl
1615

16+
from aboutcode.federated import get_core_purl
1717
from vulnerabilities.models import AdvisoryReference
1818
from vulnerabilities.models import AdvisoryV2
1919
from vulnerabilities.models import ImpactedPackage

0 commit comments

Comments
 (0)