mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-02 13:21:31 +00:00
Code Issues Projects Releases Wiki Activity

gitlab: support nested repos (#2981)

Browse source 
close  #2311
This commit is contained in:
6543 2023-12-21 00:55:16 +01:00 committed by GitHub
parent 2cf873f9bf
commit 65c62e987f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
server/forge/gitlab/gitlab.go
View file

@ -226,8 +226,16 @@ func (g *GitLab) Teams(ctx context.Context, user *model.User) ([]*model.Team, er
}
// getProject fetches the named repository from the forge.
func (g *GitLab) getProject(ctx context.Context, client *gitlab.Client, owner, name string) (*gitlab.Project, error) {
repo, _, err := client.Projects.GetProject(fmt.Sprintf("%s/%s", owner, name), nil, gitlab.WithContext(ctx))
func (g *GitLab) getProject(ctx context.Context, client *gitlab.Client, mr *model.Repo, owner, name string) (*gitlab.Project, error) {
var (
repo *gitlab.Project
err error
)
if mr != nil && mr.ForgeRemoteID.IsValid() {
repo, _, err = client.Projects.GetProject(mr.ForgeRemoteID, nil, gitlab.WithContext(ctx))
} else {
repo, _, err = client.Projects.GetProject(fmt.Sprintf("%s/%s", owner, name), nil, gitlab.WithContext(ctx))
}
if err != nil {
return nil, err
}
@ -254,7 +262,7 @@ func (g *GitLab) Repo(ctx context.Context, user *model.User, remoteID model.Forg
return g.convertGitLabRepo(_repo)
}
_repo, err := g.getProject(ctx, client, owner, name)
_repo, err := g.getProject(ctx, client, nil, owner, name)
if err != nil {
return nil, err
}
@ -309,7 +317,7 @@ func (g *GitLab) PullRequests(ctx context.Context, u *model.User, r *model.Repo,
return nil, err
}
_repo, err := g.getProject(ctx, client, r.Owner, r.Name)
_repo, err := g.getProject(ctx, client, r, r.Owner, r.Name)
if err != nil {
return nil, err
}
@ -339,7 +347,7 @@ func (g *GitLab) File(ctx context.Context, user *model.User, repo *model.Repo, p
if err != nil {
return nil, err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
@ -355,10 +363,11 @@ func (g *GitLab) Dir(ctx context.Context, user *model.User, repo *model.Repo, pi
}
files := make([]*forge_types.FileMeta, 0, perPage)
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
opts := &gitlab.ListTreeOptions{
ListOptions: gitlab.ListOptions{PerPage: perPage},
Path: &path,
@ -402,7 +411,7 @@ func (g *GitLab) Status(ctx context.Context, user *model.User, repo *model.Repo,
return err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return err
}
@ -459,7 +468,7 @@ func (g *GitLab) Activate(ctx context.Context, user *model.User, repo *model.Rep
return err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return err
}
@ -494,7 +503,7 @@ func (g *GitLab) Deactivate(ctx context.Context, user *model.User, repo *model.R
return err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return err
}
@ -548,7 +557,7 @@ func (g *GitLab) Branches(ctx context.Context, user *model.User, repo *model.Rep
return nil, err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return nil, err
}
@ -575,7 +584,7 @@ func (g *GitLab) BranchHead(ctx context.Context, u *model.User, r *model.Repo, b
return "", err
}
_repo, err := g.getProject(ctx, client, r.Owner, r.Name)
_repo, err := g.getProject(ctx, client, r, r.Owner, r.Name)
if err != nil {
return "", err
}
@ -744,7 +753,7 @@ func (g *GitLab) loadChangedFilesFromMergeRequest(ctx context.Context, tmpRepo *
return nil, err
}
_repo, err := g.getProject(ctx, client, repo.Owner, repo.Name)
_repo, err := g.getProject(ctx, client, repo, repo.Owner, repo.Name)
if err != nil {
return nil, err
}