'Version 1.6.2 of the AWS CloudTrail Processing Library'

Author: keithwo

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AWS CloudTrail Processing Library for Java
 Bundle-SymbolicName: com.amazonaws.awscloudtrailprocessinglibrary;singleton:=true
-Bundle-Version: 1.6.1
+Bundle-Version: 1.6.2
 Bundle-Vendor: Amazon Technologies, Inc
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.amazonaws.sdk;bundle-version="1.12.261"

README.rst

@@ -65,14 +65,18 @@ build, use this command::
 Release Notes
 -------------
 
-Release 1.6.1 (May19,2023)
+Release 1.6.2 (Nov 30, 2023)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added support for modeling EdgeDeviceDetails
+
+Release 1.6.1 (May 19,2023)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Added Ssupport for test scenario for UserType IdentityCenterUser
+* Added support for test scenario for UserType IdentityCenterUser
 
-Release 1.6.0 (May8,2023)
+Release 1.6.0 (May 8,2023)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Updated CloudTrailEvent version to 1.12
-* Added support for USerIdentity
+* Added support for UserIdentity
 
 Release 1.5.2 (Sep 6, 2022)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>aws-cloudtrail-processing-library</artifactId>
     <packaging>jar</packaging>
     <name>AWS CloudTrail Processing Library for Java</name>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <description>AWS CloudTrail Processing Library for Java helps Java
         developers to easily consume and process log files from AWS
         CloudTrail.

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/CloudTrailEventData.java

@@ -21,6 +21,7 @@
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.InsightDetails;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.Resource;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.TlsDetails;
+import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.EdgeDeviceDetails;
 import com.amazonaws.services.cloudtrail.processinglibrary.model.internal.UserIdentity;
 
 import java.util.Date;
@@ -339,8 +340,8 @@ public Addendum getAddendum() {
      *
      * @return Information about the edge device, such as device type, device ID.
      */
-    public String getEdgeDeviceDetails() {
-        return (String) get(CloudTrailEventField.edgeDeviceDetails.name());
+    public EdgeDeviceDetails getEdgeDeviceDetails() {
+        return (EdgeDeviceDetails) get(CloudTrailEventField.edgeDeviceDetails.name());
     }
 
     /**

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/internal/CloudTrailEventField.java

@@ -39,6 +39,8 @@ public enum CloudTrailEventField {
     cipherSuite,
     clientProvidedHostHeader,
     credentialId,
+    deviceFamily,
+    deviceId,
     edgeDeviceDetails,
     errorCode,
     errorMessage,
@@ -76,6 +78,7 @@ public enum CloudTrailEventField {
     sessionCredentialFromConsole,
     sessionIssuer,
     sharedEventID,
+    snowJobId,
     sourceIPAddress,
     state,
     statistics,
@@ -89,4 +92,4 @@ public enum CloudTrailEventField {
     value,
     vpcEndpointId,
     webIdFederationData
-}
+}

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/model/internal/EdgeDeviceDetails.java

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2010-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ ******************************************************************************/
+
+package com.amazonaws.services.cloudtrail.processinglibrary.model.internal;
+
+import java.util.Map;
+
+/**
+ * Information about the Edge device details of a service API call.
+ */
+public class EdgeDeviceDetails extends CloudTrailDataStore{
+    public String getType() {
+        return (String) this.get(CloudTrailEventField.type.name());
+    }
+
+    public String getSnowJobId() {
+        return (String) this.get(CloudTrailEventField.snowJobId.name());
+    }
+
+    public String getDeviceId() {
+        return (String) this.get(CloudTrailEventField.deviceId.name());
+    }
+
+    public String getDeviceFamily() {
+        return (String) this.get(CloudTrailEventField.deviceFamily.name());
+    }
+
+    /**
+     * Get attributes
+     *
+     * @return additional edge device attributes
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public Map<String, String> getAttributes() {
+        return (Map) this.get(CloudTrailEventField.attributes.name());
+    }
+}

src/main/java/com/amazonaws/services/cloudtrail/processinglibrary/serializer/AbstractEventSerializer.java

@@ -168,6 +168,9 @@ public CloudTrailEvent getNextEvent() throws IOException {
                 case "tlsDetails":
                     this.parseTlsDetails(eventData);
                     break;
+                case "edgeDeviceDetails":
+                    this.parseEdgeDeviceDetails(eventData);
+                    break;
                 default:
                     eventData.add(key, parseDefaultValue(key));
                     break;
@@ -811,6 +814,47 @@ private void parseTlsDetails(CloudTrailEventData eventData) throws IOException {
         eventData.add(CloudTrailEventField.tlsDetails.name(), tlsDetails);
     }
 
+    private void parseEdgeDeviceDetails(CloudTrailEventData eventData) throws IOException {
+        JsonToken nextToken = jsonParser.nextToken();
+        if (nextToken == JsonToken.VALUE_NULL) {
+            eventData.add(CloudTrailEventField.edgeDeviceDetails.name(), null);
+            return;
+        }
+
+        if (nextToken != JsonToken.START_OBJECT) {
+            throw new JsonParseException("Not a EdgeDevice Details object", jsonParser.getCurrentLocation());
+        }
+
+        EdgeDeviceDetails edgeDeviceDetails = new EdgeDeviceDetails();
+
+        while (jsonParser.nextToken() != JsonToken.END_OBJECT) {
+            String key = jsonParser.getCurrentName();
+
+            switch (key) {
+                case "attributes":
+                    edgeDeviceDetails.add(CloudTrailEventField.attributes.name(), parseAttributes());
+                    break;
+                case "type":
+                    edgeDeviceDetails.add(CloudTrailEventField.type.name(), jsonParser.nextTextValue());
+                    break;
+                case "snowJobId":
+                    edgeDeviceDetails.add(CloudTrailEventField.snowJobId.name(), jsonParser.nextTextValue());
+                    break;
+                case "deviceId":
+                    edgeDeviceDetails.add(CloudTrailEventField.deviceId.name(), jsonParser.nextTextValue());
+                    break;
+                case "deviceFamily":
+                    edgeDeviceDetails.add(CloudTrailEventField.deviceFamily.name(), jsonParser.nextTextValue());
+                    break;
+                default:
+                    edgeDeviceDetails.add(key, this.parseDefaultValue(key));
+                    break;
+            }
+        }
+
+        eventData.add(CloudTrailEventField.edgeDeviceDetails.name(), edgeDeviceDetails);
+    }
+
     /**
      * Parses the event with key as default value.
      *