Skip to content

fix(s3): parse notifications with generated bucket tags #7006

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

Closed
Dodothereal wants to merge 1 commit into from
+3 −3
Closed

fix(s3): parse notifications with generated bucket tags #7006

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ...ource/src/main/java/org/opensearch/dataprepper/plugins/source/s3/S3EventNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public String getPrincipalId() {
}
}

@JsonIgnoreProperties(ignoreUnknown = true)
public static class S3BucketEntity {

private final String name;
Expand Down
5 changes: 2 additions & 3 deletions ...va/org/opensearch/dataprepper/plugins/source/s3/parser/S3EventNotificationParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.sqs.model.Message;

import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
Expand All @@ -23,7 +22,7 @@ public class S3EventNotificationParserTest {
"\"eventName\":\"ObjectCreated:Put\",\"userIdentity\":{\"principalId\":\"AWS:xyz\"},\"requestParameters\":{\"sourceIPAddress\":\"127.0.0.1\"}," +
"\"responseElements\":{\"x-amz-request-id\":\"xyz\",\"x-amz-id-2\":\"xyz\"},\"s3\":{\"s3SchemaVersion\":\"1.0\"," +
"\"configurationId\":\"xyz\",\"bucket\":{\"name\":\"my-bucket\",\"ownerIdentity\":{\"principalId\":\"ABC\"}," +
"\"arn\":\"arn:aws:s3:::my-bucket\", \"unknownField\":\"test\"},\"object\":{\"key\":\"path/to/myfile.log.gz\",\"size\":3159112,\"eTag\":\"abcd123\"," +
"\"arn\":\"arn:aws:s3:::my-bucket\",\"awsGeneratedTags\":[\"tag1\"]},\"object\":{\"key\":\"path/to/myfile.log.gz\",\"size\":3159112,\"eTag\":\"abcd123\"," +
"\"sequencer\":\"000\",\"hasObjectAnnotation\":false}}}]}";

public static final String SNS_BASED_MESSAGE = "{\n" +
Expand All @@ -39,7 +38,7 @@ public class S3EventNotificationParserTest {
" \"UnsubscribeURL\" : \"https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:notifications:abc\"\n" +
"}";

private final ObjectMapper objectMapper = new ObjectMapper().disable(FAIL_ON_UNKNOWN_PROPERTIES);
private final ObjectMapper objectMapper = new ObjectMapper();
private Message message;
@BeforeEach
public void setUp() {
Expand Down
Loading