dataconnect.yaml: use calculate_github_issue_for_commenting.py

Author: dconeybe

.github/workflows/dataconnect.yml

@@ -334,36 +334,36 @@ jobs:
       issues: write
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          show-progress: false
+          sparse-checkout: 'firebase-dataconnect/ci/'
+
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        with:
+          python-version: ${{ env.FDC_PYTHON_VERSION }}
+
+      - run: pip install -r firebase-dataconnect/ci/requirements.txt
+
       - id: issue-id
         name: Determine GitHub Issue For Commenting
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: firebase-dataconnect/ci
         run: |
           set -euo pipefail
           set -xv
 
-          # If this job was triggered by a pull request, then check to see if
-          # the description of the PR specifies a GitHub Issue to which to post
-          # a comment. The GitHub Issue number is specified by including a line
-          # of the form "trksmnkncd_notification_issue=6863" in the description.
-          # Specifying an issue number in this manner is primarily intended for
-          # debugging/development purposes of the comment-posting logic itself.
-          # For example, issue number 6863 was specifically created for testing.
-          # (see https://github.com/firebase/firebase-android-sdk/issues/6863)
-          pr_number=$(echo '${{ github.ref }}' | sed -En 's#^refs/pull/([0-9]+)/merge$#\1#p')
-          if [[ -n $pr_number ]] ; then
-            issue_from_pr_body=$(gh issue view "$pr_number" --json body --jq '.body' -R ${{ github.repository }} | sed -En 's#(\s|^)trksmnkncd_notification_issue=([0-9]+)(\s|$)#\2#p')
-          fi
-
-          if [[ -v issue_from_pr_body ]] && [[ -n $issue_from_pr_body ]] ; then
-            issue="$issue_from_pr_body"
-          elif [[ '${{ github.event_name }}' == 'schedule' ]] ; then
-            # See https://github.com/firebase/firebase-android-sdk/issues/6857
-            issue=6857
-          else
-            issue=
-          fi
+          python \
+            calculate_github_issue_for_commenting.py \
+            --output-file=github_issue_number.txt \
+            --github-ref='${{ github.ref }}' \
+            --github-repository='${{ github.repository }}' \
+            --github-event-name='${{ github.event_name }}' \
+            --pr-body-github-issue-key=trksmnkncd_notification_issue \
+            --github-issue-for-scheduled-run=6857 # https://github.com/firebase/firebase-android-sdk/issues/6857
 
+          issue="$(cat github_issue_number.txt)"
           echo "issue=$issue" >> "$GITHUB_OUTPUT"
 
       - name: Post Comment on GitHub Issue

firebase-dataconnect/ci/calculate_github_issue_for_commenting.py

@@ -16,6 +16,7 @@
 
 import argparse
 import logging
+import pathlib
 import re
 import subprocess
 import typing
@@ -36,7 +37,9 @@ def main() -> None:
     pr_body_github_issue_key=args.pr_body_github_issue_key,
   )
 
-  logging.info(github_issue)
+  file_text = "" if github_issue is None else str(github_issue)
+  logging.info("Writing '%s' to %s", file_text, args.output_file)
+  args.output_file.write_text(file_text, encoding="utf8", errors="replace")
 
 
 def calculate_github_issue(
@@ -117,6 +120,7 @@ def github_issue_from_pr_body(pr_body: str, issue_key: str) -> int | None:
 
 
 class ParsedArgs(typing.Protocol):
+  output_file: pathlib.Path
   github_ref: str
   github_repository: str
   github_event_name: str
@@ -126,6 +130,12 @@ class ParsedArgs(typing.Protocol):
 
 def parse_args() -> ParsedArgs:
   arg_parser = argparse.ArgumentParser()
+  arg_parser.add_argument(
+    "--output-file",
+    required=True,
+    help="The file to which to write the calculated issue number"
+    "if no issue number was found, then an empty file will be written",
+  )
   arg_parser.add_argument(
     "--github-ref",
     required=True,
@@ -156,6 +166,7 @@ def parse_args() -> ParsedArgs:
   )
 
   parse_result = arg_parser.parse_args()
+  parse_result.output_file = pathlib.Path(parse_result.output_file)
   return typing.cast("ParsedArgs", parse_result)
 
 

firebase-dataconnect/ci/pyproject.toml

@@ -44,4 +44,3 @@ quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
 docstring-code-format = true
-SUCCESS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!