ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-08 22:13:26 +09:00
Code Issues Projects Releases Wiki Activity

fix(deps): update module github.com/google/go-github/v86 to v87 (#37845)

Browse Source
This commit is contained in:
Giteabot
2026-05-25 15:28:56 +00:00
committed by GitHub
parent d93bbcc0a6
commit 821d3c4672
8 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/migrations/github.go
+18 -9
View File
@@ -20,7 +20,7 @@ import (
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/structs"
"github.com/google/go-github/v86/github"
"github.com/google/go-github/v87/github"
"golang.org/x/oauth2"
)
@@ -52,7 +52,7 @@ func (f *GithubDownloaderV3Factory) New(ctx context.Context, opts base.MigrateOp
log.Trace("Create github downloader BaseURL: %s %s/%s", baseURL, oldOwner, oldName)
return NewGithubDownloaderV3(ctx, baseURL, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, oldOwner, oldName), nil
return NewGithubDownloaderV3(ctx, baseURL, opts.AuthUsername, opts.AuthPassword, opts.AuthToken, oldOwner, oldName)
}
// GitServiceType returns the type of git service
@@ -78,7 +78,7 @@ type GithubDownloaderV3 struct {
}
// NewGithubDownloaderV3 creates a github Downloader via github v3 API
func NewGithubDownloaderV3(_ context.Context, baseURL, userName, password, token, repoOwner, repoName string) *GithubDownloaderV3 {
func NewGithubDownloaderV3(_ context.Context, baseURL, userName, password, token, repoOwner, repoName string) (*GithubDownloaderV3, error) {
downloader := GithubDownloaderV3{
userName: userName,
baseURL: baseURL,
@@ -102,7 +102,9 @@ func NewGithubDownloaderV3(_ context.Context, baseURL, userName, password, token
},
}
downloader.addClient(client, baseURL)
if err := downloader.addClient(client, baseURL); err != nil {
return nil, err
}
}
} else {
transport := NewMigrationHTTPTransport()
@@ -113,9 +115,11 @@ func NewGithubDownloaderV3(_ context.Context, baseURL, userName, password, token
client := &http.Client{
Transport: transport,
}
downloader.addClient(client, baseURL)
if err := downloader.addClient(client, baseURL); err != nil {
return nil, err
}
}
return &downloader
return &downloader, nil
}
// String implements Stringer
@@ -130,13 +134,18 @@ func (g *GithubDownloaderV3) LogString() string {
return fmt.Sprintf("<GithubDownloaderV3 %s %s/%s>", g.baseURL, g.repoOwner, g.repoName)
}
func (g *GithubDownloaderV3) addClient(client *http.Client, baseURL string) {
githubClient := github.NewClient(client)
func (g *GithubDownloaderV3) addClient(client *http.Client, baseURL string) error {
opts := []github.ClientOptionsFunc{github.WithHTTPClient(client)}
if baseURL != "https://github.com" {
githubClient, _ = githubClient.WithEnterpriseURLs(baseURL, baseURL)
opts = append(opts, github.WithEnterpriseURLs(baseURL, baseURL))
}
githubClient, err := github.NewClient(opts...)
if err != nil {
return err
}
g.clients = append(g.clients, githubClient)
g.rates = append(g.rates, nil)
return nil
}
func (g *GithubDownloaderV3) waitAndPickClient(ctx context.Context) {