Merge branch 'main' into main

Author: smirnoal

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/aws-lambda-java-core.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-core/**'
+      - 'aws-lambda-java-core/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-core/**'
+      - 'aws-lambda-java-core/**'
+      - '.github/workflows/aws-lambda-java-core.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto
@@ -38,3 +39,5 @@ jobs:
     - name: Run 'pr' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make pr
+      env:
+        IS_JAVA_8: true

.github/workflows/aws-lambda-java-events-sdk-transformer.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-events-sdk-transformer/**'
+      - 'aws-lambda-java-events-sdk-transformer/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-events-sdk-transformer/**'
+      - 'aws-lambda-java-events-sdk-transformer/**'
+      - '.github/workflows/aws-lambda-java-events-sdk-transformer.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto

.github/workflows/aws-lambda-java-events.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-events/**'
+      - 'aws-lambda-java-events/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-events/**'
+      - 'aws-lambda-java-events/**'
+      - '.github/workflows/aws-lambda-java-events.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto

.github/workflows/aws-lambda-java-log4j2.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-log4j2/**'
+      - 'aws-lambda-java-log4j2/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-log4j2/**'
+      - 'aws-lambda-java-log4j2/**'
+      - '.github/workflows/aws-lambda-java-log4j2.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto

.github/workflows/aws-lambda-java-serialization.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-serialization/**'
+      - 'aws-lambda-java-serialization/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-serialization/**'
+      - 'aws-lambda-java-serialization/**'
+      - '.github/workflows/aws-lambda-java-serialization.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto

.github/workflows/aws-lambda-java-tests.yml

@@ -7,11 +7,12 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'aws-lambda-java-tests/**'
+      - 'aws-lambda-java-tests/**'
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-tests/**'
+      - 'aws-lambda-java-tests/**'
+      - '.github/workflows/aws-lambda-java-tests.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto

.github/workflows/repo-sync.yml

@@ -3,6 +3,10 @@ name: Repo Sync
 on:
   schedule:
     - cron: "0 8 * * 1-5" # At 08:00 on every day-of-week from Monday through Friday
+  pull_request:
+    branches: [ '*' ]
+    paths:
+      - '.github/workflows/repo-sync.yml'
   workflow_dispatch:
 
 jobs:

.github/workflows/runtime-interface-client_merge_to_main.yml

@@ -15,6 +15,7 @@ on:
     branches: [ main ]
     paths:
     - 'aws-lambda-java-runtime-interface-client/**'
+  workflow_dispatch:
 
 jobs:
 
@@ -29,13 +30,13 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
@@ -48,9 +49,11 @@ jobs:
     - name: Test Runtime Interface Client xplatform build - Run 'build' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make build
+      env:
+        IS_JAVA_8: true
 
     - name: Issue AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-region: ${{ secrets.AWS_REGION }}
         role-to-assume: ${{ secrets.AWS_ROLE }}

.github/workflows/runtime-interface-client_pr.yml

@@ -7,7 +7,8 @@ on:
   pull_request:
     branches: [ '*' ]
     paths:
-    - 'aws-lambda-java-runtime-interface-client/**'
+      - 'aws-lambda-java-runtime-interface-client/**'
+      - '.github/workflows/runtime-interface-client_pr.yml'
 
 jobs:
 
@@ -17,28 +18,30 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto
 
     - name: Runtime Interface Client smoke tests - Run 'pr' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make pr
+      env:
+        IS_JAVA_8: true
 
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
 
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
@@ -51,9 +54,11 @@ jobs:
     - name: Test Runtime Interface Client xplatform build - Run 'build' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make build
+      env:
+        IS_JAVA_8: true
 
     - name: Save the built jar
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: aws-lambda-java-runtime-interface-client
         path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar

.github/workflows/samples.yml

@@ -12,6 +12,7 @@ on:
     branches: [ '*' ]
     paths:
       - 'samples/kinesis-firehose-event-handler/**'
+      - '.github/workflows/samples.yml'
 
 jobs:
   build:
@@ -21,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: corretto

.gitignore

@@ -24,4 +24,7 @@ dependency-reduced-pom.xml
 .project
 
 # OSX
-.DS_Store
+.DS_Store
+
+# snapshot process
+aws-lambda-java-runtime-interface-client/pom.xml.versionsBackup

README.md

@@ -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.5.0</version>
+ <version>2.5.1</version>
 </dependency>
 ```
 

aws-lambda-java-events/README.md

@@ -46,6 +46,8 @@
 * `KinesisFirehoseEvent`
 * `LambdaDestinationEvent`
 * `LexEvent`
+* `MSKFirehoseEvent`
+* `MSKFirehoseResponse`
 * `RabbitMQEvent`
 * `S3BatchEvent`
 * `S3BatchResponse`

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

@@ -0,0 +1,51 @@
+/*
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package com.amazonaws.services.lambda.runtime.events;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder(setterPrefix = "with")
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class MSKFirehoseEvent {
+
+    private String invocationId;
+
+    private String deliveryStreamArn;
+
+    private String sourceMSKArn;
+
+    private String region;
+
+    private List<Record> records;
+
+    @Data
+    @Builder(setterPrefix = "with")
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Record {
+
+        private ByteBuffer kafkaRecordValue;
+
+        private String recordId;
+
+        private Long approximateArrivalEpoch;
+
+        private Long approximateArrivalTimestamp;
+
+        private Map<String, String> mskRecordMetadata;
+
+    }
+}