Merge ~andrey-fedoseev/launchpad:uct-import-directory into launchpad:master

[Andrey Fedoseev]

UCT import: allow importing from a directory

[Colin Watson (cjwatson)]

review: Approve

diff --git a/scripts/uct-import.py b/scripts/uct-import.py
index 5a37c77..489d6ea 100755
--- a/scripts/uct-import.py
+++ b/scripts/uct-import.py
@@ -7,15 +7,20 @@ import _pythonpath  # noqa: F401
 import logging
 from pathlib import Path
 
+from lp.app.validators.cve import CVEREF_PATTERN
 from lp.bugs.scripts.uct import UCTImporter
 from lp.services.scripts.base import LaunchpadScript
 
+logger = logging.getLogger(__name__)
+
 
 class UCTImportScript(LaunchpadScript):
 
-    usage = "usage: %prog [options] CVE_FILE_PATH"
+    usage = "usage: %prog [options] PATH"
     description = (
-        "Import bugs into Launchpad from CVE entries in ubuntu-cve-tracker."
+        "Import bugs into Launchpad from CVE entries in ubuntu-cve-tracker. "
+        "PATH is either path to a CVE file, or path to a directory "
+        "containing the CVE files"
     )
     loglevel = logging.INFO
 
@@ -30,12 +35,27 @@ class UCTImportScript(LaunchpadScript):
 
     def main(self):
         if len(self.args) != 1:
-            self.parser.error("Please specify a CVE file to import")
+            self.parser.error("Please specify a path to import")
+
+        path = Path(self.args[0])
+        if path.is_dir():
+            logger.info(
+                "Importing CVE files from directory: %s", path.resolve()
+            )
+            cve_paths = sorted(
+                p
+                for p in path.rglob("CVE-*")
+                if p.is_file() and CVEREF_PATTERN.match(p.name)
+            )
+            if not cve_paths:
+                logger.warning("Could not find CVE files in %s", path)
+                return
+        else:
+            cve_paths = [path]
 
         importer = UCTImporter(dry_run=self.options.dry_run)
-
-        cve_path = Path(self.args[0])
-        importer.import_cve_from_file(cve_path)
+        for cve_path in cve_paths:
+            importer.import_cve_from_file(cve_path)
 
 
 if __name__ == "__main__":