File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1919from vulnerabilities .importers import epss
2020from vulnerabilities .importers import fireeye
2121from vulnerabilities .importers import gentoo
22- from vulnerabilities .importers import github
2322from vulnerabilities .importers import github_osv
2423from vulnerabilities .importers import istio
2524from vulnerabilities .importers import mozilla
3837from vulnerabilities .importers import vulnrichment
3938from vulnerabilities .importers import xen
4039from vulnerabilities .pipelines import VulnerableCodeBaseImporterPipeline
40+ from vulnerabilities .pipelines import github_importer
4141from vulnerabilities .pipelines import gitlab_importer
4242from vulnerabilities .pipelines import nginx_importer
4343from vulnerabilities .pipelines import npm_importer
4444from vulnerabilities .pipelines import pypa_importer
4545
4646IMPORTERS_REGISTRY = [
4747 nvd .NVDImporter ,
48- github .GitHubAPIImporter ,
4948 pysec .PyPIImporter ,
5049 alpine_linux .AlpineImporter ,
5150 openssl .OpensslImporter ,
7877 npm_importer .NpmImporterPipeline ,
7978 nginx_importer .NginxImporterPipeline ,
8079 gitlab_importer .GitLabImporterPipeline ,
80+ github_importer .GitHubAPIImporterPipeline ,
8181]
8282
8383IMPORTERS_REGISTRY = {
Original file line number Diff line number Diff line change 3131from vulnerabilities .importers .debian import DebianImporter
3232from vulnerabilities .importers .debian_oval import DebianOvalImporter
3333from vulnerabilities .importers .elixir_security import ElixirSecurityImporter
34- from vulnerabilities .importers .github import GitHubAPIImporter
3534from vulnerabilities .importers .github_osv import GithubOSVImporter
3635from vulnerabilities .importers .istio import IstioImporter
3736from vulnerabilities .importers .oss_fuzz import OSSFuzzImporter
4241from vulnerabilities .improver import Inference
4342from vulnerabilities .models import Advisory
4443from vulnerabilities .pipelines import VulnerableCodeBaseImporterPipeline
44+ from vulnerabilities .pipelines .github_importer import GitHubAPIImporterPipeline
4545from vulnerabilities .pipelines .gitlab_importer import GitLabImporterPipeline
4646from vulnerabilities .pipelines .nginx_importer import NginxImporterPipeline
4747from vulnerabilities .pipelines .npm_importer import NpmImporterPipeline
@@ -371,7 +371,7 @@ class GitLabBasicImprover(ValidVersionImprover):
371371
372372
373373class GitHubBasicImprover (ValidVersionImprover ):
374- importer = GitHubAPIImporter
374+ importer = GitHubAPIImporterPipeline
375375 ignorable_versions = frozenset (
376376 [
377377 "0.1-bulbasaur" ,
Original file line number Diff line number Diff line change @@ -89,7 +89,12 @@ def advisories_count(self) -> int:
8989
9090 def collect_and_store_advisories (self ):
9191 collected_advisory_count = 0
92- progress = LoopProgress (total_iterations = self .advisories_count (), logger = self .log )
92+ estimated_advisory_count = self .advisories_count ()
93+
94+ if estimated_advisory_count > 0 :
95+ self .log (f"Collecting { estimated_advisory_count :,d} advisories" )
96+
97+ progress = LoopProgress (total_iterations = estimated_advisory_count , logger = self .log )
9398 for advisory in progress .iter (self .collect_advisories ()):
9499 if _obj := insert_advisory (
95100 advisory = advisory ,
You can’t perform that action at this time.
0 commit comments