Update merge queue commit message parsing to get the correct PR number

Signed-off-by: Lukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

cla-backend/cla/utils.py

@@ -1942,12 +1942,33 @@ def extract_pull_request_number(pull_request_message):
     pull_request_number = None
     try:
         first_line = pull_request_message.splitlines()[0]
-        matches = re.findall(r"#(\d+)", first_line)
+        cla.log.debug(f"{fn} - checking line '{first_line}")
+        # Case 1: "Merge pull request #N"
+        matches = re.match(r'^Merge pull request #(\d+)', first_line)
+        if matches:
+            pull_request_number = int(matches.group(1))
+            cla.log.debug(f"{fn} - extracted PR number {pull_request_number} from merge_queue data: {pull_request_message} by matching 'Merge pull request #N...'")
+            return pull_request_number
+        # Case 2: PR number in last (#N) group on first line, like: "Some text (#whatever) (#N)"
+        matches = re.findall(r'\(#(\d+)\)', first_line)
+        if matches:
+            pull_request_number = int(matches[-1])  # last match
+            cla.log.debug(f"{fn} - extracted PR number {pull_request_number} from merge_queue data: {pull_request_message} by matching '...(#N)'")
+            return pull_request_number
+        # Case 3: PR number in last #N on first line, like: "Some text #N"
+        matches = re.findall(r"\s+#(\d+)", first_line)
         if matches:
             pull_request_number = int(matches[-1])  # last match
+            cla.log.debug(f"{fn} - extracted PR number {pull_request_number} from merge_queue data: {pull_request_message} by matching '... #N'")
+            return pull_request_number
+        # Case 4: PR number in first #N in the entire commit message
+        matches = re.findall(r"#(\d+)", pull_request_message)
+        if matches:
+            pull_request_number = int(matches[0])  # first match
+            cla.log.debug(f"{fn} - extracted PR number {pull_request_number} from merge_queue data: {pull_request_message} by matching first '#N'")
+            return pull_request_number
         else:
             cla.log.warning(f"{fn} - error - unable to extract pull request number from message: {pull_request_message}")
     except Exception as e:
         cla.log.warning(f"{fn} - error - unable to extract pull request number from message: {pull_request_message}, error: {e}")
-    cla.log.debug(f"{fn} - extracted PR number {pull_request_number} from merge_queue data")
     return pull_request_number

utils/search_aws_logs.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# STAGE=dev DEBUG=1 DTFROM='3 days ago' DTTO='2 days ago' ./utils/search_aws_logs.sh 'cla-backend-dev-githubactivity' 'error'
+
+if [ -z "$STAGE" ]
+then
+  export STAGE=dev
+fi
+
+if [ -z "${1}" ]
+then
+  echo "$0: you must specify log group name, for example: 'cla-backend-dev-githubactivity', 'cla-backend-dev-apiv2', 'cla-backend-dev-api-v3-lambda', 'cla-backend-go-api-v4-lambda'"
+  exit 1
+fi
+
+log_group=$(echo "$1" | sed -E "s/\b(dev|prod)\b/${STAGE}/g")
+
+if [ -z "${2}" ]
+then
+  echo "$0: you must specify the search term, for example 'error'"
+  exit 2
+fi
+
+if [ -z "${DTFROM}" ]
+then
+  export DTFROM="$(date -d '3 days ago' +%s)000"
+else
+  export DTFROM="$(date -d "${DTFROM}" +%s)000"
+fi
+
+if [ -z "${DTTO}" ]
+then
+  export DTTO="$(date +%s)000"
+else
+  export DTTO="$(date -d "${DTTO}" +%s)000"
+fi
+
+if [ ! -z "${DEBUG}" ]
+then
+  echo "aws --profile \"lfproduct-${STAGE}\" logs filter-log-events --log-group-name \"/aws/lambda/${log_group}\" --start-time \"${DTFROM}\" --end-time \"${DTTO}\" --filter-pattern \"${2}\""
+fi
+
+aws --profile "lfproduct-${STAGE}" logs filter-log-events --log-group-name "/aws/lambda/${log_group}" --start-time "${DTFROM}" --end-time "${DTTO}" --filter-pattern "\"${2}\""