From ad809de7db37e344be2963c6d6292f3ef5bbd59b Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Wed, 5 Mar 2025 15:23:48 +0200 Subject: [PATCH 1/2] Always process OWNERS file --- webhook_server_container/libs/github_api.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index 4d1b05a7..c24d4e21 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -197,6 +197,10 @@ def process(self) -> None: event_log: str = f"Event type: {self.github_event}. event ID: {self.x_github_delivery}" + self.all_approvers_and_reviewers = self.get_all_approvers_and_reviewers() + self.all_approvers = self.get_all_approvers() + self.all_reviewers = self.get_all_reviewers() + try: self.pull_request = self._get_pull_request() self.log_prefix = self.prepare_log_prefix(pull_request=self.pull_request) @@ -206,9 +210,6 @@ def process(self) -> None: self.last_committer = getattr(self.last_commit.committer, "login", self.parent_committer) self.changed_files = self.list_changed_files() self.pull_request_branch = self.pull_request.base.ref - self.all_approvers_and_reviewers = self.get_all_approvers_and_reviewers() - self.all_approvers = self.get_all_approvers() - self.all_reviewers = self.get_all_reviewers() if self.jira_enabled_repository: self.set_jira_in_pull_request() @@ -344,6 +345,9 @@ def process_pull_request_check_run_webhook_data(self) -> None: ) for _pull_request in self.repository.get_pulls(state="open"): if _pull_request.head.sha == check_run_head_sha: + self.logger.debug( + f"{self.log_prefix} Found pull request {_pull_request.title} [{_pull_request.number}] for check run {check_run_name}" + ) self.pull_request = _pull_request self.last_commit = self._get_last_commit() return self.check_if_can_be_merged() From e430c8c2325c61ca1b6706ab35be949ba2800cda Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Wed, 5 Mar 2025 15:28:21 +0200 Subject: [PATCH 2/2] Add log when pull request found for checkrun --- webhook_server_container/libs/github_api.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index c24d4e21..0baffaa4 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -197,10 +197,6 @@ def process(self) -> None: event_log: str = f"Event type: {self.github_event}. event ID: {self.x_github_delivery}" - self.all_approvers_and_reviewers = self.get_all_approvers_and_reviewers() - self.all_approvers = self.get_all_approvers() - self.all_reviewers = self.get_all_reviewers() - try: self.pull_request = self._get_pull_request() self.log_prefix = self.prepare_log_prefix(pull_request=self.pull_request) @@ -210,6 +206,9 @@ def process(self) -> None: self.last_committer = getattr(self.last_commit.committer, "login", self.parent_committer) self.changed_files = self.list_changed_files() self.pull_request_branch = self.pull_request.base.ref + self.all_approvers_and_reviewers = self.get_all_approvers_and_reviewers() + self.all_approvers = self.get_all_approvers() + self.all_reviewers = self.get_all_reviewers() if self.jira_enabled_repository: self.set_jira_in_pull_request()