Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-16 23:35:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13417 from bitsf/fix_gitlab_replication_task_num

Browse Source 
fix(replication) gitlab replication task num not correct
This commit is contained in:
Steven Zou 2020-11-04 11:33:57 +08:00 committed by GitHub
commit af7000d277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/replication/adapter/gitlab/adapter.go
View File

@ -93,7 +93,7 @@ func (a *adapter) FetchArtifacts(filters []*model.Filter) ([]*model.Resource, er
}
}
projects = a.searchByPattern(nameFilter)
projects = a.getProjectsByPattern(nameFilter)
if len(projects) == 0 {
projects, err = a.clientGitlabAPI.getProjects()
if err != nil {
@ -156,8 +156,9 @@ func (a *adapter) FetchArtifacts(filters []*model.Filter) ([]*model.Resource, er
return resources, nil
}
func (a *adapter) searchByPattern(pattern string) []*Project {
func (a *adapter) getProjectsByPattern(pattern string) []*Project {
var projects []*Project
projectset := make(map[string]bool)
var err error
if len(pattern) > 0 {
@ -168,6 +169,10 @@ func (a *adapter) searchByPattern(pattern string) []*Project {
if len(substrings) < 2 {
continue
}
if _, ok := projectset[substrings[1]]; ok {
continue
}
projectset[substrings[1]] = true
var projectsByName, err = a.clientGitlabAPI.getProjectsByName(substrings[1])
if err != nil {
return nil
@ -199,6 +204,7 @@ func (a *adapter) searchByPattern(pattern string) []*Project {
}
return projects
}
func existPatterns(path string, patterns []string) bool {
correct := false
if len(patterns) > 0 {