From 1cd3aa22a2b098bbe9643206e075cc468a4be220 Mon Sep 17 00:00:00 2001
From: Daniel Fangl <daniel.fangl@localstack.cloud>
Date: Tue, 20 Dec 2022 14:57:18 +0100
Subject: [PATCH 1/3] fix check if event is sqs event

---
 src/main/java/cloud/localstack/LambdaExecutor.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cloud/localstack/LambdaExecutor.java b/src/main/java/cloud/localstack/LambdaExecutor.java
index dfd9fb6..34a67f4 100644
--- a/src/main/java/cloud/localstack/LambdaExecutor.java
+++ b/src/main/java/cloud/localstack/LambdaExecutor.java
@@ -29,12 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -104,7 +99,7 @@ public static void main(String[] args) throws Exception {
 				inputObject = DDBEventParser.parse(records);
 			} else if (records.stream().anyMatch(record -> record.containsKey("s3"))) {
 				inputObject = S3EventParser.parse(records);
-			} else if (records.stream().anyMatch(record -> record.containsKey("sqs"))) {
+			} else if (records.stream().anyMatch(record -> Objects.equals(record.get("eventSource"), "aws:sqs"))) {
 				inputObject = reader.readValue(fileContent, SQSEvent.class);
 			}
 		}

From ee2bd6b8b47bcd27a50308ee0494e75f61d648b4 Mon Sep 17 00:00:00 2001
From: Daniel Fangl <daniel.fangl@localstack.cloud>
Date: Tue, 20 Dec 2022 14:58:47 +0100
Subject: [PATCH 2/3] revert replacement with *

---
 src/main/java/cloud/localstack/LambdaExecutor.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cloud/localstack/LambdaExecutor.java b/src/main/java/cloud/localstack/LambdaExecutor.java
index 34a67f4..78b3506 100644
--- a/src/main/java/cloud/localstack/LambdaExecutor.java
+++ b/src/main/java/cloud/localstack/LambdaExecutor.java
@@ -29,7 +29,13 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**

From 8efd09031c2f517e4487339a5163ab3acde97ce9 Mon Sep 17 00:00:00 2001
From: Daniel Fangl <daniel.fangl@localstack.cloud>
Date: Tue, 20 Dec 2022 15:04:33 +0100
Subject: [PATCH 3/3] update to 0.2.22

---
 README.md | 3 ++-
 pom.xml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9f782c0..b4b6da0 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Simply add the following dependency to your `pom.xml` file:
 <dependency>
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
-    <version>0.2.21</version>
+    <version>0.2.22</version>
 </dependency>
 ```
 
@@ -108,6 +108,7 @@ make build
 
 ## Change Log
 
+* v0.2.22: Fix sqs event mapping for new event format, some test fixes
 * v0.2.21: Bump version of AWS SDK v1; add AWS SDK v2 sync clients to TestUtils; add docker executable path under homebrew
 * v0.2.20: Fix extracting container logs for LocalStack startup check
 * v0.2.19: Bump version of log4j to 2.17.0 to fix further vulnerabilities related to recent CVE
diff --git a/pom.xml b/pom.xml
index df317c4..d888879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
     <packaging>jar</packaging>
-    <version>0.2.21</version>
+    <version>0.2.22</version>
     <name>localstack-utils</name>
 
     <description>Java utilities for the LocalStack platform.</description>