launchpad-reviewers team mailing list archive

[Enrique Sánchez <mp+492722@xxxxxxxxxxxxxxxxxx>]

Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:add-uct-import-handler into launchpad:master.

Commit message:
Fix vulnerability model tests
    
There was a missing parameter for SOSSImport

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/492722
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:add-uct-import-handler into launchpad:master.

diff --git a/lib/lp/bugs/model/vulnerability.py b/lib/lp/bugs/model/vulnerability.py
index b73928d..068bee3 100644
--- a/lib/lp/bugs/model/vulnerability.py
+++ b/lib/lp/bugs/model/vulnerability.py
@@ -68,7 +68,10 @@ VULNERABILITY_IMPORT_ENABLED_FEATURE_FLAG = (
     "bugs.vulnerability_import_export.enabled"
 )
 
-HANDLER_DISTRIBUTION_MAP = {VulnerabilityHandlerEnum.SOSS: "soss"}
+HANDLER_DISTRIBUTION_MAP = {
+    VulnerabilityHandlerEnum.SOSS: "soss",
+    VulnerabilityHandlerEnum.UCT: "ubuntu",
+}
 
 
 @implementer(IVulnerability, IBugLinkTarget)
@@ -418,16 +421,18 @@ class VulnerabilitySet:
         # Launchpad's object permissions automatically check requester's
         # permissions to git repo
 
+        distribution = getUtility(IDistributionSet).getByName(
+            HANDLER_DISTRIBUTION_MAP.get(handler)
+        )
+
         # Check requester's permissions to handler
         if handler == VulnerabilityHandlerEnum.SOSS:
             from lp.bugs.scripts.soss.sossimport import SOSSImporter
 
-            distribution = getUtility(IDistributionSet).getByName("soss")
             importer = SOSSImporter(distribution)
         elif handler == VulnerabilityHandlerEnum.UCT:
             from lp.bugs.scripts.uct.uctimport import UCTImporter
 
-            distribution = getUtility(IDistributionSet).getByName("ubuntu")
             importer = UCTImporter(distribution)
         else:
             raise NotFoundError(f"{handler} not found")
@@ -524,8 +529,12 @@ class VulnerabilitySet:
         from lp.bugs.model.vulnerabilityjob import VulnerabilityJob
         from lp.bugs.scripts.soss.sossimport import SOSSImporter
 
+        distribution = getUtility(IDistributionSet).getByName(
+            HANDLER_DISTRIBUTION_MAP.get(handler)
+        )
+
         if handler == VulnerabilityHandlerEnum.SOSS:
-            importer = SOSSImporter()
+            importer = SOSSImporter(distribution)
         else:
             raise NotFoundError(f"{handler} not found")
 
@@ -554,11 +563,12 @@ class VulnerabilitySet:
         from lp.bugs.model.vulnerabilityjob import VulnerabilityJob
         from lp.bugs.scripts.soss.sossexport import SOSSExporter
 
+        distribution = getUtility(IDistributionSet).getByName(
+            HANDLER_DISTRIBUTION_MAP.get(handler)
+        )
+
         if handler == VulnerabilityHandlerEnum.SOSS:
             exporter = SOSSExporter()
-            distribution = getUtility(IDistributionSet).getByName(
-                HANDLER_DISTRIBUTION_MAP[handler]
-            )
         else:
             raise NotFoundError(f"{handler} not found")