Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(lambda): report resolved executed version (#2026)

Aniket Shukla2889fbdef8fd
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaController.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaController.java
index 846b31143c..2264ddc1b4 100644
--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaController.java
@@ -250,7 +250,7 @@ public class LambdaController {
if (result.getLogResult() != null) {
builder.header("X-Amz-Log-Result", result.getLogResult());
}
- builder.header("X-Amz-Executed-Version", "$LATEST");
+ builder.header("X-Amz-Executed-Version", result.getExecutedVersion());
builder.header("X-Amz-Request-Id", result.getRequestId());
if (result.getPayload() != null && result.getPayload().length > 0) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java
index 613776f2b7..c75a739491 100644
--- a/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/LambdaService.java
@@ -612,7 +612,9 @@ public class LambdaService {
String name = ref.name();
String qualifier = ref.qualifier();
LambdaFunction fn = resolveInvokeTarget(region, name, qualifier);
- return executorService.invoke(fn, payload, type);
+ InvokeResult result = executorService.invoke(fn, payload, type);
+ result.setExecutedVersion(fn.getVersion());
+ return result;
}
private LambdaFunction resolveInvokeTarget(String region, String name, String qualifier) {
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/model/InvokeResult.java b/src/main/java/io/github/hectorvent/floci/services/lambda/model/InvokeResult.java
index 27e6a3d8d5..e155a4dfb9 100644
--- a/src/main/java/io/github/hectorvent/floci/services/lambda/model/InvokeResult.java
+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/model/InvokeResult.java
@@ -10,6 +10,7 @@ public class InvokeResult {
private String functionError;
private String logResult;
private String requestId;
+ private String executedVersion;
public InvokeResult() {
}
@@ -61,4 +62,12 @@ public class InvokeResult {
public void setRequestId(String requestId) {
this.requestId = requestId;
}
+
+ public String getExecutedVersion() {
+ return executedVersion;
+ }
+
+ public void setExecutedVersion(String executedVersion) {
+ this.executedVersion = executedVersion;
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaVersionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaVersionIntegrationTest.java
index 1452c000bb..c93630ba02 100644
--- a/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaVersionIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/LambdaVersionIntegrationTest.java
@@ -77,6 +77,18 @@ class LambdaVersionIntegrationTest {
@Test
@Order(4)
+ void invokePublishedVersionReturnsExecutedVersion() {
+ given()
+ .header("X-Amz-Invocation-Type", "DryRun")
+ .when()
+ .post(BASE_PATH + "/functions/" + FUNCTION_NAME + ":1/invocations")
+ .then()
+ .statusCode(204)
+ .header("X-Amz-Executed-Version", equalTo("1"));
+ }
+
+ @Test
+ @Order(5)
void listVersionsByFunction() {
given()
.when()
@@ -90,7 +102,7 @@ class LambdaVersionIntegrationTest {
}
@Test
- @Order(5)
+ @Order(6)
void deleteFunctionDeletesAllVersions() {
// Delete function
given()