Merge pull request #57 from scality/bugfix/BERTE-569-check-suite-event-handling

BERTE 569 check suite event handling

Author: tcarmet

CHANGELOG

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [3.6.19] - 2022-06-30
+# Fixed
+- Ensure check suites build status are stored on webhook event.
+
 ## [3.6.18] - 2022-05-20
 # Added
 - Extra logs to debug status of queue branches in the UI

bert_e/git_host/github/__init__.py

@@ -695,6 +695,9 @@ def owner(self) -> str or None:
             return self._check_suites[0]['repository']['owner']['login']
         return None
 
+    def __str__(self) -> str:
+        return self.state
+
 
 class PullRequest(base.AbstractGitHostObject, base.AbstractPullRequest):
     LIST_URL = '/repos/{owner}/{repo}/pulls'
@@ -998,7 +1001,7 @@ def status(self) -> Status:
 
 
 class CheckSuiteEvent(base.AbstractGitHostObject):
-    SCHEMA = schema.CheckRunEvent
+    SCHEMA = schema.CheckSuiteEvent
 
     @property
     def commit(self) -> str:
@@ -1008,17 +1011,22 @@ def commit(self) -> str:
     def action(self) -> str:
         return self.data['action']
 
-
-class CheckRunEvent(base.AbstractGitHostObject):
-    SCHEMA = schema.CheckRunEvent
+    @property
+    def repo(self) -> str or None:
+        return self.data['repository']['name']
 
     @property
-    def commit(self) -> str:
-        return self.data['check_run']['head_sha']
+    def owner(self) -> str or None:
+        return self.data['repository']['owner']['login']
 
     @property
-    def action(self) -> str:
-        return self.data['action']
+    def status(self):
+        return AggregatedCheckSuites.get(
+            client=self.client,
+            owner=self.owner,
+            repo=self.repo,
+            ref=self.commit
+        )
 
 
 class User(base.AbstractGitHostObject):

bert_e/git_host/github/schema.py

@@ -228,6 +228,7 @@ class StatusEvent(Schema):
     target_url = fields.Str(allow_none=True)
 
 
-class CheckRunEvent(Schema):
+class CheckSuiteEvent(Schema):
     action = fields.Str()
-    check_suite = fields.Nested(CheckRun)
+    check_suite = fields.Nested(CheckSuite)
+    repository = fields.Nested(Repo)

bert_e/server/webhook.py

@@ -108,13 +108,19 @@ def handle_github_status_event(bert_e, json_data):
     return CommitJob(bert_e=bert_e, commit=event.commit)
 
 
-def handle_github_check_run_event(bert_e, json_data):
-    event = github.CheckRunEvent(bert_e=bert_e.client, **json_data)
-    return CommitJob(bert_e=bert_e, commit=event.commit)
+def handle_github_check_suite_event(bert_e, json_data):
+    event = github.CheckSuiteEvent(client=bert_e.client, **json_data)
+    status = event.status
+    LOG.debug("New check suite status received on commit {event.commit}")
+    cached = BUILD_STATUS_CACHE[status.key].get(event.commit)
+
+    if not cached or cached.state != 'SUCCESSFUL':
+        BUILD_STATUS_CACHE[status.key].set(event.commit, status)
 
+    if status.state == "INPROGRESS":
+        LOG.debug("The build just started on %s, ignoring event", event.commit)
+        return
 
-def handle_github_check_suite_event(bert_e, json_data):
-    event = github.CheckSuiteEvent(bert_e=bert_e.client, **json_data)
     return CommitJob(bert_e=bert_e, commit=event.commit)
 
 
@@ -185,10 +191,8 @@ def parse_github_webhook():
         job = handle_github_pr_review_event(current_app.bert_e, json_data)
     elif event == 'status':
         job = handle_github_status_event(current_app.bert_e, json_data)
-    elif event == 'check_run':
-        job = handle_github_check_run_event(current_app.bert_e, json_data)
     elif event == 'check_suite':
-        job = handle_github_check_run_event(current_app.bert_e, json_data)
+        job = handle_github_check_suite_event(current_app.bert_e, json_data)
 
     if job is None:
         LOG.debug('Ignoring event.')