From d16753ae969abfabae7092a6b65f0f5ce78abf8d Mon Sep 17 00:00:00 2001 From: Ziming Zhang Date: Thu, 30 Jul 2020 00:07:54 +0800 Subject: [PATCH] fix[replicatioin] aliyun acr pull with repo filter Signed-off-by: Ziming Zhang --- src/replication/adapter/aliacr/adapter.go | 26 +++++++++-------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/replication/adapter/aliacr/adapter.go b/src/replication/adapter/aliacr/adapter.go index 6328f3e31..ff89af325 100644 --- a/src/replication/adapter/aliacr/adapter.go +++ b/src/replication/adapter/aliacr/adapter.go @@ -256,22 +256,16 @@ func (a *adapter) FetchArtifacts(filters []*model.Filter) (resources []*model.Re log.Debugf("\nnamespace: %s \t repositories: %#v\n\n", namespace, repos) - if _, ok := util.IsSpecificPathComponent(namespacePattern); ok { - log.Debugf("specific namespace: %s", repoPattern) - repositories = append(repositories, repos...) - } else { - for _, repo := range repos { - - var ok bool - var repoName = filepath.Join(repo.RepoNamespace, repo.RepoName) - ok, err = util.Match(repoPattern, repoName) - log.Debugf("\n Repository: %s\t repoPattern: %s\t Match: %v\n", repoName, repoPattern, ok) - if err != nil { - return - } - if ok { - repositories = append(repositories, repo) - } + for _, repo := range repos { + var ok bool + var repoName = filepath.Join(repo.RepoNamespace, repo.RepoName) + ok, err = util.Match(repoPattern, repoName) + log.Debugf("\n Repository: %s\t repoPattern: %s\t Match: %v\n", repoName, repoPattern, ok) + if err != nil { + return + } + if ok { + repositories = append(repositories, repo) } } }