upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-22 01:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix replicate reference accessory (#16401)

Browse Source 
fixes #16375

Signed-off-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2022-02-23 21:24:15 +08:00 committed by GitHub
parent 490fe4e5b3
commit 6ef4874011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/pkg/reg/adapter/harbor/v2/client.go
View File

@ -55,23 +55,13 @@ func (c *client) listArtifacts(repo string) ([]*model.Artifact, error) {
return nil, err return nil, err
} }
var arts []*model.Artifact var arts []*model.Artifact
for _, artifact := range artifacts {
art := &model.Artifact{
Type: artifact.Type,
Digest: artifact.Digest,
}
for _, label := range artifact.Labels {
art.Labels = append(art.Labels, label.Name)
}
for _, tag := range artifact.Tags {
art.Tags = append(art.Tags, tag.Name)
}
arts = append(arts, art)
// For Harbor v2 clients, it has to append the accessory objects behind the subject artifact it has. // append the accessory objects behind the subject artifact if it has.
for _, acc := range artifact.Accessories { var getAccessoryArts = func(art *artifact.Artifact) ([]*model.Artifact, error) {
art := &model.Artifact{ var accArts = []*model.Artifact{}
Type: artifact.Type, for _, acc := range art.Accessories {
accArt := &model.Artifact{
Type: art.Type,
Digest: acc.GetData().Digest, Digest: acc.GetData().Digest,
} }
tags, err := c.listTags(project, repo, acc.GetData().Digest) tags, err := c.listTags(project, repo, acc.GetData().Digest)
@ -79,9 +69,47 @@ func (c *client) listArtifacts(repo string) ([]*model.Artifact, error) {
return nil, err return nil, err
} }
for _, tag := range tags { for _, tag := range tags {
art.Tags = append(art.Tags, tag) accArt.Tags = append(accArt.Tags, tag)
}
accArts = append(accArts, accArt)
}
return accArts, nil
}
for _, artItem := range artifacts {
art := &model.Artifact{
Type: artItem.Type,
Digest: artItem.Digest,
}
for _, label := range artItem.Labels {
art.Labels = append(art.Labels, label.Name)
}
for _, tag := range artItem.Tags {
art.Tags = append(art.Tags, tag.Name)
} }
arts = append(arts, art) arts = append(arts, art)
// append the accessory of index or individual artifact
accArts, err := getAccessoryArts(artItem)
if err != nil {
return nil, err
}
arts = append(arts, accArts...)
// append the accessory of reference if it has
for _, ref := range artItem.References {
url := fmt.Sprintf("%s/projects/%s/repositories/%s/artifacts/%s?with_accessory=true",
c.BasePath(), project, repo, ref.ChildDigest)
artRef := artifact.Artifact{}
if err := c.C.Get(url, &artRef); err != nil {
return nil, err
}
accArts, err := getAccessoryArts(&artRef)
if err != nil {
return nil, err
}
arts = append(arts, accArts...)
} }
} }
return arts, nil return arts, nil