MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-07-21 06:21:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

send correct objectname in audit events for DeleteAll ILM (#19053)

Browse Source
This commit is contained in:
Harshavardhana 2024-02-14 08:07:58 -08:00 committed by GitHub
parent 1118b285d3
commit effe21f3eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/data-scanner.go
View File

@ -1246,7 +1246,7 @@ func applyExpiryOnNonTransitionedObjects(ctx context.Context, objLayer ObjectLay
opts.DeletePrefix = true opts.DeletePrefix = true
} }
obj, err := objLayer.DeleteObject(ctx, obj.Bucket, obj.Name, opts) dobj, err := objLayer.DeleteObject(ctx, obj.Bucket, obj.Name, opts)
if err != nil { if err != nil {
if isErrObjectNotFound(err) || isErrVersionNotFound(err) { if isErrObjectNotFound(err) || isErrVersionNotFound(err) {
return false return false
@ -1255,10 +1255,13 @@ func applyExpiryOnNonTransitionedObjects(ctx context.Context, objLayer ObjectLay
logger.LogOnceIf(ctx, err, "non-transition-expiry") logger.LogOnceIf(ctx, err, "non-transition-expiry")
return false return false
} }
if dobj.Name == "" {
dobj = obj
}
tags := newLifecycleAuditEvent(src, lcEvent).Tags() tags := newLifecycleAuditEvent(src, lcEvent).Tags()
// Send audit for the lifecycle delete operation // Send audit for the lifecycle delete operation
auditLogLifecycle(ctx, obj, ILMExpiry, tags, traceFn) auditLogLifecycle(ctx, dobj, ILMExpiry, tags, traceFn)
eventName := event.ObjectRemovedDelete eventName := event.ObjectRemovedDelete
if obj.DeleteMarker { if obj.DeleteMarker {
@ -1268,8 +1271,8 @@ func applyExpiryOnNonTransitionedObjects(ctx context.Context, objLayer ObjectLay
// Notify object deleted event. // Notify object deleted event.
sendEvent(eventArgs{ sendEvent(eventArgs{
EventName: eventName, EventName: eventName,
BucketName: obj.Bucket, BucketName: dobj.Bucket,
Object: obj, Object: dobj,
UserAgent: "Internal: [ILM-Expiry]", UserAgent: "Internal: [ILM-Expiry]",
Host: globalLocalNodeName, Host: globalLocalNodeName,
}) })