MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-03 09:55:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: support event name s3:Restore:* (#16257)

Browse Source
This commit is contained in:
Harshavardhana 2022-12-14 05:12:07 -08:00 committed by GitHub
parent d37e514733
commit bad229e16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/object-handlers.go
View File

@ -3155,7 +3155,7 @@ func (api objectAPIHandlers) PostRestoreObjectHandler(w http.ResponseWriter, r *
w.WriteHeader(statusCode) w.WriteHeader(statusCode)
// Notify object restore started via a POST request. // Notify object restore started via a POST request.
sendEvent(eventArgs{ sendEvent(eventArgs{
EventName: event.ObjectRestorePostInitiated, EventName: event.ObjectRestorePost,
BucketName: bucket, BucketName: bucket,
Object: objInfo, Object: objInfo,
ReqParams: extractReqParams(r), ReqParams: extractReqParams(r),
@ -3224,7 +3224,7 @@ func (api objectAPIHandlers) PostRestoreObjectHandler(w http.ResponseWriter, r *
// Notify object restore completed via a POST request. // Notify object restore completed via a POST request.
sendEvent(eventArgs{ sendEvent(eventArgs{
EventName: event.ObjectRestorePostCompleted, EventName: event.ObjectRestoreCompleted,
BucketName: bucket, BucketName: bucket,
Object: objInfo, Object: objInfo,
ReqParams: extractReqParams(r), ReqParams: extractReqParams(r),

24
internal/event/name.go
View File

@ -53,8 +53,8 @@ const (
ObjectReplicationMissedThreshold ObjectReplicationMissedThreshold
ObjectReplicationReplicatedAfterThreshold ObjectReplicationReplicatedAfterThreshold
ObjectReplicationNotTracked ObjectReplicationNotTracked
ObjectRestorePostInitiated ObjectRestorePost
ObjectRestorePostCompleted ObjectRestoreCompleted
ObjectTransitionFailed ObjectTransitionFailed
ObjectTransitionComplete ObjectTransitionComplete
@ -65,7 +65,7 @@ const (
ObjectCreatedAll ObjectCreatedAll
ObjectRemovedAll ObjectRemovedAll
ObjectReplicationAll ObjectReplicationAll
ObjectRestorePostAll ObjectRestoreAll
ObjectTransitionAll ObjectTransitionAll
Everything Everything
) )
@ -103,10 +103,10 @@ func (name Name) Expand() []Name {
ObjectReplicationMissedThreshold, ObjectReplicationMissedThreshold,
ObjectReplicationReplicatedAfterThreshold, ObjectReplicationReplicatedAfterThreshold,
} }
case ObjectRestorePostAll: case ObjectRestoreAll:
return []Name{ return []Name{
ObjectRestorePostInitiated, ObjectRestorePost,
ObjectRestorePostCompleted, ObjectRestoreCompleted,
} }
case ObjectTransitionAll: case ObjectTransitionAll:
return []Name{ return []Name{
@ -190,9 +190,11 @@ func (name Name) String() string {
return "s3:Replication:OperationMissedThreshold" return "s3:Replication:OperationMissedThreshold"
case ObjectReplicationReplicatedAfterThreshold: case ObjectReplicationReplicatedAfterThreshold:
return "s3:Replication:OperationReplicatedAfterThreshold" return "s3:Replication:OperationReplicatedAfterThreshold"
case ObjectRestorePostInitiated: case ObjectRestoreAll:
return "s3:ObjectRestore:*"
case ObjectRestorePost:
return "s3:ObjectRestore:Post" return "s3:ObjectRestore:Post"
case ObjectRestorePostCompleted: case ObjectRestoreCompleted:
return "s3:ObjectRestore:Completed" return "s3:ObjectRestore:Completed"
case ObjectTransitionAll: case ObjectTransitionAll:
return "s3:ObjectTransition:*" return "s3:ObjectTransition:*"
@ -301,11 +303,11 @@ func ParseName(s string) (Name, error) {
case "s3:Replication:OperationNotTracked": case "s3:Replication:OperationNotTracked":
return ObjectReplicationNotTracked, nil return ObjectReplicationNotTracked, nil
case "s3:ObjectRestore:*": case "s3:ObjectRestore:*":
return ObjectRestorePostAll, nil return ObjectRestoreAll, nil
case "s3:ObjectRestore:Post": case "s3:ObjectRestore:Post":
return ObjectRestorePostInitiated, nil return ObjectRestorePost, nil
case "s3:ObjectRestore:Completed": case "s3:ObjectRestore:Completed":
return ObjectRestorePostCompleted, nil return ObjectRestoreCompleted, nil
case "s3:ObjectTransition:Failed": case "s3:ObjectTransition:Failed":
return ObjectTransitionFailed, nil return ObjectTransitionFailed, nil
case "s3:ObjectTransition:Complete": case "s3:ObjectTransition:Complete":