Skip to content

fix(s3): ignore unrelated messages in events #480

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

Merged
badmonster0 merged 1 commit into from
May 13, 2025
Merged

fix(s3): ignore unrelated messages in events #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/ops/sources/amazon_s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,15 @@ impl SourceExecutor for Executor {

#[derive(Debug, Deserialize)]
pub struct S3EventNotification {
#[serde(rename = "Records")]
#[serde(default, rename = "Records")]
pub records: Vec<S3EventRecord>,
}

#[derive(Debug, Deserialize)]
pub struct S3EventRecord {
#[serde(rename = "eventName")]
pub event_name: String,
// pub eventTime: String,
pub s3: S3Entity,
pub s3: Option<S3Entity>,
}

#[derive(Debug, Deserialize)]
Expand Down Expand Up @@ -225,21 +224,26 @@ impl Executor {
for message in messages.into_iter().filter_map(|m| m.body) {
let notification: S3EventNotification = serde_json::from_str(&message)?;
for record in notification.records {
if record.s3.bucket.name != self.bucket_name {
let s3 = if let Some(s3) = record.s3 {
s3
} else {
continue;
};
if s3.bucket.name != self.bucket_name {
continue;
}
if !self
.prefix
.as_ref()
.map_or(true, |prefix| record.s3.object.key.starts_with(prefix))
.map_or(true, |prefix| s3.object.key.starts_with(prefix))
{
continue;
}
if record.event_name.starts_with("ObjectCreated:")
|| record.event_name.starts_with("ObjectDeleted:")
{
changes.push(SourceChange {
key: KeyValue::Str(record.s3.object.key.into()),
key: KeyValue::Str(s3.object.key.into()),
data: None,
});
}
Expand Down