Merge pull request #4772 from linuxfoundation/unicron-fix-missing-enqueued-pr-event-handling-2

Followup

Author: lukaszgryglicki

cla-backend/cla/models/github_models.py

@@ -466,10 +466,22 @@ def process_enqueued_pull_request(self, data):
         :param data: The data returned from GitHub on this webhook.
         :type data: dict
         """
-        pull_request_id = data["pull_request"]["number"]
-        github_repository_id = data["repository"]["id"]
-        installation_id = data["installation"]["id"]
-        self.update_change_request(installation_id, github_repository_id, pull_request_id)
+        merge_group_sha = data.get("pull_request", {}).get("merge_commit_sha")
+        github_repository_id = data.get("repository", {}).get("id")
+        installation_id = data.get("installation", {}).get("id")
+        pull_request_id = data.get("pull_request", {}).get("number")
+        if None in (installation_id, github_repository_id, merge_group_sha, pull_request_id):
+            cla.log.warning(
+                "process_enqueued_pull_request: Missing required field(s): "
+                f"installation_id={installation_id}, "
+                f"github_repository_id={github_repository_id}, "
+                f"merge_group_sha={merge_group_sha}, "
+                f"pull_request_id={pull_request_id}. "
+                "Aborting update_merge_group."
+            )
+            return
+
+        self.update_merge_group(installation_id, github_repository_id, merge_group_sha, pull_request_id)
 
     def process_checks_requested_merge_group(self, data):
         """