Bump google/go-github to v57 (#28514)

sonjek · web-flow · commit cd2ff6e83dba · 2023-12-18T15:42:04.000-06:00
diff --git a/assets/go-licenses.json b/assets/go-licenses.json
diff --git a/contrib/backport/backport.go b/contrib/backport/backport.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/google/go-github/v53/github"
+	"github.com/google/go-github/v57/github"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v3"
 )
diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
 	github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
 	github.com/golang-jwt/jwt/v5 v5.0.0
-	github.com/google/go-github/v53 v53.2.0
+	github.com/google/go-github/v57 v57.0.0
 	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
 	github.com/google/uuid v1.3.1
 	github.com/gorilla/feeds v1.1.1
diff --git a/go.sum b/go.sum
@@ -533,10 +533,11 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI=
-github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
+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/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs=
+github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/go-tpm v0.9.0 h1:sQF6YqWMi+SCXpsmS3fd21oPy/vSddwZry4JnmltHVk=
diff --git a/services/migrations/error.go b/services/migrations/error.go
@@ -7,7 +7,7 @@ package migrations
 import (
 	"errors"
 
-	"github.com/google/go-github/v53/github"
+	"github.com/google/go-github/v57/github"
 )
 
 // ErrRepoNotCreated returns the error that repository not created
diff --git a/services/migrations/github.go b/services/migrations/github.go
@@ -20,7 +20,7 @@ import (
 	"code.gitea.io/gitea/modules/proxy"
 	"code.gitea.io/gitea/modules/structs"
 
-	"github.com/google/go-github/v53/github"
+	"github.com/google/go-github/v57/github"
 	"golang.org/x/oauth2"
 )
 
@@ -135,7 +135,7 @@ func (g *GithubDownloaderV3) LogString() string {
 func (g *GithubDownloaderV3) addClient(client *http.Client, baseURL string) {
 	githubClient := github.NewClient(client)
 	if baseURL != "https://github.com" {
-		githubClient, _ = github.NewEnterpriseClient(baseURL, baseURL, client)
+		githubClient, _ = github.NewClient(client).WithEnterpriseURLs(baseURL, baseURL)
 	}
 	g.clients = append(g.clients, githubClient)
 	g.rates = append(g.rates, nil)
@@ -168,14 +168,14 @@ func (g *GithubDownloaderV3) waitAndPickClient() {
 
 		err := g.RefreshRate()
 		if err != nil {
-			log.Error("g.getClient().RateLimits: %s", err)
+			log.Error("g.getClient().RateLimit.Get: %s", err)
 		}
 	}
 }
 
 // RefreshRate update the current rate (doesn't count in rate limit)
 func (g *GithubDownloaderV3) RefreshRate() error {
-	rates, _, err := g.getClient().RateLimits(g.ctx)
+	rates, _, err := g.getClient().RateLimit.Get(g.ctx)
 	if err != nil {
 		// if rate limit is not enabled, ignore it
 		if strings.Contains(err.Error(), "404") {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"strings"`
`18`	`18`	`"syscall"`
`19`	`19`
`20`		`- "github.com/google/go-github/v53/github"`
	`20`	`+ "github.com/google/go-github/v57/github"`
`21`	`21`	`"github.com/urfave/cli/v2"`
`22`	`22`	`"gopkg.in/yaml.v3"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package migrations`
`7`	`7`	`import (`
`8`	`8`	`"errors"`
`9`	`9`
`10`		`- "github.com/google/go-github/v53/github"`
	`10`	`+ "github.com/google/go-github/v57/github"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ErrRepoNotCreated returns the error that repository not created`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"code.gitea.io/gitea/modules/proxy"`
`21`	`21`	`"code.gitea.io/gitea/modules/structs"`
`22`	`22`
`23`		`- "github.com/google/go-github/v53/github"`
	`23`	`+ "github.com/google/go-github/v57/github"`
`24`	`24`	`"golang.org/x/oauth2"`
`25`	`25`	`)`
`26`	`26`
`@@ -135,7 +135,7 @@ func (g *GithubDownloaderV3) LogString() string {`
`135`	`135`	`func (g GithubDownloaderV3) addClient(client http.Client, baseURL string) {`
`136`	`136`	`githubClient := github.NewClient(client)`
`137`	`137`	`if baseURL != "https://github.com" {`
`138`		`- githubClient, _ = github.NewEnterpriseClient(baseURL, baseURL, client)`
	`138`	`+ githubClient, _ = github.NewClient(client).WithEnterpriseURLs(baseURL, baseURL)`
`139`	`139`	`}`
`140`	`140`	`g.clients = append(g.clients, githubClient)`
`141`	`141`	`g.rates = append(g.rates, nil)`
`@@ -168,14 +168,14 @@ func (g *GithubDownloaderV3) waitAndPickClient() {`
`168`	`168`
`169`	`169`	`err := g.RefreshRate()`
`170`	`170`	`if err != nil {`
`171`		`- log.Error("g.getClient().RateLimits: %s", err)`
	`171`	`+ log.Error("g.getClient().RateLimit.Get: %s", err)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// RefreshRate update the current rate (doesn't count in rate limit)`
`177`	`177`	`func (g *GithubDownloaderV3) RefreshRate() error {`
`178`		`- rates, _, err := g.getClient().RateLimits(g.ctx)`
	`178`	`+ rates, _, err := g.getClient().RateLimit.Get(g.ctx)`
`179`	`179`	`if err != nil {`
`180`	`180`	`// if rate limit is not enabled, ignore it`
`181`	`181`	`if strings.Contains(err.Error(), "404") {`