diff --git a/packit_service/worker/handlers/github_handlers.py b/packit_service/worker/handlers/github_handlers.py index 161eb677a..c542411cf 100644 --- a/packit_service/worker/handlers/github_handlers.py +++ b/packit_service/worker/handlers/github_handlers.py @@ -81,19 +81,20 @@ class AbstractGithubJobHandler(JobHandler, GithubPackageConfigGetter): class PullRequestGithubCheckDownstreamHandler(AbstractGithubJobHandler): type = JobType.check_downstream triggers = [TheJobTriggerType.pull_request] + event: PullRequestEvent # https://developer.github.com/v3/activity/events/types/#events-api-payload-28 def __init__( - self, config: ServiceConfig, job_config: JobConfig, pr_event: PullRequestEvent + self, config: ServiceConfig, job_config: JobConfig, event: PullRequestEvent ): - super().__init__(config=config, job_config=job_config, event=pr_event) - self.pr_event = pr_event - self.project: GitProject = pr_event.get_project() + super().__init__(config=config, job_config=job_config, event=event) + self.event = event + self.project: GitProject = event.get_project() self.package_config: PackageConfig = self.get_package_config_from_repo( - self.project, pr_event.base_ref, pr_event.pr_id + self.project, event.base_ref, event.pr_id ) - self.package_config.upstream_project_url = pr_event.project_url + self.package_config.upstream_project_url = event.project_url def run(self) -> HandlerResults: self.local_project = LocalProject( @@ -103,7 +104,7 @@ def run(self) -> HandlerResults: self.api = PackitAPI(self.config, self.package_config, self.local_project) self.api.sync_pr( - pr_id=self.pr_event.pr_id, + pr_id=self.event.pr_id, dist_git_branch=self.job_config.metadata.get("dist-git-branch", "master"), # TODO: figure out top upstream commit for source-git here ) @@ -113,6 +114,7 @@ def run(self) -> HandlerResults: class GithubAppInstallationHandler(AbstractGithubJobHandler): type = JobType.add_to_whitelist triggers = [TheJobTriggerType.installation] + event: InstallationEvent # https://developer.github.com/v3/activity/events/types/#events-api-payload-28 @@ -120,11 +122,11 @@ def __init__( self, config: ServiceConfig, job_config: Optional[JobConfig], - installation_event: Union[InstallationEvent, Any], + event: Union[InstallationEvent, Any], ): - super().__init__(config=config, job_config=job_config, event=installation_event) + super().__init__(config=config, job_config=job_config, event=event) - self.installation_event = installation_event + self.event = event self.project = self.config.get_project( url="https://github.com/packit-service/notifications" ) @@ -138,21 +140,20 @@ def run(self) -> HandlerResults: """ Installation.create( - installation_id=self.installation_event.installation_id, - event=self.installation_event, + installation_id=self.event.installation_id, event=self.event, ) # try to add user to whitelist whitelist = Whitelist( fas_user=self.config.fas_user, fas_password=self.config.fas_password, ) - account_login = self.installation_event.account_login - account_type = self.installation_event.account_type - if not whitelist.add_account(self.installation_event): + account_login = self.event.account_login + account_type = self.event.account_type + if not whitelist.add_account(self.event): # Create an issue in our repository, so we are notified when someone install the app self.project.create_issue( title=f"{account_type} {account_login} needs to be approved.", body=( - f"Hi @{self.installation_event.sender_login}, we need to approve you in " + f"Hi @{self.event.sender_login}, we need to approve you in " "order to start using Packit-as-a-Service. Someone from our team will " "get back to you shortly.\n\n" "For more info, please check out the documentation: " diff --git a/packit_service/worker/handlers/testing_farm_handlers.py b/packit_service/worker/handlers/testing_farm_handlers.py index 4d7f780be..23b8ed643 100644 --- a/packit_service/worker/handlers/testing_farm_handlers.py +++ b/packit_service/worker/handlers/testing_farm_handlers.py @@ -58,17 +58,17 @@ def __init__( self, config: ServiceConfig, job_config: Optional[JobConfig], - test_results_event: TestingFarmResultsEvent, + event: TestingFarmResultsEvent, ): - super().__init__(config=config, job_config=job_config, event=test_results_event) - self.project: GitProject = test_results_event.get_project() + super().__init__(config=config, job_config=job_config, event=event) + self.project: GitProject = event.get_project() self.package_config = self.get_package_config_from_repo( project=self.project, reference=self.event.git_ref ) if not self.package_config: raise ValueError(f"No config file found in {self.project.full_repo_name}") - self.package_config.upstream_project_url = test_results_event.project_url + self.package_config.upstream_project_url = event.project_url def get_package_config_from_repo( self, diff --git a/packit_service/worker/jobs.py b/packit_service/worker/jobs.py index 03beca00c..7f83a666c 100644 --- a/packit_service/worker/jobs.py +++ b/packit_service/worker/jobs.py @@ -308,7 +308,7 @@ def process_message(self, event: dict, topic: str = None) -> Optional[dict]: # not repository, so package config with jobs is missing if event_object.trigger == TheJobTriggerType.installation: handler = GithubAppInstallationHandler( - self.config, job_config=None, installation_event=event_object + self.config, job_config=None, event=event_object ) job_type = JobType.add_to_whitelist.value jobs_results[job_type] = handler.run_n_clean() diff --git a/tests/unit/test_testing_farm.py b/tests/unit/test_testing_farm.py index 0d38eddf6..1912e7e46 100644 --- a/tests/unit/test_testing_farm.py +++ b/tests/unit/test_testing_farm.py @@ -171,7 +171,7 @@ def test_testing_farm_response( test_farm_handler = TestingFarmResultsHandler( config=flexmock(command_handler_work_dir=flexmock()), job_config=flexmock(), - test_results_event=TestingFarmResultsEvent( + event=TestingFarmResultsEvent( pipeline_id="id", result=tests_result, environment=flexmock(),