fix(events): unnest OpenScanHub status enum

Signed-off-by: Matej Focko <[email protected]>
packit · Jan 28, 2025 · 55f3c09 · 55f3c09
1 parent 199be43
commit 55f3c09
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/packit_service/worker/events/openscanhub/task.py b/packit_service/worker/events/openscanhub/task.py
@@ -6,19 +6,20 @@
 from packit_service.worker.events.openscanhub.abstract import OpenScanHubEvent
 
 
+class Status(str, enum.Enum):
+    success = "success"
+    cancel = "cancel"
+    interrupt = "interrupt"
+    fail = "fail"
+
+
 class Started(OpenScanHubEvent):
     @classmethod
     def event_type(cls) -> str:
         return "openscanhub.task.Started"
 
 
 class Finished(OpenScanHubEvent):
-    class Status(str, enum.Enum):
-        success = "success"
-        cancel = "cancel"
-        interrupt = "interrupt"
-        fail = "fail"
-
     def __init__(
         self,
         status: Status,

diff --git a/packit_service/worker/handlers/open_scan_hub.py b/packit_service/worker/handlers/open_scan_hub.py
@@ -150,7 +150,7 @@ def get_issues_added_url(
     def run(self) -> TaskResults:
         self.check_scan_and_build()
         external_links = {"OpenScanHub task": self.event.scan.url}
-        if self.event.status == openscanhub.task.Finished.Status.success:
+        if self.event.status == openscanhub.task.Status.success:
             state = BaseCommitStatus.success
             number_of_new_findings = self.get_number_of_new_findings_identified()
             base_description = "Scan in OpenScanHub is finished."
@@ -178,7 +178,7 @@ def run(self) -> TaskResults:
         else:
             state = BaseCommitStatus.neutral
             description = f"Scan in OpenScanHub is finished in a {self.event.status} state."
-            if self.event.status == openscanhub.task.Finished.Status.cancel:
+            if self.event.status == openscanhub.task.Status.cancel:
                 self.event.scan.set_status(OSHScanStatus.canceled)
             else:
                 self.event.scan.set_status(OSHScanStatus.failed)

diff --git a/tests/unit/test_open_scan_hub.py b/tests/unit/test_open_scan_hub.py
@@ -188,42 +188,42 @@ def test_handle_scan(build_models):
             JobType.copr_build,
             JobConfigTriggerType.commit,
             ["fedora-rawhide-x86_64"],
-            openscanhub.task.Finished.Status.success,
+            openscanhub.task.Status.success,
             0,
         ),
         (
             JobType.copr_build,
             JobConfigTriggerType.pull_request,
             ["fedora-stable"],
-            openscanhub.task.Finished.Status.success,
+            openscanhub.task.Status.success,
             0,
         ),
         (
             JobType.copr_build,
             JobConfigTriggerType.pull_request,
             ["fedora-rawhide-x86_64"],
-            openscanhub.task.Finished.Status.success,
+            openscanhub.task.Status.success,
             1,
         ),
         (
             JobType.copr_build,
             JobConfigTriggerType.pull_request,
             ["fedora-rawhide-x86_64"],
-            openscanhub.task.Finished.Status.fail,
+            openscanhub.task.Status.fail,
             1,
         ),
         (
             JobType.copr_build,
             JobConfigTriggerType.pull_request,
             ["fedora-rawhide-x86_64"],
-            openscanhub.task.Finished.Status.cancel,
+            openscanhub.task.Status.cancel,
             1,
         ),
         (
             JobType.copr_build,
             JobConfigTriggerType.commit,
             ["fedora-rawhide-x86_64"],
-            openscanhub.task.Finished.Status.interrupt,
+            openscanhub.task.Status.interrupt,
             0,
         ),
     ],
@@ -266,7 +266,7 @@ def test_handle_scan_task_finished(
         links_to_external_services = {
             "OpenScanHub task": "https://openscanhub.fedoraproject.org/task/17514/"
         }
-        if scan_status == openscanhub.task.Finished.Status.success:
+        if scan_status == openscanhub.task.Status.success:
             state = BaseCommitStatus.success
             description = "Scan in OpenScanHub is finished. 2 new findings identified."
             flexmock(scan_mock).should_receive("set_status").with_args(
@@ -283,7 +283,7 @@ def test_handle_scan_task_finished(
                     ),
                 }
             )
-        elif scan_status == openscanhub.task.Finished.Status.cancel:
+        elif scan_status == openscanhub.task.Status.cancel:
             state = BaseCommitStatus.neutral
             description = f"Scan in OpenScanHub is finished in a {scan_status} state."
             flexmock(scan_mock).should_receive("set_status").with_args(