Merge branch 'main' into modify-appsync-lambda-authorizer-event-input

Author: vissa96

README.md

@@ -21,7 +21,7 @@ Example request handler
 public class Handler implements RequestHandler<Map<String, String>, String>{
  @Override
  public String handleRequest(Map<String, String> event, Context context) {
- 
+
  }
 }
 ```
@@ -32,7 +32,7 @@ Example request stream handler
 public class HandlerStream implements RequestStreamHandler {
   @Override
   public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
-    
+
   }
 }
 ```
@@ -41,7 +41,7 @@ public class HandlerStream implements RequestStreamHandler {
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-core</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
 </dependency>
 ```
 
@@ -71,7 +71,7 @@ public class SqsHandler implements RequestHandler<SQSEvent, String> {
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-events</artifactId>
- <version>3.11.2</version>
+ <version>3.11.4</version>
 </dependency>
 ```
 
@@ -101,7 +101,7 @@ public void testInjectSQSEvent(SQSEvent event) {
 ## aws-lambda-java-events-sdk-transformer
 
 This package provides helper classes/methods to use alongside `aws-lambda-java-events` in order to transform
-Lambda input event model objects into SDK-compatible output model objects.  
+Lambda input event model objects into SDK-compatible output model objects.
 See the [documentation](aws-lambda-java-events-sdk-transformer/README.md) for more information.
 
 - [Release Notes](aws-lambda-java-events-sdk-transformer/RELEASE.CHANGELOG.md)
@@ -125,7 +125,7 @@ See the [README](aws-lambda-java-log4j2/README.md) or the [official documentatio
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-log4j2</artifactId>
- <version>1.5.1</version>
+ <version>1.6.0</version>
 </dependency>
 ```
 
@@ -140,7 +140,7 @@ The purpose of this package is to allow developers to deploy their applications
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
- <version>2.3.2</version>
+ <version>2.5.0</version>
 </dependency>
 ```
 
@@ -154,12 +154,12 @@ This package defines the Lambda serialization logic using in the `aws-lambda-jav
 <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-lambda-java-serialization</artifactId>
- <version>1.0.1</version>
+ <version>1.1.5</version>
 </dependency>
 ```
 
 ## Disclaimer of use
 
 Each of the supplied packages should be used without modification. Removing
 dependencies, adding conflicting dependencies, or selectively including classes
-from the packages can result in unexpected behavior.
+from the packages can result in unexpected behavior.

aws-lambda-java-core/RELEASE.CHANGELOG.md

@@ -1,3 +1,7 @@
+### August 17, 2023
+`1.2.3`:
+- Extended logger interface with level-aware logging backend functions
+
 ### November 09, 2022
 `1.2.2`:
 - Added new `CustomPojoSerializer` interface

aws-lambda-java-core/pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-lambda-java-core</artifactId>
-  <version>1.2.2</version>
+  <version>1.2.3</version>
   <packaging>jar</packaging>
 
   <name>AWS Lambda Java Core Library</name>

aws-lambda-java-core/src/main/java/com/amazonaws/services/lambda/runtime/LambdaLogger.java

@@ -2,6 +2,8 @@
 
 package com.amazonaws.services.lambda.runtime;
 
+import com.amazonaws.services.lambda.runtime.logging.LogLevel;
+
 /**
  * A low level Lambda runtime logger
  *
@@ -10,7 +12,7 @@ public interface LambdaLogger {
 
     /**
     * Logs a string to AWS CloudWatch Logs
-    * 
+    *
     * <p>
     * Logging will not be done:
     * <ul>
@@ -22,7 +24,7 @@ public interface LambdaLogger {
     * </li>
     * </ul>
     * </p>
-    * 
+    *
     * @param message A string containing the event to log.
     */
     void log(String message);
@@ -32,5 +34,27 @@ public interface LambdaLogger {
      * @param message byte array containing logs
      */
     void log(byte[] message);
+
+    /**
+     * LogLevel aware logging backend function.
+     *
+     * @param message in String format
+     * @param logLevel
+     */
+    default void log(String message, LogLevel logLevel) {
+        log(message);
+    }
+
+    /**
+     * LogLevel aware logging backend function.
+     *
+     * @param message in byte[] format
+     * @param logLevel
+     */
+    default void log(byte[] message, LogLevel logLevel) {
+        log(message);
+    }
+
+
 }
 

aws-lambda-java-core/src/main/java/com/amazonaws/services/lambda/runtime/logging/LogFormat.java

@@ -0,0 +1,17 @@
+/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+
+package com.amazonaws.services.lambda.runtime.logging;
+
+
+public enum LogFormat {
+    JSON,
+    TEXT;
+
+    public static LogFormat fromString(String logFormat) {
+        try {
+            return LogFormat.valueOf(logFormat.toUpperCase());
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Invalid log format: '" + logFormat + "' expected one of [JSON, TEXT]");
+        }
+    }
+}

aws-lambda-java-core/src/main/java/com/amazonaws/services/lambda/runtime/logging/LogLevel.java

@@ -0,0 +1,25 @@
+/* Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. */
+
+package com.amazonaws.services.lambda.runtime.logging;
+
+
+public enum LogLevel {
+    // UNDEFINED log level is used when the legacy LambdaLogger::log(String) function is called
+    // where the loglevel is not defined. In this case we're not filtering the message in the runtime
+    UNDEFINED,
+    TRACE,
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR,
+    FATAL;
+
+    public static LogLevel fromString(String logLevel) {
+        try {
+            return LogLevel.valueOf(logLevel.toUpperCase());
+        } catch (Exception e) {
+            throw new IllegalArgumentException(
+                    "Invalid log level: '" + logLevel + "' expected one of [TRACE, DEBUG, INFO, WARN, ERROR, FATAL]");
+        }
+    }
+}

aws-lambda-java-events/README.md

@@ -56,44 +56,21 @@
 * `SQSEvent`
 
 
-### Getting Started
-
-[Maven](https://maven.apache.org)
+### Usage
 
 ```xml
 <dependencies>
     ...
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-core</artifactId>
-        <version>1.2.2</version>
+        <version>1.2.3</version>
     </dependency>
     <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-lambda-java-events</artifactId>
-        <version>3.11.2</version>
+        <version>3.11.4</version>
     </dependency>
     ...
 </dependencies>
 ```
-
-[Gradle](https://gradle.org)
-
-```groovy
-'com.amazonaws:aws-lambda-java-core:1.2.1'
-'com.amazonaws:aws-lambda-java-events:3.11.0'
-```
-
-[Leiningen](http://leiningen.org) and [Boot](http://boot-clj.com)
-
-```clojure
-[com.amazonaws/aws-lambda-java-core "1.2.1"]
-[com.amazonaws/aws-lambda-java-events "3.11.0"]
-```
-
-[sbt](http://www.scala-sbt.org)
-
-```scala
-"com.amazonaws" % "aws-lambda-java-core" % "1.2.1"
-"com.amazonaws" % "aws-lambda-java-events" % "3.11.0"
-```

aws-lambda-java-events/RELEASE.CHANGELOG.md

@@ -1,3 +1,12 @@
+### December 1, 2023
+`3.11.4`:
+- Improve `toString` in Cognito events by calling `super`
+- Added missing `version` field to ScheduledEvent from CloudWatch
+
+### September 1, 2023
+`3.11.3`:
+- Update challengeAnswer field format in CognitoUserPoolEvent 
+
 ### May 18, 2023
 `3.11.2`:
 - Add missing fields to API Gateway request context

aws-lambda-java-events/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-events</artifactId>
-    <version>3.11.2</version>
+    <version>3.11.4</version>
     <packaging>jar</packaging>
 
     <name>AWS Lambda Java Events Library</name>

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolCreateAuthChallengeEvent.java

@@ -26,6 +26,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolCreateAuthChallengeEvent extends CognitoUserPoolEvent {
 
     /**
@@ -56,6 +57,7 @@ public CognitoUserPoolCreateAuthChallengeEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * One or more key-value pairs that you can provide as custom input to the Lambda function that you specify for the create auth challenge trigger.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolCustomMessageEvent.java

@@ -26,6 +26,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolCustomMessageEvent extends CognitoUserPoolEvent {
     /**
      * The request from the Amazon Cognito service.
@@ -55,6 +56,7 @@ public CognitoUserPoolCustomMessageEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * One or more key-value pairs that you can provide as custom input to the Lambda function that you specify for the custom message trigger.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolDefineAuthChallengeEvent.java

@@ -26,6 +26,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolDefineAuthChallengeEvent extends CognitoUserPoolEvent {
 
     /**
@@ -56,6 +57,7 @@ public CognitoUserPoolDefineAuthChallengeEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * One or more key-value pairs that you can provide as custom input to the Lambda function that you specify for the define auth challenge trigger.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolMigrateUserEvent.java

@@ -26,6 +26,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolMigrateUserEvent extends CognitoUserPoolEvent {
     /**
      * The request from the Amazon Cognito service.
@@ -55,6 +56,7 @@ public CognitoUserPoolMigrateUserEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * The username entered by the user.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPostAuthenticationEvent.java

@@ -16,6 +16,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -29,6 +30,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolPostAuthenticationEvent extends CognitoUserPoolEvent {
 
     /**
@@ -52,6 +54,7 @@ public CognitoUserPoolPostAuthenticationEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * One or more key-value pairs that you can provide as custom input to the Lambda function that you specify for the post authentication trigger.

aws-lambda-java-events/src/main/java/com/amazonaws/services/lambda/runtime/events/CognitoUserPoolPostConfirmationEvent.java

@@ -16,6 +16,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.util.Map;
 
@@ -29,6 +30,7 @@
 @EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
+@ToString(callSuper = true)
 public class CognitoUserPoolPostConfirmationEvent extends CognitoUserPoolEvent {
 
     /**
@@ -52,6 +54,7 @@ public CognitoUserPoolPostConfirmationEvent(
     @Data
     @EqualsAndHashCode(callSuper = true)
     @NoArgsConstructor
+    @ToString(callSuper = true)
     public static class Request extends CognitoUserPoolEvent.Request {
         /**
          * One or more key-value pairs that you can provide as custom input to the Lambda function that you specify for the post confirmation trigger.