Skip to content

Commit c341e6b

Browse files
committed
Adjust precedence of importers
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 78ca528 commit c341e6b

File tree

8 files changed

+16
-12
lines changed

8 files changed

+16
-12
lines changed

vulnerabilities/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,9 +1139,9 @@ def get_affecting_vulnerabilities(self):
11391139
next_fixed_package_vulns = list(fixed_by_pkg.affected_by)
11401140

11411141
fixed_by_package_details["fixed_by_purl"] = fixed_by_purl
1142-
fixed_by_package_details["fixed_by_purl_vulnerabilities"] = (
1143-
next_fixed_package_vulns
1144-
)
1142+
fixed_by_package_details[
1143+
"fixed_by_purl_vulnerabilities"
1144+
] = next_fixed_package_vulns
11451145
fixed_by_pkgs.append(fixed_by_package_details)
11461146

11471147
vuln_details["fixed_by_package_details"] = fixed_by_pkgs

vulnerabilities/pipelines/v2_importers/elixir_security_importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ElixirSecurityImporterPipeline(VulnerableCodeBaseImporterPipelineV2):
3737
repo_url = "git+https://github.com/dependabot/elixir-security-advisories"
3838
run_once = True
3939

40-
precedence = 200
40+
precedence = 400
4141

4242
@classmethod
4343
def steps(cls):

vulnerabilities/pipelines/v2_importers/npm_importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class NpmImporterPipeline(VulnerableCodeBaseImporterPipelineV2):
4141
license_url = "https://github.com/nodejs/security-wg/blob/main/LICENSE.md"
4242
repo_url = "git+https://github.com/nodejs/security-wg"
4343

44-
precedence = 200
44+
precedence = 500
4545

4646
@classmethod
4747
def steps(cls):

vulnerabilities/pipelines/v2_importers/retiredotnet_importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class RetireDotnetImporterPipeline(VulnerableCodeBaseImporterPipelineV2):
3030
pipeline_id = "retiredotnet_importer_v2"
3131
run_once = True
3232

33-
precedence = 200
33+
precedence = 400
3434

3535
@classmethod
3636
def steps(cls):

vulnerabilities/pipelines/v2_importers/ruby_importer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class RubyImporterPipeline(VulnerableCodeBaseImporterPipelineV2):
5858
SOFTWARE.
5959
"""
6060

61-
precedence = 200
61+
precedence = 500
6262

6363
@classmethod
6464
def steps(cls):

vulnerabilities/pipes/openssl.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ def get_reference(reference_name, tag, reference_url):
8989
ref_type = (
9090
AdvisoryReference.COMMIT
9191
if "commit" in name or tag == "patch"
92-
else AdvisoryReference.ADVISORY if "advisory" in name else AdvisoryReference.OTHER
92+
else AdvisoryReference.ADVISORY
93+
if "advisory" in name
94+
else AdvisoryReference.OTHER
9395
)
9496

9597
return ReferenceV2(

vulnerabilities/tests/pipelines/v2_importers/test_collect_fix_commit.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ def test_collect_fix_commits_groups_by_vuln(mock_repo, pipeline):
5252
side_effect=lambda c: (
5353
["CVE-2021-0001"]
5454
if "CVE" in c.message
55-
else ["GHSA-dead-beef-baad"] if "GHSA" in c.message else []
55+
else ["GHSA-dead-beef-baad"]
56+
if "GHSA" in c.message
57+
else []
5658
)
5759
)
5860

vulnerabilities/tests/test_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def cleaned_response(response):
7575
reference["scores"] = sorted(
7676
reference["scores"], key=lambda x: (x["value"], x["scoring_system"])
7777
)
78-
package_data["resolved_vulnerabilities"][index]["references"][index2]["scores"] = (
79-
reference["scores"]
80-
)
78+
package_data["resolved_vulnerabilities"][index]["references"][index2][
79+
"scores"
80+
] = reference["scores"]
8181

8282
cleaned_response.append(package_data)
8383

0 commit comments

Comments
 (0)