From fea5a14f8087a78f8fc3cdf683c37b32a3736cc5 Mon Sep 17 00:00:00 2001 From: Dave Hall Date: Sat, 4 Sep 2021 16:17:46 +1000 Subject: [PATCH] Make invocation URL dynamic The API endpoint in Amazon's implementation of Lambda used the path `/2015-03-31/functions/[func]/invocations` to invoke the function. `[func]` the name of the function and is set as the value of the `AWS_LAMBDA_FUNCTION_NAME` environment variable when the function is executing on AWS. The emulator uses a hard coded endpoint of `/2015-03-31/functions/function/invocations`. This is even the case when the `AWS_LAMBDA_FUNCTION_NAME` environment variable is set to another value. This patch changes the endpoint URL when the `AWS_LAMBDA_FUNCTION_NAME` environment variable is set. In this case the invocation URL will be `/2015-03-31/functions/${AWS_LAMBDA_FUNCTION_NAME}/invocations`. When the environment variable isn't set, the current behaviour persists and the function name is set to `function`. The end result is the emulator behaviour is closer to the real environment the functions execute in. This PR fixes #43 I raised a few weeks ago. --- cmd/aws-lambda-rie/http.go | 16 +++++++++++----- cmd/aws-lambda-rie/main.go | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cmd/aws-lambda-rie/http.go b/cmd/aws-lambda-rie/http.go index be4002d..ca671d8 100644 --- a/cmd/aws-lambda-rie/http.go +++ b/cmd/aws-lambda-rie/http.go @@ -9,15 +9,21 @@ import ( log "github.com/sirupsen/logrus" ) -func startHTTPServer(ipport string, sandbox Sandbox) { +func startHTTPServer(ipport string, sandbox Sandbox, funcName string) { srv := &http.Server{ Addr: ipport, } - // Pass a channel - http.HandleFunc("/2015-03-31/functions/function/invocations", func(w http.ResponseWriter, r *http.Request) { - InvokeHandler(w, r, sandbox) - }) + var functions = []string{funcName} + if funcName != "function" { + functions = []string{"function", funcName} + } + for _, funcName := range functions { + // Pass a channel + http.HandleFunc("/2015-03-31/functions/"+funcName+"/invocations", func(w http.ResponseWriter, r *http.Request) { + InvokeHandler(w, r, sandbox) + }) + } // go routine (main thread waits) if err := srv.ListenAndServe(); err != nil { diff --git a/cmd/aws-lambda-rie/main.go b/cmd/aws-lambda-rie/main.go index 3a87e46..28f36d3 100644 --- a/cmd/aws-lambda-rie/main.go +++ b/cmd/aws-lambda-rie/main.go @@ -46,7 +46,8 @@ func main() { go sandbox.Create() testAPIipport := "0.0.0.0:8080" - startHTTPServer(testAPIipport, sandbox) + funcName := GetenvWithDefault("AWS_LAMBDA_FUNCTION_NAME", "function") + startHTTPServer(testAPIipport, sandbox, funcName) } func getCLIArgs() (options, []string) {