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

[Backport into 5.18] Notif backports #8663

Merged
merged 2 commits into from
Jan 8, 2025
Merged

[Backport into 5.18] Notif backports #8663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
723e759
bucket notifications - fix TopicConfiguration array for get (github i…
alphaprinz Jan 6, 2025
7b0a310
bucket notifications - go on to next event when checking event filter…
alphaprinz Jan 7, 2025
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: 12 additions & 4 deletions src/endpoint/s3/ops/s3_get_bucket_notification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ async function get_bucket_notification(req) {

result = _.cloneDeep(result);

const TopicConfiguration = [];

//adapt to aws cli structure
if (result && result.length > 0) {
for (const conf of result) {
Expand All @@ -23,20 +25,26 @@ async function get_bucket_notification(req) {
delete conf.event;
delete conf.topic;
delete conf.id;

TopicConfiguration.push({TopicConfiguration: conf});
}
}

if (result && result.length > 0) {
for (const conf of result) {
TopicConfiguration.push({TopicConfiguration: conf});
}
}

const reply = result && result.length > 0 ?
{
//return result inside TopicConfiguration tag
NotificationConfiguration: {
TopicConfiguration: result
}
NotificationConfiguration:
TopicConfiguration
} :
//if there's no notification, return empty NotificationConfiguration tag
{ NotificationConfiguration: {} };


return reply;
}

Expand Down
2 changes: 1 addition & 1 deletion src/util/notifications_util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ function check_notif_relevant(notif, req) {
const notif_event_elems = notif_event.split(':');
const notif_event_name = notif_event_elems[1];
const notif_event_method = notif_event_elems[2];
if (notif_event_name.toLowerCase() !== op_event.name.toLowerCase()) return false;
if (notif_event_name.toLowerCase() !== op_event.name.toLowerCase()) continue;
//is there filter by method?
if (notif_event_method === '*') {
//no filtering on method. we've passed the filter and need to send a notification
Expand Down
Loading