Merge pull request #4773 from linuxfoundation/unicron-fix-github-installation-and-merge-queue

Unicron fix GitHub installation and merge queue

Author: lukaszgryglicki

cla-backend/cla/models/dynamo_models.py

@@ -4000,6 +4000,10 @@ def __str__(self):
         )
 
     def to_dict(self):
+        if getattr(self.model, 'skip_cla', None) is None:
+            self.model.skip_cla = {}
+        if getattr(self.model, 'enable_co_authors', None) is None:
+            self.model.enable_co_authors = {}
         ret = dict(self.model)
 
         if "organization_installation_id" not in ret:

cla-backend/cla/models/github_models.py

@@ -139,9 +139,6 @@ def received_activity(self, data):
         elif data["action"] == "checks_requested":
             cla.log.debug("github_models.received_activity - Handling checks requested pull request")
             return self.process_checks_requested_merge_group(data)
-        elif data["action"] == "enqueued":
-            cla.log.debug("github_models.received_activity - Handling enqueued pull request")
-            return self.process_enqueued_pull_request(data)
         else:
             cla.log.debug("github_models.received_activity - Ignoring unsupported action: {}".format(data["action"]))
 
@@ -459,30 +456,6 @@ def process_opened_pull_request(self, data):
         installation_id = data["installation"]["id"]
         self.update_change_request(installation_id, github_repository_id, pull_request_id)
 
-    def process_enqueued_pull_request(self, data):
-        """
-        Helper method to handle a webhook fired from GitHub for an enqueued PR.
-
-        :param data: The data returned from GitHub on this webhook.
-        :type data: dict
-        """
-        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):
         """
         Helper method to handle a webhook fired from GitHub for a merge group event.

utils/search_aws_log_group.sh

@@ -35,24 +35,34 @@ then
   exit 2
 fi
 
+to_epoch_ms () {
+  local v="$1"
+  if [[ "$v" =~ ^[0-9]{13}$ ]]
+  then
+    echo "$v"; return
+  fi
+  if [[ "$v" =~ ^[0-9]{10}$ ]]
+  then
+    echo "${v}000"; return
+  fi
+  v="${v/T/ }"
+  v="${v/Z/ UTC}"
+  echo "$(date -d "$v" +%s)000"
+}
+
 if [ -z "${DTFROM}" ]
 then
-  export DTFROM="$(date -d '3 days ago' +%s)000"
+  export DTFROM="$(to_epoch_ms '3 days ago')"
 else
-  if [[ ! "$DTFROM" =~ ^[0-9]+$ ]]
-  then
-    export DTFROM="$(date -d "${DTFROM}" +%s)000"
-  fi
+  export DTFROM="$(to_epoch_ms "${DTFROM}")"
 fi
 
+# DTTO
 if [ -z "${DTTO}" ]
 then
-  export DTTO="$(date +%s)000"
+  export DTTO="$(to_epoch_ms 'now')"
 else
-  if [[ ! "$DTTO" =~ ^[0-9]+$ ]]
-  then
-    export DTTO="$(date -d "${DTTO}" +%s)000"
-  fi
+  export DTTO="$(to_epoch_ms "${DTTO}")"
 fi
 
 if [ ! -z "${DEBUG}" ]