wip

Author: yacchi

aws/adaptor.go

@@ -18,13 +18,20 @@ const (
 	APIGatewayWebsocketIntegration
 	APIGatewayHTTPIntegration
 	ALBTargetGroupIntegration
+	LambdaFunctionURLIntegration
 )
 
 type integrationTypeChecker struct {
 	// 'resource' parameter only has REST API event.
 	Resource *string `json:"resource"`
-	// 'version' parameter only has HTTP API mode event.
+	// 'version' only has API Gateway V2 payload (HTTP API mode or Lambda FunctionURL).
 	Version *string `json:"version"`
+	// 'pathParameters' parameter only has API Gateway V2 payload.
+	// However, it is always nil for Function URLs.
+	PathParameters map[string]string `json:"pathParameters"`
+	// 'routeKey' parameter only has API Gateway V2 payload.
+	// However, in the case of Function URLs, it is always $default.
+	RouteKey string `json:"routeKey"`
 	// 'http_method' parameter has event of API Gateway REST API mode and ALB target group mode.
 	// However, ALB target group mode has not 'resource' parameter.
 	HTTPMethod *string `json:"httpMethod"`
@@ -47,6 +54,9 @@ func (t integrationTypeChecker) IntegrationType() LambdaIntegrationType {
 		return APIGatewayWebsocketIntegration
 	}
 	if t.Version != nil {
+		if t.RouteKey == "$default" && t.PathParameters == nil {
+			return LambdaFunctionURLIntegration
+		}
 		return APIGatewayHTTPIntegration
 	}
 	if t.HTTPMethod != nil && t.Resource == nil {

aws/lambda.go

@@ -7,12 +7,16 @@ import (
 	"github.com/aws/aws-lambda-go/events"
 	"github.com/aws/aws-lambda-go/lambda"
 	"github.com/aws/aws-lambda-go/lambda/handlertrace"
+	"github.com/aws/aws-lambda-go/lambdaurl"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"net/http"
+	"os"
 )
 
+var DEBUGDumpPayload = os.Getenv("DEBUG_DUMP_PAYLOAD")
+
 const DefaultNonHTTPEventPath = "/events"
 
 type LambdaHandlerOption func(handler *LambdaHandler)
@@ -179,6 +183,17 @@ func (l *LambdaHandler) InvokeWebsocketAPI(ctx context.Context, request *events.
 }
 
 func (l *LambdaHandler) Invoke(ctx context.Context, payload []byte) ([]byte, error) {
+	if DEBUGDumpPayload != "" && (DEBUGDumpPayload == "1" || DEBUGDumpPayload == "true") {
+		ctx = handlertrace.NewContext(ctx, handlertrace.HandlerTrace{
+			RequestEvent: func(ctx context.Context, payload interface{}) {
+				fmt.Printf("Request payload: %s\n", payload)
+			},
+			ResponseEvent: func(ctx context.Context, payload interface{}) {
+				fmt.Printf("Response payload: %s\n", payload)
+			},
+		})
+	}
+
 	trace := handlertrace.FromContext(ctx)
 
 	var (
@@ -187,6 +202,10 @@ func (l *LambdaHandler) Invoke(ctx context.Context, payload []byte) ([]byte, err
 		err     error
 	)
 
+	if trace.RequestEvent != nil {
+		trace.RequestEvent(ctx, payload)
+	}
+
 	if err = json.Unmarshal(payload, &checker); err != nil {
 		res, err = l.HandleNonHTTPEvent(ctx, payload, http.DetectContentType(payload))
 	} else {
@@ -196,34 +215,31 @@ func (l *LambdaHandler) Invoke(ctx context.Context, payload []byte) ([]byte, err
 			if err := json.Unmarshal(payload, event); err != nil {
 				return nil, err
 			}
-			if trace.RequestEvent != nil {
-				trace.RequestEvent(ctx, payload)
-			}
 			res, err = l.InvokeRESTAPI(ctx, event)
 		case APIGatewayHTTPIntegration:
 			event := &events.APIGatewayV2HTTPRequest{}
 			if err := json.Unmarshal(payload, event); err != nil {
 				return nil, err
 			}
-			if trace.RequestEvent != nil {
-				trace.RequestEvent(ctx, payload)
-			}
 			res, err = l.InvokeHTTPAPI(ctx, event)
 		case ALBTargetGroupIntegration:
 			event := &events.ALBTargetGroupRequest{}
 			if err := json.Unmarshal(payload, event); err != nil {
 				return nil, err
 			}
-			if trace.RequestEvent != nil {
-				trace.RequestEvent(ctx, payload)
-			}
 			res, err = l.InvokeALBTargetGroup(ctx, event)
 		case APIGatewayWebsocketIntegration:
 			event := &events.APIGatewayWebsocketProxyRequest{}
 			if err := json.Unmarshal(payload, event); err != nil {
 				return nil, err
 			}
 			res, err = l.InvokeWebsocketAPI(ctx, event)
+		case LambdaFunctionURLIntegration:
+			event := &events.LambdaFunctionURLRequest{}
+			if err := json.Unmarshal(payload, event); err != nil {
+				return nil, err
+			}
+			res, err = lambdaurl.Wrap(l.httpHandler)(ctx, event)
 		default:
 			res, err = l.HandleNonHTTPEvent(ctx, payload, "application/json")
 		}
@@ -233,16 +249,18 @@ func (l *LambdaHandler) Invoke(ctx context.Context, payload []byte) ([]byte, err
 		return nil, err
 	}
 
-	if trace.ResponseEvent != nil {
-		trace.ResponseEvent(ctx, res)
-	}
-
 	if b, ok := res.([]byte); ok {
+		if trace.ResponseEvent != nil {
+			trace.ResponseEvent(ctx, b)
+		}
 		return b, nil
 	} else {
 		if responseBytes, err := json.Marshal(res); err != nil {
 			return nil, err
 		} else {
+			if trace.ResponseEvent != nil {
+				trace.ResponseEvent(ctx, responseBytes)
+			}
 			return responseBytes, nil
 		}
 	}