remove commit message and commit_title (#54)

* remove commit message and commit_title

it's not great

Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>

* ping the pr sender when merging aprroved PRs

* make sure to ignore bots everywhere

we didn't do this everywhere

---------

Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>

Author: chmouel

boussole/boussole.py

@@ -181,6 +181,8 @@ def _post_lgtm_breakdown(
         users_table = ""
         for user, permission in lgtm_users.items():
             is_valid = permission in self.lgtm_permissions
+            if "[bot]" in user:
+                continue
             valid_mark = "✅" if is_valid else "❌"
             users_table += f"| @{user} | `{permission or 'none'}` | {valid_mark} |\n"
 
@@ -357,12 +359,15 @@ def lgtm(self, send_comment: bool = True) -> int:
             users_table = ""
             for user, permission in lgtm_users.items():
                 is_valid = permission in self.lgtm_permissions
+                if "bot" in user:
+                    continue
                 valid_mark = "✅" if is_valid else "❌"
                 users_table += (
                     f"| @{user} | `{permission or 'none'}` | {valid_mark} |\n"
                 )
             endpoint = f"pulls/{self.pr_num}/reviews"
             body = APPROVED_TEMPLATE.format(
+                pr_sender=self.pr_sender,
                 threshold=self.lgtm_threshold,
                 valid_votes=valid_votes,
                 users_table=users_table,
@@ -437,8 +442,8 @@ def merge_pr(self, custom_merge_method: Optional[str] = None) -> bool:
 
             data = {
                 "merge_method": merge_method,
-                "commit_title": f"Merged PR #{self.pr_num}",
-                "commit_message": f"PR #{self.pr_num} merged by {self.pr_sender} with {valid_votes} LGTM votes.",
+                # "commit_title": f"Merged PR #{self.pr_num}",
+                # "commit_message": f"PR #{self.pr_num} merged by {self.pr_sender} with {valid_votes} LGTM votes.",
             }
             response = self.api.put(endpoint, data)
             if response and response.status_code == 200:
@@ -476,6 +481,7 @@ def merge_pr(self, custom_merge_method: Optional[str] = None) -> bool:
                     )
 
                 success_message = SUCCESS_MERGED.format(
+                    pr_sender=self.pr_sender,
                     merge_method=merge_method,
                     comment_sender=self.comment_sender,
                     valid_votes=valid_votes,

boussole/messages.py

@@ -22,7 +22,7 @@
 """
 
 APPROVED_TEMPLATE = """
-Thank you for your valuable contribution! 🎉
+Congrats @{pr_sender} your PR Has been approved 🎉
 
 ### ✅ Pull Request Approved
 
@@ -65,8 +65,6 @@
 SUCCESS_MERGED = """
 ### ✅ PR Successfully Merged
 
-Thank you again for your valuable contribution! 🎉
-
 * Merge method: `{merge_method}`
 * Merged by: **@{comment_sender}**
 * Total approvals: **{valid_votes}/{lgtm_threshold}**
@@ -77,6 +75,7 @@
 {users_table}
 
 
+Thank you @{pr_sender} for your valuable contribution! 🎉
 
 *Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* 
 

boussole/test_boussole.py

@@ -256,8 +256,6 @@ def test_merge_pr_success(pr_handler, mock_api):
         "pulls/123/merge",
         {
             "merge_method": "squash",
-            "commit_title": "Merged PR #123",
-            "commit_message": "PR #123 merged by test_user with 2 LGTM votes.",
         },
     )
 
@@ -369,7 +367,5 @@ def test_merge_pr_with_custom_method(pr_handler, mock_api):
         "pulls/123/merge",
         {
             "merge_method": "merge",  # Should use the custom method
-            "commit_title": "Merged PR #123",
-            "commit_message": "PR #123 merged by test_user with 2 LGTM votes.",
         },
     )