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.

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

bucket notifications - adapt to xml conversion #8745

Merged
merged 1 commit into from
Feb 4, 2025
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
45 changes: 16 additions & 29 deletions src/endpoint/s3/ops/s3_get_bucket_notification.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,25 @@ const _ = require('lodash');
*/
async function get_bucket_notification(req) {

let result = await req.object_sdk.get_bucket_notification({
const result = await req.object_sdk.get_bucket_notification({
bucket_name: req.params.bucket,
});

result = _.cloneDeep(result);

const TopicConfiguration = [];

//adapt to aws cli structure
if (result && result.length > 0) {
for (const conf of result) {
conf.Event = conf.event;
conf.Topic = conf.topic;
conf.Id = conf.id;
delete conf.event;
delete conf.topic;
delete conf.id;

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

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

return reply;
//adapt to structure that xml_utils.encode_xml() will then
//encode into aws compliant reply
return {
NotificationConfiguration: [_.map(result, t => ({
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to wrap the map with [] because it always returns an array

Suggested change
NotificationConfiguration: [_.map(result, t => ({
NotificationConfiguration: _.map(result, t => ({

TopicConfiguration: [
{
Id: t.id,
Topic: t.topic,
},
_.map(t.event, e => ({
Event: e
}))
]
}))]
};
}

module.exports = {
Expand Down