Resolve owner and project through CoprBuildHelper (#2322)

Resolve owner and project through CoprBuildHelper

If no owner and project are given in the vm_image_build job resolve them through the CoprBuildHelper defaults.
When looking for the copr_build job related with a vm_image_build and COPR owner or project are not given then
guess they are being created by the CoprBuildHelper and use it to find them.

Reviewed-by: Laura Barcziová

Author: softwarefactory-project-zuul[bot]

packit_service/worker/checker/copr.py

@@ -18,18 +18,23 @@
     GetCoprBuildJobHelperForIdMixin,
     GetCoprBuildJobHelperMixin,
     GetCoprSRPMBuildMixin,
+    ConfigFromEventMixin,
 )
 from packit_service.worker.reporting import BaseCommitStatus
 
 logger = logging.getLogger(__name__)
 
 
-class IsJobConfigTriggerMatching(Checker, GetCoprBuildJobHelperMixin):
+class IsJobConfigTriggerMatching(
+    Checker, ConfigFromEventMixin, GetCoprBuildJobHelperMixin
+):
     def pre_check(self) -> bool:
         return self.copr_build_helper.is_job_config_trigger_matching(self.job_config)
 
 
-class IsGitForgeProjectAndEventOk(Checker, GetCoprBuildJobHelperMixin):
+class IsGitForgeProjectAndEventOk(
+    Checker, ConfigFromEventMixin, GetCoprBuildJobHelperMixin
+):
     def pre_check(
         self,
     ) -> bool:
@@ -102,7 +107,9 @@ def pre_check(self) -> bool:
         return not bool(build.build_start_time)
 
 
-class CanActorRunTestsJob(ActorChecker, GetCoprBuildJobHelperMixin):
+class CanActorRunTestsJob(
+    ActorChecker, ConfigFromEventMixin, GetCoprBuildJobHelperMixin
+):
     """For external contributors, we need to be more careful when running jobs.
     This is a handler-specific permission check
     for a user who trigger the action on a PR.

packit_service/worker/checker/vm_image.py

@@ -9,17 +9,23 @@
 )
 from packit_service.worker.checker.abstract import Checker, ActorChecker
 from packit_service.worker.mixin import (
-    GetVMImageDataMixin,
     ConfigFromEventMixin,
     GetReporterFromJobHelperMixin,
 )
+from packit_service.worker.handlers.mixin import (
+    GetVMImageDataMixin,
+    GetCoprBuildJobHelperMixin,
+)
 from packit_service.worker.reporting import BaseCommitStatus
 
 logger = logging.getLogger(__name__)
 
 
 class GetVMImageBuildReporterFromJobHelperMixin(
-    GetReporterFromJobHelperMixin, GetVMImageDataMixin
+    ConfigFromEventMixin,
+    GetCoprBuildJobHelperMixin,
+    GetReporterFromJobHelperMixin,
+    GetVMImageDataMixin,
 ):
     status_name = "vm-image-build"
 
@@ -72,14 +78,12 @@ def pre_check(
         if self.copr_build:
             return True
 
-        project = (
-            f"project {self.job_config.owner}/{self.job_config.project}, "
-            if self.job_config.owner and self.job_config.project
-            else ""
-        )
+        owner = self.job_config.owner or self.copr_build_helper.job_owner
+        project = self.job_config.project or self.copr_build_helper.default_project_name
+        owner_project = f"project {owner}/{project}, " if owner and project else ""
 
         msg = (
-            f"No successful Copr build found for {project}"
+            f"No successful Copr build found for {owner_project}"
             f"commit {self.data.commit_sha} "
             f"and chroot (target) {self.job_config.copr_chroot}"
         )
@@ -88,9 +92,7 @@ def pre_check(
         return False
 
 
-class HasAuthorWriteAccess(
-    ActorChecker, ConfigFromEventMixin, GetVMImageBuildReporterFromJobHelperMixin
-):
+class HasAuthorWriteAccess(ActorChecker, GetVMImageBuildReporterFromJobHelperMixin):
     def _pre_check(self) -> bool:
         if not self.project.has_write_access(user=self.actor):
             msg = (

packit_service/worker/handlers/copr.py

@@ -65,6 +65,7 @@
     GetCoprBuildEventMixin,
     GetCoprBuildJobHelperForIdMixin,
     GetCoprBuildJobHelperMixin,
+    ConfigFromEventMixin,
 )
 from packit_service.worker.mixin import PackitAPIWithDownstreamMixin
 from packit_service.worker.reporting import BaseCommitStatus, DuplicateCheckMode
@@ -90,7 +91,10 @@
 @reacts_to(CheckRerunCommitEvent)
 @reacts_to(CheckRerunReleaseEvent)
 class CoprBuildHandler(
-    RetriableJobHandler, PackitAPIWithDownstreamMixin, GetCoprBuildJobHelperMixin
+    RetriableJobHandler,
+    ConfigFromEventMixin,
+    PackitAPIWithDownstreamMixin,
+    GetCoprBuildJobHelperMixin,
 ):
     task_name = TaskName.copr_build
 

packit_service/worker/handlers/mixin.py

@@ -8,13 +8,15 @@
 from packit.exceptions import PackitException
 from packit.config import PackageConfig, JobConfig
 from packit.utils.koji_helper import KojiHelper
+from packit.vm_image_build import ImageBuilder
 from packit_service.utils import get_packit_commands_from_comment
 from packit_service.config import ProjectToSync
 from packit_service.constants import COPR_SRPM_CHROOT, KojiBuildState
 from packit_service.models import (
     ProjectEventModel,
     CoprBuildTargetModel,
     SRPMBuildModel,
+    BuildStatus,
 )
 from packit_service.worker.events.event import EventData
 from packit_service.worker.events.copr import AbstractCoprBuildEvent
@@ -359,7 +361,7 @@ def copr_build_helper(self) -> CoprBuildJobHelper:
         ...
 
 
-class GetCoprBuildJobHelperMixin(GetCoprBuildJobHelper, ConfigFromEventMixin):
+class GetCoprBuildJobHelperMixin(Config, GetCoprBuildJobHelper):
     _copr_build_helper: Optional[CoprBuildJobHelper] = None
 
     @property
@@ -506,3 +508,126 @@ def project_to_sync(self) -> Optional[ProjectToSync]:
             ):
                 self._project_to_sync = project_to_sync
         return self._project_to_sync
+
+
+class GetVMImageBuilder(Protocol):
+    @property
+    @abstractmethod
+    def vm_image_builder(self):
+        ...
+
+
+class GetVMImageData(Protocol):
+    @property
+    @abstractmethod
+    def build_id(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def chroot(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def identifier(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def owner(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def project_name(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def image_distribution(self) -> str:
+        ...
+
+    @property
+    @abstractmethod
+    def image_request(self) -> dict:
+        ...
+
+    @property
+    @abstractmethod
+    def image_customizations(self) -> dict:
+        ...
+
+
+class GetVMImageBuilderMixin(Config):
+    _vm_image_builder: Optional[ImageBuilder] = None
+
+    @property
+    def vm_image_builder(self):
+        if not self._vm_image_builder:
+            self._vm_image_builder = ImageBuilder(
+                self.service_config.redhat_api_refresh_token
+            )
+        return self._vm_image_builder
+
+
+class GetVMImageDataMixin(Config, GetCoprBuildJobHelper):
+    job_config: JobConfig
+    _copr_build: Optional[CoprBuildTargetModel] = None
+    _copr_build_helper: Optional[CoprBuildJobHelper] = None
+
+    @property
+    def chroot(self) -> str:
+        return self.job_config.copr_chroot
+
+    @property
+    def identifier(self) -> str:
+        return self.job_config.identifier
+
+    @property
+    def owner(self) -> str:
+        return self.job_config.owner or (
+            self.copr_build.owner if self.copr_build else None
+        )
+
+    @property
+    def project_name(self) -> str:
+        return self.job_config.project or (
+            self.copr_build.project_name if self.copr_build else None
+        )
+
+    @property
+    def image_name(self) -> str:
+        return f"{self.owner}/" f"{self.project_name}/{self.data.pr_id}"
+
+    @property
+    def image_distribution(self) -> str:
+        return self.job_config.image_distribution
+
+    @property
+    def image_request(self) -> dict:
+        return self.job_config.image_request
+
+    @property
+    def image_customizations(self) -> dict:
+        return self.job_config.image_customizations
+
+    @property
+    def copr_build(self) -> Optional[CoprBuildTargetModel]:
+        if not self._copr_build:
+            copr_builds = CoprBuildTargetModel.get_all_by(
+                project_name=self.job_config.project
+                or self.copr_build_helper.default_project_name,
+                commit_sha=self.data.commit_sha,
+                owner=self.job_config.owner or self.copr_build_helper.job_owner,
+                target=self.job_config.copr_chroot,
+                status=BuildStatus.success,
+            )
+
+            for copr_build in copr_builds:
+                project_event_object = copr_build.get_project_event_object()
+                # check whether the event trigger matches
+                if project_event_object.id == self.data.db_project_object.id:
+                    self._copr_build = copr_build
+                    break
+        return self._copr_build

packit_service/worker/handlers/vm_image.py

@@ -31,10 +31,11 @@
     GetVMImageBuildReporterFromJobHelperMixin,
 )
 from packit_service.worker.mixin import (
-    ConfigFromEventMixin,
-    GetVMImageBuilderMixin,
     PackitAPIWithDownstreamMixin,
 )
+from packit_service.worker.handlers.mixin import (
+    GetVMImageBuilderMixin,
+)
 from packit_service.models import (
     VMImageBuildTargetModel,
     VMImageBuildStatus,
@@ -51,7 +52,6 @@
 @reacts_to(AbstractPRCommentEvent)
 class VMImageBuildHandler(
     RetriableJobHandler,
-    ConfigFromEventMixin,
     PackitAPIWithDownstreamMixin,
     GetVMImageBuilderMixin,
     GetVMImageBuildReporterFromJobHelperMixin,
@@ -119,7 +119,6 @@ def run(self) -> TaskResults:
 @reacts_to(VMImageBuildResultEvent)
 class VMImageBuildResultHandler(
     JobHandler,
-    ConfigFromEventMixin,
     PackitAPIWithDownstreamMixin,
     GetVMImageBuilderMixin,
     GetVMImageBuildReporterFromJobHelperMixin,

packit_service/worker/helpers/build/babysit.py

@@ -36,7 +36,8 @@
     VMImageBuildResultEvent,
 )
 from packit_service.worker.events.enums import FedmsgTopic
-from packit_service.worker.mixin import ConfigFromUrlMixin, GetVMImageBuilderMixin
+from packit_service.worker.mixin import ConfigFromUrlMixin
+from packit_service.worker.handlers.mixin import GetVMImageBuilderMixin
 from packit_service.worker.handlers import (
     CoprBuildEndHandler,
     CoprBuildStartHandler,