Skip to content

Commit 4bc2651

Browse files
committed
Merge changes
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 77b77ee commit 4bc2651

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

vulnerabilities/improvers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from vulnerabilities.improvers import valid_versions
1111
from vulnerabilities.improvers import vulnerability_status
12-
from vulnerabilities.pipelines import VulnerableCodePipeline
1312
from vulnerabilities.pipelines import add_cvss31_to_CVEs
1413
from vulnerabilities.pipelines import collect_commits
1514
from vulnerabilities.pipelines import compute_advisory_todo
@@ -70,5 +69,6 @@
7069
compute_package_risk_v2.ComputePackageRiskPipeline,
7170
compute_version_rank_v2.ComputeVersionRankPipeline,
7271
collect_commits_v2.CollectFixCommitsPipeline,
72+
compute_advisory_todo.ComputeToDo,
7373
]
7474
)

vulnerabilities/migrations/0093_advisoryalias_advisoryreference_advisoryseverity_and_more.py renamed to vulnerabilities/migrations/0094_advisoryalias_advisoryreference_advisoryseverity_and_more.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.20 on 2025-06-20 07:50
1+
# Generated by Django 4.2.20 on 2025-07-01 10:38
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -7,7 +7,7 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
("vulnerabilities", "0092_pipelineschedule_pipelinerun"),
10+
("vulnerabilities", "0093_advisorytodo_todorelatedadvisory_and_more"),
1111
]
1212

1313
operations = [
@@ -158,17 +158,17 @@ class Migration(migrations.Migration):
158158
),
159159
),
160160
(
161-
"avid",
161+
"advisory_id",
162162
models.CharField(
163-
help_text="Unique ID for the datasource used for this advisory .e.g.: pysec_importer_v2/PYSEC-2020-2233",
164-
max_length=500,
163+
help_text="An advisory is a unique vulnerability identifier in some database, such as PYSEC-2020-2233",
164+
max_length=50,
165165
),
166166
),
167167
(
168-
"advisory_id",
168+
"avid",
169169
models.CharField(
170-
help_text="An advisory is a unique vulnerability identifier in some database, such as PYSEC-2020-2233",
171-
max_length=50,
170+
help_text="Unique ID for the datasource used for this advisory .e.g.: pysec_importer_v2/PYSEC-2020-2233",
171+
max_length=500,
172172
),
173173
),
174174
(

vulnerabilities/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2630,6 +2630,7 @@ class AdvisoryV2(models.Model):
26302630
help_text="Unique ID for the datasource used for this advisory ." "e.g.: nginx_importer_v2",
26312631
)
26322632

2633+
# This is similar to a name
26332634
advisory_id = models.CharField(
26342635
max_length=50,
26352636
blank=False,
@@ -2647,7 +2648,6 @@ class AdvisoryV2(models.Model):
26472648
"e.g.: pysec_importer_v2/PYSEC-2020-2233",
26482649
)
26492650

2650-
# This is similar to a name
26512651

26522652
# This is similar to a version
26532653
unique_content_id = models.CharField(

0 commit comments

Comments
 (0)