From c07aa97d15fc36b429de1b47cd07761098a4b893 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 18 May 2021 16:33:04 +0200
Subject: [PATCH] Ensure user set headers in API Gateway are properly
 propagated to message headers

---
 .../function/adapter/aws/AWSLambdaUtils.java  |  8 ++
 .../function-sample-aws-custom-bean/pom.xml   | 92 ++++---------------
 2 files changed, 25 insertions(+), 75 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
index 4fb5bbf30..ea18f27a8 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
@@ -121,6 +121,12 @@ final class AWSLambdaUtils {
 					messageBuilder = MessageBuilder.withPayload(body).copyHeaders(requestMap);
 				}
 			}
+
+			Object providedHeaders = requestMap.remove("headers");
+			if (providedHeaders != null && providedHeaders instanceof Map) {
+				messageBuilder.removeHeader("headers");
+				messageBuilder.copyHeaders((Map<String, Object>) providedHeaders);
+			}
 		}
 		else if (request instanceof Iterable) {
 			messageBuilder = MessageBuilder.withPayload(request);
@@ -131,6 +137,8 @@ final class AWSLambdaUtils {
 		if (awsContext != null) {
 			messageBuilder.setHeader("aws-context", awsContext);
 		}
+		logger.info("Incoming request headers: " + headers);
+
 		return messageBuilder.copyHeaders(headers).build();
 	}
 
diff --git a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
index 31a3e3ade..80ba3e4fd 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom-bean/pom.xml
@@ -45,17 +45,17 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.awaitility</groupId>
-			<artifactId>awaitility</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
-			<version>1.14.3</version>
-			<scope>test</scope>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.awaitility</groupId> -->
+<!-- 			<artifactId>awaitility</artifactId> -->
+<!-- 			<scope>test</scope> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.testcontainers</groupId> -->
+<!-- 			<artifactId>testcontainers</artifactId> -->
+<!-- 			<version>1.14.3</version> -->
+<!-- 			<scope>test</scope> -->
+<!-- 		</dependency> -->
 	</dependencies>
 
 	<dependencyManagement>
@@ -74,11 +74,11 @@
 		<plugins>
 			<plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>com/example/ContainerTests.java</exclude>
-                    </excludes>
-                </configuration>
+<!--                 <configuration> -->
+<!--                     <excludes> -->
+<!--                         <exclude>com/example/ContainerTests.java</exclude> -->
+<!--                     </excludes> -->
+<!--                 </configuration> -->
             </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -148,63 +148,5 @@
         </build>
 	  </profile>
 	</profiles>
-	
-<!-- 	<repositories> -->
-<!-- 		<repository> -->
-<!-- 			<id>spring-snapshots</id> -->
-<!-- 			<name>Spring Snapshots</name> -->
-<!-- 			<url>https://repo.spring.io/libs-snapshot-local</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>true</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 			<releases> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</releases> -->
-<!-- 		</repository> -->
-<!-- 		<repository> -->
-<!-- 			<id>spring-milestones</id> -->
-<!-- 			<name>Spring Milestones</name> -->
-<!-- 			<url>https://repo.spring.io/libs-milestone-local</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 		</repository> -->
-<!-- 		<repository> -->
-<!-- 			<id>spring-releases</id> -->
-<!-- 			<name>Spring Releases</name> -->
-<!-- 			<url>https://repo.spring.io/release</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 		</repository> -->
-<!-- 	</repositories> -->
-<!-- 	<pluginRepositories> -->
-<!-- 		<pluginRepository> -->
-<!-- 			<id>spring-snapshots</id> -->
-<!-- 			<name>Spring Snapshots</name> -->
-<!-- 			<url>https://repo.spring.io/libs-snapshot-local</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>true</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 			<releases> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</releases> -->
-<!-- 		</pluginRepository> -->
-<!-- 		<pluginRepository> -->
-<!-- 			<id>spring-milestones</id> -->
-<!-- 			<name>Spring Milestones</name> -->
-<!-- 			<url>https://repo.spring.io/libs-milestone-local</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 		</pluginRepository> -->
-<!-- 		<pluginRepository> -->
-<!-- 			<id>spring-releases</id> -->
-<!-- 			<name>Spring Releases</name> -->
-<!-- 			<url>https://repo.spring.io/libs-release-local</url> -->
-<!-- 			<snapshots> -->
-<!-- 				<enabled>false</enabled> -->
-<!-- 			</snapshots> -->
-<!-- 		</pluginRepository> -->
-<!-- 	</pluginRepositories> -->
+
 </project>