CommentMonitor: return error from ListCommits

bboreham · bboreham · commit fde999f7afab · 2024-06-20T14:24:48.000+01:00
Signed-off-by: Bryan Boreham &lt;bjboreham@gmail.com&gt;
diff --git a/tools/commentMonitor/ghclient.go b/tools/commentMonitor/ghclient.go
@@ -70,10 +70,13 @@ func (c githubClient) getLastCommitSHA() (string, error) {
 	// https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
 	listops := &github.ListOptions{Page: 1, PerPage: 250}
 	l, _, err := c.clt.PullRequests.ListCommits(c.ctx, c.owner, c.repo, c.pr, listops)
+	if err != nil {
+		return "", fmt.Errorf("ListCommits(%q,%q,%q): %w", c.owner, c.repo, c.pr, err)
+	}
 	if len(l) == 0 {
 		return "", fmt.Errorf("pr does not have a commit")
 	}
-	return l[len(l)-1].GetSHA(), err
+	return l[len(l)-1].GetSHA(), nil
 }
 
 func (c githubClient) createRepositoryDispatch(eventType string, clientPayload map[string]string) error {

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,13 @@ func (c githubClient) getLastCommitSHA() (string, error) {`
`70`	`70`	`// https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request`
`71`	`71`	`listops := &github.ListOptions{Page: 1, PerPage: 250}`
`72`	`72`	`l, _, err := c.clt.PullRequests.ListCommits(c.ctx, c.owner, c.repo, c.pr, listops)`
	`73`	`+ if err != nil {`
	`74`	`+ return "", fmt.Errorf("ListCommits(%q,%q,%q): %w", c.owner, c.repo, c.pr, err)`
	`75`	`+ }`
`73`	`76`	`if len(l) == 0 {`
`74`	`77`	`return "", fmt.Errorf("pr does not have a commit")`
`75`	`78`	`}`
`76`		`- return l[len(l)-1].GetSHA(), err`
	`79`	`+ return l[len(l)-1].GetSHA(), nil`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`func (c githubClient) createRepositoryDispatch(eventType string, clientPayload map[string]string) error {`