From 591db922fea0992d22c8cdfca503c48af3978057 Mon Sep 17 00:00:00 2001
From: Peter Krause <krausepeterm@gmail.com>
Date: Fri, 16 Sep 2022 11:17:10 -0300
Subject: [PATCH] feat: Echo comments on failure
---
README.md | 2 +-
core/search_pull_request_comments.py | 15 +++++++++------
entrypoint.sh | 3 ++-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 2503368..f164ce5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ jobs:
steps:
- name: Search pull-request comments
- uses: peterkrauz/search-pull-request-comments@v0.0.7
+ uses: peterkrauz/search-pull-request-comments@v0.0.8
env:
REQUIRED_COMMENT_USER: "john-doe"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/core/search_pull_request_comments.py b/core/search_pull_request_comments.py
index f9f4b9e..75a00eb 100644
--- a/core/search_pull_request_comments.py
+++ b/core/search_pull_request_comments.py
@@ -12,7 +12,6 @@ def fetch(url: str, token: str) -> list:
def search_comments(github_info, token: str, required_user):
-
if isinstance(github_info, str):
github_info = loads(github_info)
@@ -26,14 +25,18 @@ def search_comments(github_info, token: str, required_user):
users_that_left_a_comment = [c["user"]["login"] for c in (simple_comments + review_comments)]
required_user_has_commented = str(required_user) in users_that_left_a_comment
- if required_user_has_commented:
- return 0
-
- return 1
+ return {
+ "comments": users_that_left_a_comment,
+ "required_user_has_commented": required_user_has_commented
+ }
if __name__ == "__main__":
import sys
result = search_comments(sys.argv[1], sys.argv[2], sys.argv[3])
- print(result)
+
+ if result["required_user_has_commented"]:
+ print(0)
+ else:
+ print(result["comments"])
diff --git a/entrypoint.sh b/entrypoint.sh
index f07d54f..ce642d5 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,6 +9,7 @@ echo "Result: $result"
if [ "$result" = "0" ]; then
echo "User that was required to comment did leave a comment - all good!"
else
- echo "Couldn't find any comment from the required user"
+ echo "Couldn't find any comment from the required user\n"
+ echo "Here's everyone that did comment: $result"
exit 1
fi
\ No newline at end of file