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

Update deletion for index type of accessory (#20073)

Browse Source 
update delete for index accessory

Signed-off-by: yminer <yminer@vmware.com>

revert error code

update lint and comments
This commit is contained in:
MinerYang 2024-03-13 14:46:11 +08:00 committed by GitHub
parent a269b4f31c
commit f7a3392020
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,16 @@ func (c *controller) deleteDeeply(ctx context.Context, id int64, isRoot, isAcces
for _, acc := range art.Accessories { for _, acc := range art.Accessories {
// only hard ref accessory should be removed // only hard ref accessory should be removed
if acc.IsHard() { if acc.IsHard() {
if err = c.deleteDeeply(ctx, acc.GetData().ArtifactID, true, true); err != nil { // if this acc artifact has parent(is child), set isRoot to false
parents, err := c.artMgr.ListReferences(ctx, &q.Query{
Keywords: map[string]interface{}{
"ChildID": acc.GetData().ArtifactID,
},
})
if err != nil {
return err
}
if err = c.deleteDeeply(ctx, acc.GetData().ArtifactID, len(parents) == 0, true); err != nil {
return err return err
} }
} }
@ -369,7 +378,12 @@ func (c *controller) deleteDeeply(ctx context.Context, id int64, isRoot, isAcces
!errors.IsErr(err, errors.NotFoundCode) { !errors.IsErr(err, errors.NotFoundCode) {
return err return err
} }
if err = c.deleteDeeply(ctx, reference.ChildID, false, false); err != nil { // if the child artifact is an accessory, set isAccessory to true
accs, err := c.accessoryMgr.List(ctx, q.New(q.KeyWords{"ArtifactID": reference.ChildID}))
if err != nil {
return err
}
if err = c.deleteDeeply(ctx, reference.ChildID, false, len(accs) > 0); err != nil {
return err return err
} }
} }

2
src/server/registry/manifest.go
View File

@ -145,6 +145,8 @@ func deleteManifest(w http.ResponseWriter, req *http.Request) {
// add parse digest here is to return ErrDigestInvalidFormat before GetByReference throws an NOT_FOUND(404) // add parse digest here is to return ErrDigestInvalidFormat before GetByReference throws an NOT_FOUND(404)
// Do not add the logic into GetByReference as it's a shared method for PUT/GET/DELETE/Internal call, // Do not add the logic into GetByReference as it's a shared method for PUT/GET/DELETE/Internal call,
// and NOT_FOUND satisfy PUT/GET/Internal call. // and NOT_FOUND satisfy PUT/GET/Internal call.
// According to https://github.com/opencontainers/distribution-spec/blob/v1.1.0/spec.md#deleting-tags
// If tag deletion is disabled, the registry MUST respond with either a 400 Bad Request or a 405 Method Not Allowed
if _, err := digest.Parse(reference); err != nil { if _, err := digest.Parse(reference); err != nil {
lib_http.SendError(w, errors.Wrapf(err, "unsupported digest %s", reference).WithCode(errors.UNSUPPORTED)) lib_http.SendError(w, errors.Wrapf(err, "unsupported digest %s", reference).WithCode(errors.UNSUPPORTED))
return return