Merge ~litios/ubuntu-cve-tracker:customers/support-other-distributions into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

Certain subprojects use a different distribution and this information is not recorded anywhere.

This PR adds support for external (and potentially internal) releases to provide an alternative distribution. The default one is 'ubuntu'.

----

Also, add support for specifying a release when generating the package cache for OVAL.

[Eduardo Barretto (ebarretto)]

just some small comments to make code easier to read, but overall looks good

review: Needs Fixing

8cc44b3... by David Fernandez Gonzalez on 2024-02-02

[OVAL+CVE_LIB] Rename distribution variables to mention LP-related use

Signed-off-by: David Fernandez Gonzalez <email address hidden>

8d0e769... by David Fernandez Gonzalez on 2024-02-02

[CVE_LIB] Rename external subproject key from distribution to lp_distribution

Signed-off-by: David Fernandez Gonzalez <email address hidden>

[Eduardo Barretto (ebarretto)]

lgtm, thanks for addressing the comments!

review: Approve

diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index a4690dd..051cdf8 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -800,6 +800,17 @@ def release_ppa_pocket(rel, ppa):
         pass
     return pocket
 
+def lp_distribution(rel):
+    """
+        Get the Launchpad distribution for the given release.
+        Intended use is for Launchpad API.
+    """
+    _, _, _, details = get_subproject_details(rel)
+    if not 'lp_distribution' in details:
+        return 'ubuntu'
+
+    return details['lp_distribution']
+
 def release_name(rel):
     name = None
     _, _, _, details = get_subproject_details(rel)
@@ -977,7 +988,7 @@ def find_external_subproject_cves(cve):
 # except for the extra 'product' and 'release' keys.
 MANDATORY_EXTERNAL_SUBPROJECT_KEYS = ['cve_triage', 'cve_patching', 'cve_notification', 'security_updates_notification', 'binary_copies_only', 'seg_support', 'owners', 'subprojects']
 MANDATORY_EXTERNAL_SUBPROJECT_PPA_KEYS = ['ppas', 'oval', 'product', 'release', 'supported_packages']
-OPTIONAL_EXTERNAL_SUBPROJECT_PPA_KEYS =  ['parent', 'name', 'codename', 'description', 'aliases', 'archs']
+OPTIONAL_EXTERNAL_SUBPROJECT_PPA_KEYS =  ['parent', 'name', 'codename', 'description', 'aliases', 'archs', 'lp_distribution']
 
 def load_external_subprojects(strict=False):
     """Search for and load subprojects into the global subprojects dict.
diff --git a/scripts/generate_pkg_cache.py b/scripts/generate_pkg_cache.py
index 672e614..a858100 100644
--- a/scripts/generate_pkg_cache.py
+++ b/scripts/generate_pkg_cache.py
@@ -11,7 +11,7 @@
 # for details.
 #
 
-from cve_lib import (all_releases, devel_release, eol_releases, needs_oval, product_series, release_parent, release_ppas, release_ppa_pocket)
+from cve_lib import (all_releases, devel_release, eol_releases, needs_oval, product_series, release_parent, release_ppas, release_ppa_pocket, lp_distribution)
 
 import argparse
 import datetime
@@ -103,8 +103,8 @@ def get_binaries_rel(release, archive, real_threshold, series, cache, latest_dat
 
 def update_cache(release, cache, ppas=None, latest_date_created=None):
     lp = lpl_common.connect(version='devel')
-    ubuntu = lp.distributions['ubuntu']
-    series = ubuntu.getSeries(name_or_version=product_series(release)[1])
+    rel_lp_distribution = lp.distributions[lp_distribution(release)]
+    series = rel_lp_distribution.getSeries(name_or_version=product_series(release)[1])
 
     real_threshold = None
     if latest_date_created:
@@ -119,12 +119,12 @@ def update_cache(release, cache, ppas=None, latest_date_created=None):
                 ppa.split('/ubuntu')[0],
                 lp,
                 False,
-                distribution=ubuntu
+                distribution=rel_lp_distribution
             )
 
             latest_date_created = get_binaries_rel(release, archive, real_threshold, series, cache, latest_date_created, ppa)
     else:
-        latest_date_created = get_binaries_rel(release, ubuntu.main_archive, real_threshold, series, cache, latest_date_created)
+        latest_date_created = get_binaries_rel(release, rel_lp_distribution.main_archive, real_threshold, series, cache, latest_date_created)
 
     return latest_date_created
 
@@ -161,6 +161,7 @@ def get_supported_releases():
 
 def parse_args():
     argparser = argparse.ArgumentParser()
+    argparser.add_argument('-r','--releases', nargs='+', help='Releases to generate the pkg cache for', required=False)
     argparser.add_argument("--cache-dir", help="cache files directory")
     argparser.add_argument("-d", "--debug", action="store_true",
                            help="make execution verbose")
@@ -181,8 +182,17 @@ def main():
 
     supported_releases = get_supported_releases()
 
+    if args.releases:
+        for release in args.releases:
+            if release not in supported_releases:
+                print(f"Release {release} not in supported releases.")
+                sys.exit(1)
+        target_releases = args.releases
+    else:
+        target_releases = supported_releases
+ 
     try:
-        for release in supported_releases:
+        for release in target_releases:
             cache = load_cache_file(cache_dir, release)
 
             latest_date_created = None