Merge pull request #4 from jbleduigou/3-using-non-aws-context-will-ca…

…use-a-panic fix: 🐛 verify that lambda context was found
jbleduigou · Apr 3, 2024 · 901fd50 · 901fd50
2 parents c6cfde7 + 991c4e9
commit 901fd50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/handler.go b/handler.go
@@ -23,7 +23,12 @@ func NewAWSLambdaHandler(ctx context.Context, opts *slog.HandlerOptions) slog.Ha
 	}
 
 	// Retrieve AWS Request ID and lambda function arn
-	lc, _ := lambdacontext.FromContext(ctx)
+	lc, found := lambdacontext.FromContext(ctx)
+
+	if !found {
+		return slog.NewJSONHandler(os.Stdout, opts)
+	}
+
 	requestID := lc.AwsRequestID
 	arn := lc.InvokedFunctionArn
 

diff --git a/handler_test.go b/handler_test.go
@@ -1,6 +1,7 @@
 package slogawslambda
 
 import (
+	"context"
 	"log/slog"
 	"os"
 	"testing"
@@ -49,3 +50,11 @@ func TestGetLogLevel(t *testing.T) {
 		})
 	}
 }
+
+func TestUsingNonAwsContextShouldNotError(t *testing.T) {
+	ctx := context.Background()
+
+	h := NewAWSLambdaHandler(ctx, nil)
+
+	assert.NotNil(t, h)
+}