SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for native web workloads for AWS

Browse Source 
Fix Azure web support after refactoring classes
This commit is contained in:
Oleg Zhurakousky
2023-11-15 14:40:23 +01:00
parent bd155628da
commit 494f60ba31
26 changed files with 385 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSCompanionAutoConfiguration.java
View File

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.cloud.function.json.JacksonMapper;
import org.springframework.cloud.function.json.JsonMapper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.util.CollectionUtils;
@@ -31,7 +32,8 @@ import org.springframework.util.CollectionUtils;
* @since 3.2
*
*/
public class AWSCompanionAutoConfiguration {
@Configuration
public class AWSCompanionAutoConfiguration {
@Bean
public AWSTypesMessageConverter awsTypesMessageConverter(GenericApplicationContext applicationContext) {

77
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
View File

@@ -495,44 +495,44 @@ public class FunctionInvokerTests {
" \"isBase64Encoded\": false\n" +
"}";
String s3Event = "{\n" +
" \"Records\":[\n" +
" {\n" +
" \"eventVersion\":\"2.1\",\n" +
" \"eventSource\":\"aws:s3\",\n" +
" \"awsRegion\":\"us-east-2\",\n" +
" \"eventTime\":\"2020-07-15T21:29:41.365Z\",\n" +
" \"eventName\":\"ObjectCreated:Put\",\n" +
" \"userIdentity\":{\n" +
" \"principalId\":\"AWS:AIxxx\"\n" +
" },\n" +
" \"requestParameters\":{\n" +
" \"sourceIPAddress\":\"xxxx\"\n" +
" },\n" +
" \"responseElements\":{\n" +
" \"x-amz-request-id\":\"xxxx\",\n" +
" \"x-amz-id-2\":\"xxx/=\"\n" +
" },\n" +
" \"s3\":{\n" +
" \"s3SchemaVersion\":\"1.0\",\n" +
" \"configurationId\":\"New Data Delivery\",\n" +
" \"bucket\":{\n" +
" \"name\":\"bucket\",\n" +
" \"ownerIdentity\":{\n" +
" \"principalId\":\"xxx\"\n" +
" },\n" +
" \"arn\":\"arn:aws:s3:::bucket\"\n" +
" },\n" +
" \"object\":{\n" +
" \"key\":\"test/file.geojson\",\n" +
" \"size\":32711,\n" +
" \"eTag\":\"aaaa\",\n" +
" \"sequencer\":\"aaaa\"\n" +
" }\n" +
" }\n" +
" }\n" +
" ]\n" +
"}";
String s3Event = "{\n"
+ " \"Records\": [\n"
+ " {\n"
+ " \"eventVersion\": \"2.1\",\n"
+ " \"eventSource\": \"aws:s3\",\n"
+ " \"awsRegion\": \"eu-central-1\",\n"
+ " \"eventTime\": \"2023-11-04T23:44:23.905Z\",\n"
+ " \"eventName\": \"ObjectCreated:Put\",\n"
+ " \"userIdentity\": {\n"
+ " \"principalId\": \"AWS:xxxxxxxxxxxxxxxxxxx\"\n"
+ " },\n"
+ " \"requestParameters\": {\n"
+ " \"sourceIPAddress\": \"x.x.x.x\"\n"
+ " },\n"
+ " \"responseElements\": {\n"
+ " \"x-amz-request-id\": \"xxxxxxxxxxxxxxxx\",\n"
+ " \"x-amz-id-2\": \"xxxxxxxxxxxxxxxxxxxx\"\n"
+ " },\n"
+ " \"s3\": {\n"
+ " \"s3SchemaVersion\": \"1.0\",\n"
+ " \"configurationId\": \"xxxxxxxxxxxxxxxxxxxxxxxx\",\n"
+ " \"bucket\": {\n"
+ " \"name\": \"xxxxxxxxxxxxxxx\",\n"
+ " \"ownerIdentity\": {\n"
+ " \"principalId\": \"xxxxxxxxxxxxxxxxxx\"\n"
+ " },\n"
+ " \"arn\": \"arn:aws:s3:::xxxxxxxxxxxxxxxxx\"\n"
+ " },\n"
+ " \"object\": {\n"
+ " \"key\": \"xxxxxxxxxxxxxxxx\",\n"
+ " \"size\": 6064,\n"
+ " \"eTag\": \"xxxxxxxxxxxxx\",\n"
+ " \"sequencer\": \"xxxxxxxxxxxxxx\"\n"
+ " }\n"
+ " }\n"
+ " }\n"
+ " ]\n"
+ "}";
String apiGatewayEventWithStructuredBody = "{\n" +
" \"resource\": \"/uppercase2\",\n" +
@@ -1187,6 +1187,7 @@ public class FunctionInvokerTests {
@SuppressWarnings("rawtypes")
@Test
public void testApiGatewayV2Event() throws Exception {
System.out.println(this.apiGatewayV2Event);
System.setProperty("MAIN_CLASS", ApiGatewayConfiguration.class.getName());
System.setProperty("spring.cloud.function.definition", "inputApiV2Event");
FunctionInvoker invoker = new FunctionInvoker();