From f44a0b6cb1e51386fab0ef41da2d2d02855aa74f Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Tue, 22 Mar 2022 13:24:13 +0100 Subject: Handle reviews by anonymous github users Some github users may choose not to publish their real name and/or email address in their profile. Instead of creating an ugly message like[0] Reviewed-by: None try to work up something from the data we have available. [0] https://github.com/osism/ansible-defaults/commit/ed2b2ffa8a32a5b5fdc060a44d17f12655d6cbcf Signed-off-by: Dr. Jens Harbott Change-Id: Ife4c325c278860c47b70b37462ebd7b1d6b97755 --- zuul/driver/github/githubreporter.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/zuul/driver/github/githubreporter.py b/zuul/driver/github/githubreporter.py index c5297a23a..fe93727b9 100644 --- a/zuul/driver/github/githubreporter.py +++ b/zuul/driver/github/githubreporter.py @@ -327,7 +327,17 @@ class GithubReporter(BaseReporter): for r in change.reviews: name = r['by']['name'] email = r['by']['email'] - review_users.append('Reviewed-by: {} <{}>'.format(name, email)) + username = r['by']['username'] + review_message = 'Reviewed-by:' + if name: + review_message += ' {}'.format(name) + elif username: + review_message += ' {}'.format(username) + else: + review_message += ' Anonymous' + if email: + review_message += ' <{}>'.format(email) + review_users.append(review_message) merge_message += '\n\n' merge_message += '\n'.join(review_users) -- cgit v1.2.1