Light, fluffy, and always free - The AWS Local Emulator alternative
fix(lambda): retain event source qualifiers at invocation (#6288)
Andre Kurait504e0dfde778
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.javaindex 0dabf3889f..4f198f2b1c 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePoller.java@@ -350,7 +350,10 @@ public class DynamoDbStreamsEventSourcePoller implements Resettable {String eventJson = buildDynamoDbEvent(matched, esm);InvokeResult invokeResult;try {- invokeResult = executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse);+ String qualifier = LambdaTargetResolver.mappingQualifier(esm);+ invokeResult = qualifier == null+ ? executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse)+ : executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse, 0, qualifier);} catch (AwsException e) {if ("TooManyRequestsException".equals(e.getErrorCode())) {LOG.infov("DynamoDB Streams ESM {0}: function {1} throttled, shard iterator not advanced",diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.javaindex 152edb0a79..02b415aaf3 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePoller.java@@ -173,7 +173,10 @@ public class KinesisEventSourcePoller implements Resettable {String eventJson = buildKinesisEvent(matched, esm, shard.getShardId());InvokeResult invokeResult;try {- invokeResult = executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse);+ String qualifier = LambdaTargetResolver.mappingQualifier(esm);+ invokeResult = qualifier == null+ ? executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse)+ : executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse, 0, qualifier);} catch (AwsException e) {if ("TooManyRequestsException".equals(e.getErrorCode())) {LOG.infov("Kinesis ESM {0}: function {1} throttled, shard iterator not advanced",diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaTargetResolver.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaTargetResolver.javaindex 5863d8bd14..b81460dc67 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaTargetResolver.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaTargetResolver.java@@ -52,8 +52,7 @@ public class LambdaTargetResolver {/** The function a mapping invokes, or empty when it or its version or alias is gone. */public Optional<LambdaFunction> resolveMappingTarget(EventSourceMapping esm) {- String qualifier = esm.getFunctionArn() == null- ? null : LambdaArnUtils.resolve(esm.getFunctionArn()).qualifier();+ String qualifier = mappingQualifier(esm);try {return Optional.of(resolveInvokeTargetForAccount(esm.getAccountId(), esm.getRegion(), esm.getFunctionName(), qualifier));@@ -65,6 +64,10 @@ public class LambdaTargetResolver {}}+ static String mappingQualifier(EventSourceMapping esm) {+ return esm.getFunctionArn() == null ? null : LambdaArnUtils.resolve(esm.getFunctionArn()).qualifier();+ }+private LambdaFunction resolveTarget(String region, String name, String qualifier,Function<LambdaAlias, String> aliasVersion) {if (qualifier == null || qualifier.equals("$LATEST")) {diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.javaindex 22d56cc686..3b280dc858 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java@@ -266,8 +266,10 @@ public class SqsEventSourcePoller implements Resettable {LOG.infov("ESM {0}: invoking function {1}", esm.getUuid(), fn.getFunctionName());InvokeResult result;try {- result = executorService.invoke(- fn, eventJson.getBytes(), InvocationType.RequestResponse);+ String qualifier = LambdaTargetResolver.mappingQualifier(esm);+ result = qualifier == null+ ? executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse)+ : executorService.invoke(fn, eventJson.getBytes(), InvocationType.RequestResponse, 0, qualifier);} catch (AwsException e) {if ("TooManyRequestsException".equals(e.getErrorCode())) {LOG.infov("ESM {0}: function {1} throttled, messages will return to queue after visibility timeout",diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePollerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePollerTest.javaindex d2730b342c..b6186c72de 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePollerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/DynamoDbStreamsEventSourcePollerTest.java@@ -409,14 +409,14 @@ class DynamoDbStreamsEventSourcePollerTest {void versionQualifiedMappingInvokesThatVersion() {stubTrimHorizon(List.of(ddbRecord("s1", "INSERT", "{\"status\":{\"S\":\"active\"}}")));LambdaFunction version1 = stubVersion("1");- when(executorService.invoke(any(), any(byte[].class), eq(InvocationType.RequestResponse)))+ when(executorService.invoke(any(), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("1"))).thenReturn(new InvokeResult());EventSourceMapping esm = filterEsm();esm.setFunctionArn("arn:aws:lambda:us-east-1:" + ACCOUNT_ID + ":function:fn:1");pollerWith(mock(EsmStore.class)).pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version1), any(byte[].class), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version1), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("1"));}@Test@@ -428,14 +428,14 @@ class DynamoDbStreamsEventSourcePollerTest {alias.setFunctionName("fn");alias.setFunctionVersion("2");when(aliasStore.getForAccount(ACCOUNT_ID, "us-east-1", "fn", "live")).thenReturn(Optional.of(alias));- when(executorService.invoke(any(), any(byte[].class), eq(InvocationType.RequestResponse)))+ when(executorService.invoke(any(), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("live"))).thenReturn(new InvokeResult());EventSourceMapping esm = filterEsm();esm.setFunctionArn("arn:aws:lambda:us-east-1:" + ACCOUNT_ID + ":function:fn:live");pollerWith(mock(EsmStore.class)).pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version2), any(byte[].class), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version2), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("live"));}private LambdaFunction stubVersion(String version) {diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePollerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePollerTest.javaindex 114734b52c..1f6ba8152f 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePollerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/KinesisEventSourcePollerTest.java@@ -168,13 +168,13 @@ class KinesisEventSourcePollerTest {stubFunction();LambdaFunction version1 = stubVersion("1");stubStreamWith(List.of(record("s1", "p1", "{}")));- when(executorService.invoke(any(), any(), eq(InvocationType.RequestResponse))).thenReturn(new InvokeResult());+ when(executorService.invoke(any(), any(), eq(InvocationType.RequestResponse), eq(0), eq("1"))).thenReturn(new InvokeResult());EventSourceMapping esm = esm();esm.setFunctionArn("arn:aws:lambda:" + REGION + ":" + ACCOUNT + ":function:fn:1");poller.pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version1), any(), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version1), any(), eq(InvocationType.RequestResponse), eq(0), eq("1"));}@Test@@ -187,13 +187,13 @@ class KinesisEventSourcePollerTest {alias.setFunctionVersion("2");when(aliasStore.getForAccount(ACCOUNT, REGION, "fn", "live")).thenReturn(Optional.of(alias));stubStreamWith(List.of(record("s1", "p1", "{}")));- when(executorService.invoke(any(), any(), eq(InvocationType.RequestResponse))).thenReturn(new InvokeResult());+ when(executorService.invoke(any(), any(), eq(InvocationType.RequestResponse), eq(0), eq("live"))).thenReturn(new InvokeResult());EventSourceMapping esm = esm();esm.setFunctionArn("arn:aws:lambda:" + REGION + ":" + ACCOUNT + ":function:fn:live");poller.pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version2), any(), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version2), any(), eq(InvocationType.RequestResponse), eq(0), eq("live"));}private LambdaFunction stubVersion(String version) {diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.javaindex 7796627fbc..c8aeee0e45 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java@@ -344,12 +344,12 @@ class SqsEventSourcePollerTest {when(functionStore.getForAccount("000000000000", "us-east-1", "throwfn", "1")).thenReturn(Optional.of(version1));stubReceive(esm, List.of(message("m1")));- when(executorService.invoke(any(LambdaFunction.class), any(byte[].class), eq(InvocationType.RequestResponse)))+ when(executorService.invoke(any(LambdaFunction.class), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("1"))).thenReturn(new InvokeResult());poller.pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version1), any(byte[].class), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version1), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("1"));}@Test@@ -370,12 +370,12 @@ class SqsEventSourcePollerTest {when(functionStore.getForAccount("000000000000", "us-east-1", "throwfn", "2")).thenReturn(Optional.of(version2));stubReceive(esm, List.of(message("m1")));- when(executorService.invoke(any(LambdaFunction.class), any(byte[].class), eq(InvocationType.RequestResponse)))+ when(executorService.invoke(any(LambdaFunction.class), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("live"))).thenReturn(new InvokeResult());poller.pollAndInvoke(esm);- verify(executorService, timeout(2000)).invoke(eq(version2), any(byte[].class), eq(InvocationType.RequestResponse));+ verify(executorService, timeout(2000)).invoke(eq(version2), any(byte[].class), eq(InvocationType.RequestResponse), eq(0), eq("live"));}@Test