Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/sources/aws_s3/sqs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1064,11 +1064,17 @@ pub struct EventBridgeS3Event {
pub struct EventBridgeS3Detail {
pub event_version: S3EventVersion,
pub bucket: S3Bucket,
pub object: S3Object,
pub object: EventBridgeS3Object,
#[serde(default)]
pub reason: String,
}

// Unlike native S3 notifications, EventBridge does not URL-encode the object key.
#[derive(Clone, Debug, Deserialize)]
pub struct EventBridgeS3Object {
pub key: String,
}

impl From<EventBridgeS3Event> for S3EventRecord {
fn from(event: EventBridgeS3Event) -> Self {
// "Object Created" -> "ObjectCreated", matching the native event-name kinds.
Expand All @@ -1084,7 +1090,9 @@ impl From<EventBridgeS3Event> for S3EventRecord {
event_time: event.time,
s3: S3Message {
bucket: event.detail.bucket,
object: event.detail.object,
object: S3Object {
key: event.detail.object.key,
},
},
}
}
Expand Down Expand Up @@ -1487,12 +1495,13 @@ fn test_eventbridge_restore_without_reason() {
}

#[test]
fn test_eventbridge_key_is_url_decoded() {
let body = eventbridge_body("Object Created", "a+b%2Bc%25d", "PutObject");
fn test_eventbridge_key_is_not_url_decoded() {
let body = eventbridge_body("Object Created", "eb test/a b+c%d.txt", "PutObject");
let SqsEvent::EventBridge(event) = serde_json::from_str::<SqsEvent>(&body).unwrap() else {
panic!("expected an EventBridge event");
};
assert_eq!(event.detail.object.key, "a b+c%d");
let record: S3EventRecord = event.into();
assert_eq!(record.s3.object.key, "eb test/a b+c%d.txt");
}

#[test]
Expand Down
Loading