mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2026-04-15 01:41:56 +00:00
Fetch repositories with remote ID if possible (#1078)
Use IDs of the forge to fetch repositories instead of their names and owner names. This improves handling of renamed and transferred repos.
TODO
- [ ] try to support as many forges as possible
- [x] Gogs (no API)
- [ ] Bitbucket Server
- [x] Coding (no API?)
- [x] update repo every time it is fetched or received from the forge
- [x] if repo remote IDs are not available, use owner / name to get it
- [x] handle redirections (redirect a renamed repo to its new path)
- [x] ~~pull all repos once during migration to update ID (?)~~ issue fixed by on-demand loading of remote IDs
- [x] handle redirections in web UI
- [ ] improve handling of hooks after a repo was renamed (currently it checks for a redirection to the repo)
- [x] tests
- [x] `UNIQUE` constraint for remote IDs after migration shouldn't work (all repos have an empty string as remote ID)
close #854
close #648 partial
close https://codeberg.org/Codeberg-CI/feedback/issues/46
Possible follow-up PRs
- apply the same scheme on everything fetched from the remote (currently only users)
Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
@@ -15,6 +15,8 @@
|
||||
package github
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/google/go-github/v39/github"
|
||||
|
||||
"github.com/woodpecker-ci/woodpecker/server/model"
|
||||
@@ -82,6 +84,7 @@ func convertDesc(status model.StatusValue) string {
|
||||
// structure to the common Woodpecker repository structure.
|
||||
func convertRepo(from *github.Repository) *model.Repo {
|
||||
repo := &model.Repo{
|
||||
RemoteID: model.RemoteID(fmt.Sprint(from.GetID())),
|
||||
Name: from.GetName(),
|
||||
FullName: from.GetFullName(),
|
||||
Link: from.GetHTMLURL(),
|
||||
@@ -142,6 +145,7 @@ func convertTeam(from *github.Organization) *model.Team {
|
||||
// from a webhook and convert to the common Woodpecker repository structure.
|
||||
func convertRepoHook(eventRepo *github.PushEventRepository) *model.Repo {
|
||||
repo := &model.Repo{
|
||||
RemoteID: model.RemoteID(fmt.Sprint(eventRepo.GetID())),
|
||||
Owner: eventRepo.GetOwner().GetLogin(),
|
||||
Name: eventRepo.GetName(),
|
||||
FullName: eventRepo.GetFullName(),
|
||||
|
||||
@@ -27,6 +27,7 @@ func Handler() http.Handler {
|
||||
|
||||
e := gin.New()
|
||||
e.GET("/api/v3/repos/:owner/:name", getRepo)
|
||||
e.GET("/api/v3/repositories/:id", getRepoByID)
|
||||
e.GET("/api/v3/orgs/:org/memberships/:user", getMembership)
|
||||
e.GET("/api/v3/user/memberships/orgs/:org", getMembership)
|
||||
|
||||
@@ -42,6 +43,15 @@ func getRepo(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
func getRepoByID(c *gin.Context) {
|
||||
switch c.Param("id") {
|
||||
case "repo_not_found":
|
||||
c.String(404, "")
|
||||
default:
|
||||
c.String(200, repoPayload)
|
||||
}
|
||||
}
|
||||
|
||||
func getMembership(c *gin.Context) {
|
||||
switch c.Param("org") {
|
||||
case "org_not_found":
|
||||
@@ -55,6 +65,7 @@ func getMembership(c *gin.Context) {
|
||||
|
||||
var repoPayload = `
|
||||
{
|
||||
"id": 5,
|
||||
"owner": {
|
||||
"login": "octocat",
|
||||
"avatar_url": "https://github.com/images/error/octocat_happy.gif"
|
||||
|
||||
@@ -163,9 +163,22 @@ func (c *client) Teams(ctx context.Context, u *model.User) ([]*model.Team, error
|
||||
return teams, nil
|
||||
}
|
||||
|
||||
// Repo returns the named GitHub repository.
|
||||
func (c *client) Repo(ctx context.Context, u *model.User, owner, name string) (*model.Repo, error) {
|
||||
// Repo returns the GitHub repository.
|
||||
func (c *client) Repo(ctx context.Context, u *model.User, id model.RemoteID, owner, name string) (*model.Repo, error) {
|
||||
client := c.newClientToken(ctx, u.Token)
|
||||
|
||||
if id.IsValid() {
|
||||
intID, err := strconv.ParseInt(string(id), 10, 64)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
repo, _, err := client.Repositories.GetByID(ctx, intID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return convertRepo(repo), nil
|
||||
}
|
||||
|
||||
repo, _, err := client.Repositories.Get(ctx, owner, name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -531,7 +544,7 @@ func (c *client) loadChangedFilesFromPullRequest(ctx context.Context, pull *gith
|
||||
return build, nil
|
||||
}
|
||||
|
||||
repo, err := _store.GetRepoName(tmpRepo.Owner + "/" + tmpRepo.Name)
|
||||
repo, err := _store.GetRepoNameFallback(tmpRepo.RemoteID, tmpRepo.FullName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -77,8 +77,9 @@ func Test_github(t *testing.T) {
|
||||
|
||||
g.Describe("Requesting a repository", func() {
|
||||
g.It("Should return the repository details", func() {
|
||||
repo, err := c.Repo(ctx, fakeUser, fakeRepo.Owner, fakeRepo.Name)
|
||||
repo, err := c.Repo(ctx, fakeUser, fakeRepo.RemoteID, fakeRepo.Owner, fakeRepo.Name)
|
||||
g.Assert(err).IsNil()
|
||||
g.Assert(repo.RemoteID).Equal(fakeRepo.RemoteID)
|
||||
g.Assert(repo.Owner).Equal(fakeRepo.Owner)
|
||||
g.Assert(repo.Name).Equal(fakeRepo.Name)
|
||||
g.Assert(repo.FullName).Equal(fakeRepo.FullName)
|
||||
@@ -87,7 +88,7 @@ func Test_github(t *testing.T) {
|
||||
g.Assert(repo.Link).Equal(fakeRepo.Link)
|
||||
})
|
||||
g.It("Should handle a not found error", func() {
|
||||
_, err := c.Repo(ctx, fakeUser, fakeRepoNotFound.Owner, fakeRepoNotFound.Name)
|
||||
_, err := c.Repo(ctx, fakeUser, "0", fakeRepoNotFound.Owner, fakeRepoNotFound.Name)
|
||||
g.Assert(err).IsNotNil()
|
||||
})
|
||||
})
|
||||
@@ -131,6 +132,7 @@ var (
|
||||
}
|
||||
|
||||
fakeRepo = &model.Repo{
|
||||
RemoteID: "5",
|
||||
Owner: "octocat",
|
||||
Name: "Hello-World",
|
||||
FullName: "octocat/Hello-World",
|
||||
|
||||
Reference in New Issue
Block a user