Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do not delete accessory relationship while still referenced #20360

Merged
merged 4 commits into from Apr 30, 2024
Merged

do not delete accessory relationship while still referenced #20360

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4054674
do not delete accessory relationship while still referenced
MinerYang Apr 25, 2024
917bdfd
Merge branch 'main' into fix_delete_accessory
MinerYang Apr 29, 2024
6dbb654
Merge branch 'main' into fix_delete_accessory
wy65701436 Apr 29, 2024
065e70f
Merge branch 'main' into fix_delete_accessory
wy65701436 Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/controller/artifact/controller.go
View file
Open in desktop
Expand Up @@ -326,12 +326,6 @@ func (c *controller) deleteDeeply(ctx context.Context, id int64, isRoot, isAcces
return err
}

if isAccessory {
if err := c.accessoryMgr.DeleteAccessories(ctx, q.New(q.KeyWords{"ArtifactID": art.ID, "Digest": art.Digest})); err != nil && !errors.IsErr(err, errors.NotFoundCode) {
return err
}
}

// the child artifact is referenced by some tags, skip
if !isRoot && len(art.Tags) > 0 {
return nil
Expand All @@ -354,6 +348,12 @@ func (c *controller) deleteDeeply(ctx context.Context, id int64, isRoot, isAcces
return nil
}

if isAccessory {
if err := c.accessoryMgr.DeleteAccessories(ctx, q.New(q.KeyWords{"ArtifactID": art.ID, "Digest": art.Digest})); err != nil && !errors.IsErr(err, errors.NotFoundCode) {
return err
}
}

// delete accessories if contains any
for _, acc := range art.Accessories {
// only hard ref accessory should be removed
Expand Down