Merge branch 'main' into collect-package-patch

Author: TG1999

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+next release
+---------------------
+
+- WARNING: Vulnerablecode V1 API and UI has stopped supporting Ubuntu OVAL advisories, please shift to V3 API for new Ubuntu advisories. 
+
 Version v38.6.0
 ---------------------
 

vulnerabilities/importers/__init__.py

@@ -28,7 +28,6 @@
 from vulnerabilities.importers import retiredotnet
 from vulnerabilities.importers import ruby
 from vulnerabilities.importers import suse_scores
-from vulnerabilities.importers import ubuntu
 from vulnerabilities.importers import ubuntu_usn
 from vulnerabilities.importers import vulnrichment
 from vulnerabilities.importers import xen
@@ -137,7 +136,6 @@
         openssl_importer_v2.OpenSSLImporterPipeline,
         redhat.RedhatImporter,
         archlinux.ArchlinuxImporter,
-        ubuntu.UbuntuImporter,
         debian_oval.DebianOvalImporter,
         retiredotnet.RetireDotnetImporter,
         apache_httpd.ApacheHTTPDImporter,

vulnerabilities/importers/ubuntu.py

@@ -49,7 +49,6 @@
         valid_versions.ApacheKafkaImprover,
         valid_versions.IstioImprover,
         valid_versions.DebianOvalImprover,
-        valid_versions.UbuntuOvalImprover,
         valid_versions.OSSFuzzImprover,
         valid_versions.RubyImprover,
         valid_versions.GithubOSVImprover,

vulnerabilities/improvers/__init__.py

@@ -35,7 +35,6 @@
 from vulnerabilities.importers.istio import IstioImporter
 from vulnerabilities.importers.oss_fuzz import OSSFuzzImporter
 from vulnerabilities.importers.ruby import RubyImporter
-from vulnerabilities.importers.ubuntu import UbuntuImporter
 from vulnerabilities.improver import MAX_CONFIDENCE
 from vulnerabilities.improver import Improver
 from vulnerabilities.improver import Inference
@@ -458,11 +457,6 @@ class DebianOvalImprover(ValidVersionImprover):
     ignorable_versions = []
 
 
-class UbuntuOvalImprover(ValidVersionImprover):
-    importer = UbuntuImporter
-    ignorable_versions = []
-
-
 class OSSFuzzImprover(ValidVersionImprover):
     importer = OSSFuzzImporter
     ignorable_versions = []

vulnerabilities/improvers/valid_versions.py

@@ -273,6 +273,7 @@ class VulnerableCodeBaseImporterPipelineV2(VulnerableCodePipeline):
 
     pipeline_id = None  # Unique Pipeline ID, this should be the name of pipeline module.
     license_url = None
+    datasource_name = None
     spdx_license_expression = None
     repo_url = None
     ignorable_versions = []

vulnerabilities/pipelines/__init__.py

@@ -18,6 +18,7 @@ class RemoveDuplicateAdvisoriesPipeline(VulnerableCodePipeline):
     """Pipeline to compute new advisory content id and remove duplicate advisories based on their content."""
 
     pipeline_id = "remove_duplicate_advisories"
+    run_once = True
 
     @classmethod
     def steps(cls):