Use user.html_url for github reporter messages

There is no need to dynamically generate the github users url with zuul,
we can rely on html_url from github. This fixes an issue where we
constructed the wrong url for the merge commit when using a github app.

Change-Id: I65028be07636aeaad48ccb6de80b3e2a0d29b436
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2019-04-23 12:14:27 -04:00
parent 6afa22c994
commit 75dc1172f9
3 changed files with 4 additions and 6 deletions

View File

@ -25,6 +25,7 @@ class FakeUser(object):
self.login = login
self.name = "Github User"
self.email = "github.user@example.com"
self.html_url = 'https://example.com/%s' % login
class FakeBranch(object):

View File

@ -518,7 +518,8 @@ class GithubUser(collections.Mapping):
self._data = {
'username': user.login,
'name': user.name,
'email': user.email
'email': user.email,
'html_url': user.html_url,
}
@ -1353,9 +1354,6 @@ class GithubConnection(BaseConnection):
def getUser(self, login, project):
return GithubUser(login, self, project)
def getUserUri(self, login):
return 'https://%s/%s' % (self.server, login)
def getRepoPermission(self, project, login):
github = self.getGithubClient(project)
owner, proj = project.split('/')

View File

@ -174,7 +174,6 @@ class GithubReporter(BaseReporter):
if not account:
return message
username = account['username']
name = account['name']
email = account['email']
message += '\n\nReviewed-by: '
@ -187,7 +186,7 @@ class GithubReporter(BaseReporter):
message += '<' + email + '>'
if name or email:
message += '\n '
message += self.connection.getUserUri(username)
message += account['html_url']
return message