Adding missing s3 event notification fields

Signed-off-by: Divyansh Bokadia <dbokadia@amazon.com>

Author: divbok

data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/s3/S3EventBridgeNotification.java

@@ -97,6 +97,13 @@ public static class Detail {
         private final String sourceIpAddress;
         private final String reason;
         private final String eventVersion;
+        private final String deletionType;
+        private final DateTime restoreExpiryTime;
+        private final String sourceStorageClass;
+        private final String destinationStorageClass;
+        private final String destinationAccessTier;
+        private final String objectAnnotation;
+        private final boolean hasObjectAnnotation;
 
         @JsonCreator
         public Detail(@JsonProperty(value = "version") final String version,
@@ -106,7 +113,14 @@ public Detail(@JsonProperty(value = "version") final String version,
                       @JsonProperty("requester") final String requester,
                       @JsonProperty("source-ip-address") final String sourceIpAddress,
                       @JsonProperty("reason") final String reason,
-                      @JsonProperty("event-version") final String eventVersion) {
+                      @JsonProperty("event-version") final String eventVersion,
+                      @JsonProperty("deletion-type") final String deletionType,
+                      @JsonProperty("restore-expiry-time") final String restoreExpiryTime,
+                      @JsonProperty("source-storage-class") final String sourceStorageClass,
+                      @JsonProperty("destination-storage-class") final String destinationStorageClass,
+                      @JsonProperty("destination-access-tier") final String destinationAccessTier,
+                      @JsonProperty("object-annotation") final String objectAnnotation,
+                      @JsonProperty("has-object-annotation") final boolean hasObjectAnnotation) {
             this.version = version;
             this.bucket = bucket;
             this.object = object;
@@ -115,6 +129,13 @@ public Detail(@JsonProperty(value = "version") final String version,
             this.sourceIpAddress = sourceIpAddress;
             this.reason = reason;
             this.eventVersion = eventVersion;
+            this.deletionType = deletionType;
+            this.restoreExpiryTime = restoreExpiryTime != null ? DateTime.parse(restoreExpiryTime) : null;
+            this.sourceStorageClass = sourceStorageClass;
+            this.destinationStorageClass = destinationStorageClass;
+            this.destinationAccessTier = destinationAccessTier;
+            this.objectAnnotation = objectAnnotation;
+            this.hasObjectAnnotation = hasObjectAnnotation;
         }
 
         public String getVersion() {

data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/s3/S3EventNotification.java

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.joda.time.DateTime;
@@ -84,13 +85,15 @@ public String getArn() {
     }
   }
 
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public static class S3ObjectEntity {
 
     private final String key;
     private final Long size;
     private final String eTag;
     private final String versionId;
     private final String sequencer;
+    private final boolean hasObjectAnnotation;
 
     @Deprecated
     public S3ObjectEntity(
@@ -104,6 +107,7 @@ public S3ObjectEntity(
       this.eTag = eTag;
       this.versionId = versionId;
       this.sequencer = null;
+      this.hasObjectAnnotation = false;
     }
 
     @Deprecated
@@ -113,7 +117,7 @@ public S3ObjectEntity(
         String eTag,
         String versionId)
     {
-      this(key, size, eTag, versionId, null);
+      this(key, size, eTag, versionId, null, false);
     }
 
     @JsonCreator
@@ -122,13 +126,15 @@ public S3ObjectEntity(
         @JsonProperty(value = "size") Long size,
         @JsonProperty(value = "eTag") String eTag,
         @JsonProperty(value = "versionId") String versionId,
-        @JsonProperty(value = "sequencer") String sequencer)
+        @JsonProperty(value = "sequencer") String sequencer,
+        @JsonProperty(value = "hasObjectAnnotation") boolean hasObjectAnnotation)
     {
       this.key = key;
       this.size = size;
       this.eTag = eTag;
       this.versionId = versionId;
       this.sequencer = sequencer;
+      this.hasObjectAnnotation  = hasObjectAnnotation;
     }
 
     public String getKey() {

data-prepper-plugins/s3-source/src/test/java/org/opensearch/dataprepper/plugins/source/s3/parser/S3EventNotificationParserTest.java

@@ -23,7 +23,7 @@ public class S3EventNotificationParserTest {
                     "\"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\"},\"object\":{\"key\":\"path/to/myfile.log.gz\",\"size\":3159112,\"eTag\":\"abcd123\"," +
-                    "\"sequencer\":\"000\"}}}]}";
+                    "\"sequencer\":\"000\", \"hasObjectAnnotation\":true}}}]}";
 
     public static final String SNS_BASED_MESSAGE = "{\n" +
             "  \"Type\" : \"Notification\",\n" +