all: upgrade go-github v17.0.0+incompatible to v48.1.0

Upgrade a few remaining uses of the very old v17.0.0+incompatible major
version of go-github to the newer v48.1.0 that's already used elsewhere.

Change-Id: I79316b1b32574b11e87828ae9ac1a8ab952154f2
Reviewed-on: https://go-review.googlesource.com/c/build/+/591735
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Carlos Amedee <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>

Author: dmitshur

cmd/coordinator/status.go

@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"go.opencensus.io/stats"
 	"golang.org/x/build/dashboard"
 	"golang.org/x/build/internal/coordinator/pool"

cmd/gerritbot/Dockerfile

@@ -21,7 +21,7 @@ WORKDIR /go/src/golang.org/x/build
 # Optimization for iterative docker build speed, not necessary for correctness:
 # TODO: write a tool to make writing Go module-friendly Dockerfiles easier.
 RUN go install cloud.google.com/go/compute/metadata
-RUN go install github.com/google/go-github/github
+RUN go install github.com/google/go-github/v48/github
 RUN go install golang.org/x/oauth2
 COPY autocertcache /go/src/golang.org/x/build/autocertcache
 COPY gerrit /go/src/golang.org/x/build/gerrit

cmd/relui/main.go

@@ -25,7 +25,7 @@ import (
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
 	"cloud.google.com/go/compute/metadata"
 	"cloud.google.com/go/storage"
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/shurcooL/githubv4"
 	"go.chromium.org/luci/auth"

go.mod

@@ -30,7 +30,6 @@ require (
 	github.com/golang-migrate/migrate/v4 v4.15.0-beta.3
 	github.com/golang/protobuf v1.5.3
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-github/v48 v48.1.0
 	github.com/google/safehtml v0.0.3-0.20220430015336-00016cfeca15
 	github.com/google/uuid v1.3.1

go.sum

@@ -411,8 +411,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-github/v35 v35.2.0/go.mod h1:s0515YVTI+IMrDoy9Y4pHt9ShGpzHvHO8rZ7L7acgvs=
 github.com/google/go-github/v48 v48.1.0 h1:nqPqq+0oRY2AMR/SRskGrrP4nnewPB7e/m2+kbT/UvM=
 github.com/google/go-github/v48 v48.1.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y=

internal/relui/buildrelease_test.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"github.com/google/uuid"
 	"github.com/shurcooL/githubv4"
 	"golang.org/x/build/gerrit"

internal/task/milestones.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"github.com/shurcooL/githubv4"
 	wf "golang.org/x/build/internal/workflow"
 	goversion "golang.org/x/build/maintner/maintnerd/maintapi/version"

internal/task/milestones_test.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"github.com/shurcooL/githubv4"
 	"golang.org/x/build/internal/workflow"
 	"golang.org/x/oauth2"

maintner/github.go

@@ -23,9 +23,8 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"github.com/gregjones/httpcache"
-
 	"golang.org/x/build/maintner/maintpb"
 	"golang.org/x/oauth2"
 	"golang.org/x/sync/errgroup"
@@ -1923,12 +1922,15 @@ func (p *githubRepoPoller) syncCommentsOnIssue(ctx context.Context, issueNum int
 	owner, repo := p.gr.id.Owner, p.gr.id.Repo
 	morePages := true // at least try the first. might be empty.
 	for morePages {
-		ics, res, err := p.githubDirect.Issues.ListComments(ctx, owner, repo, int(issueNum), &github.IssueListCommentsOptions{
-			Since:       since,
-			Direction:   "asc",
-			Sort:        "updated",
+		opt := &github.IssueListCommentsOptions{
+			Direction:   github.String("asc"),
+			Sort:        github.String("updated"),
 			ListOptions: github.ListOptions{PerPage: 100},
-		})
+		}
+		if !since.IsZero() {
+			opt.Since = &since
+		}
+		ics, res, err := p.githubDirect.Issues.ListComments(ctx, owner, repo, int(issueNum), opt)
 		if canRetry(ctx, err) {
 			continue
 		} else if ge, ok := err.(*github.ErrorResponse); ok && (ge.Response.StatusCode == http.StatusNotFound || ge.Response.StatusCode == http.StatusGone) {

maintner/github_test.go

@@ -21,8 +21,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/google/go-github/github"
-
+	"github.com/google/go-github/v48/github"
 	"golang.org/x/build/maintner/maintpb"
 )
 

maintner/maintner_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/protobuf/ptypes"
 	google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/google/go-github/github"
+	"github.com/google/go-github/v48/github"
 	"golang.org/x/build/maintner/maintpb"
 )