Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-26 10:38:00 +01:00
Code Issues Projects Releases Wiki Activity

fix the copy artifact issue (#18441)

Browse Source 
support copy artifact with multipe levels of accessories.

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2023-03-30 02:04:22 +08:00 committed by GitHub
parent d22c94b4fa
commit f63865d207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/controller/artifact/controller.go
View File

@ -19,6 +19,7 @@ import (
"context" "context"
stderrors "errors" stderrors "errors"
"fmt" "fmt"
"os"
"strings" "strings"
"time" "time"
@ -487,6 +488,21 @@ func (c *controller) copyDeeply(ctx context.Context, srcRepo, reference, dstRepo
// copy accessory if contains any // copy accessory if contains any
for _, acc := range srcArt.Accessories { for _, acc := range srcArt.Accessories {
accs, err := c.accessoryMgr.List(ctx, q.New(q.KeyWords{"SubjectArtifactRepo": srcRepo, "SubjectArtifactDigest": acc.GetData().Digest}))
if err != nil {
return 0, err
}
// copy the fork which root is the accessory self with a temp array
// to avoid infinite recursion, disable this part in UT.
if os.Getenv("UTTEST") != "true" {
if len(accs) > 0 {
tmpDstAccs := make([]*accessorymodel.AccessoryData, 0)
_, err = c.copyDeeply(ctx, srcRepo, acc.GetData().Digest, dstRepo, true, false, &tmpDstAccs)
if err != nil {
return 0, err
}
}
}
dstAcc := &accessorymodel.AccessoryData{ dstAcc := &accessorymodel.AccessoryData{
Digest: acc.GetData().Digest, Digest: acc.GetData().Digest,
Type: acc.GetData().Type, Type: acc.GetData().Type,