Add URLs to tide PullRequests

Depends on shurcooL/githubv4#90
YuviGold · Oct 1, 2021 · e62a284 · e62a284
1 parent 53d7636
commit e62a284
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/prow/tide/status_test.go b/prow/tide/status_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/url"
 	"sort"
 	"strings"
 	"testing"
@@ -790,7 +791,8 @@ func TestExpectedStatus(t *testing.T) {
 			)
 			pr.Author = struct {
 				Login githubql.String
-			}{githubql.String(tc.author)}
+				Url   githubql.URI
+			}{githubql.String(tc.author), githubql.URI{&url.URL{Path: "html"}}}
 			if tc.milestone != "" {
 				pr.Milestone = &struct {
 					Title githubql.String
@@ -1013,10 +1015,12 @@ func TestTargetUrl(t *testing.T) {
 			pr: &PullRequest{
 				Author: struct {
 					Login githubql.String
+					Url   githubql.URI
 				}{Login: githubql.String("author")},
 				Repository: struct {
 					Name          githubql.String
 					NameWithOwner githubql.String
+					Url           githubql.URI
 					Owner         struct {
 						Login githubql.String
 					}
@@ -1031,10 +1035,12 @@ func TestTargetUrl(t *testing.T) {
 			pr: &PullRequest{
 				Author: struct {
 					Login githubql.String
+					Url   githubql.URI
 				}{Login: githubql.String("author")},
 				Repository: struct {
 					Name          githubql.String
 					NameWithOwner githubql.String
+					Url           githubql.URI
 					Owner         struct {
 						Login githubql.String
 					}
@@ -1053,10 +1059,12 @@ func TestTargetUrl(t *testing.T) {
 			pr: &PullRequest{
 				Author: struct {
 					Login githubql.String
+					Url   githubql.URI
 				}{Login: githubql.String("author")},
 				Repository: struct {
 					Name          githubql.String
 					NameWithOwner githubql.String
+					Url           githubql.URI
 					Owner         struct {
 						Login githubql.String
 					}
@@ -1075,10 +1083,12 @@ func TestTargetUrl(t *testing.T) {
 			pr: &PullRequest{
 				Author: struct {
 					Login githubql.String
+					Url   githubql.URI
 				}{Login: githubql.String("author")},
 				Repository: struct {
 					Name          githubql.String
 					NameWithOwner githubql.String
+					Url           githubql.URI
 					Owner         struct {
 						Login githubql.String
 					}

diff --git a/prow/tide/tide.go b/prow/tide/tide.go
@@ -1360,15 +1360,7 @@ func (c *Controller) trigger(sp subpool, presubmits []config.Presubmit, prs []Pu
 		BaseSHA: sp.sha,
 	}
 	for _, pr := range prs {
-		refs.Pulls = append(
-			refs.Pulls,
-			prowapi.Pull{
-				Number: int(pr.Number),
-				Title:  string(pr.Title),
-				Author: string(pr.Author.Login),
-				SHA:    string(pr.HeadRefOID),
-			},
-		)
+		refs.Pulls = append(refs.Pulls, pr.toPull())
 	}
 
 	// If PRs require the same job, we only want to trigger it once.
@@ -1692,12 +1684,7 @@ func (c *Controller) syncSubpool(sp subpool, blocks []blockers.Blocker) (Pool, e
 func prMeta(prs ...PullRequest) []prowapi.Pull {
 	var res []prowapi.Pull
 	for _, pr := range prs {
-		res = append(res, prowapi.Pull{
-			Number: int(pr.Number),
-			Author: string(pr.Author.Login),
-			Title:  string(pr.Title),
-			SHA:    string(pr.HeadRefOID),
-		})
+		res = append(res, pr.toPull())
 	}
 	return res
 }
@@ -1811,6 +1798,7 @@ type PullRequest struct {
 	Number githubql.Int
 	Author struct {
 		Login githubql.String
+		Url   githubql.URI
 	}
 	BaseRef struct {
 		Name   githubql.String
@@ -1822,6 +1810,7 @@ type PullRequest struct {
 	Repository  struct {
 		Name          githubql.String
 		NameWithOwner githubql.String
+		Url           githubql.URI
 		Owner         struct {
 			Login githubql.String
 		}
@@ -1848,6 +1837,7 @@ type PullRequest struct {
 	Body      githubql.String
 	Title     githubql.String
 	UpdatedAt githubql.DateTime
+	Url       githubql.URI
 }
 
 type CommitNode struct {
@@ -1918,6 +1908,18 @@ func (pr *PullRequest) logFields() logrus.Fields {
 	}
 }
 
+func (pr *PullRequest) toPull() prowapi.Pull {
+	return prowapi.Pull{
+		Number:     int(pr.Number),
+		Title:      string(pr.Title),
+		Author:     string(pr.Author.Login),
+		SHA:        string(pr.HeadRefOID),
+		Link:       pr.Url.String(),
+		AuthorLink: pr.Author.Url.String(),
+		CommitLink: fmt.Sprintf("%s/pull/%d/commits/%s", pr.Repository.Url.String(), pr.Number, pr.HeadRefOID),
+	}
+}
+
 // headContexts gets the status contexts for the commit with OID == pr.HeadRefOID
 //
 // First, we try to get this value from the commits we got with the PR query.

diff --git a/prow/tide/tide_test.go b/prow/tide/tide_test.go
@@ -1251,6 +1251,7 @@ func TestMergeMethodCheckerAndPRMergeMethod(t *testing.T) {
 				Repository: struct {
 					Name          githubql.String
 					NameWithOwner githubql.String
+					Url           githubql.URI
 					Owner         struct {
 						Login githubql.String
 					}