Merge pull request #5 from cruxstack/dev

feat: handle only apigw v2 events

Author: sgtoj

cmd/lambda/README.md

@@ -90,7 +90,7 @@ func UniversalHandler(ctx context.Context, event json.RawMessage) (any, error)
 ```
 
 **Supported Events**:
-- `APIGatewayProxyRequest` → Routes to webhook/status/config handlers
+- `APIGatewayV2HTTPRequest` → Routes to webhook/status/config handlers
 - `CloudWatchEvent` (EventBridge) → Routes to scheduled event processor
 
 ### Endpoints

cmd/lambda/main.go

@@ -1,5 +1,5 @@
 // Package main provides the AWS Lambda entry point for the GitHub bot.
-// This Lambda handler supports both API Gateway (webhooks) and EventBridge
+// This Lambda handler supports API Gateway HTTP API (v2.0) and EventBridge
 // (scheduled sync) events.
 package main
 
@@ -40,14 +40,14 @@ func initApp() {
 	})
 }
 
-// APIGatewayHandler processes incoming API Gateway requests.
+// APIGatewayHandler processes incoming API Gateway HTTP API (v2.0) requests.
 // handles GitHub webhook events, status checks, and config endpoints.
 // validates webhook signatures before processing events.
-func APIGatewayHandler(ctx context.Context, req awsevents.APIGatewayProxyRequest) (awsevents.APIGatewayProxyResponse, error) {
+func APIGatewayHandler(ctx context.Context, req awsevents.APIGatewayV2HTTPRequest) (awsevents.APIGatewayV2HTTPResponse, error) {
 	initApp()
 	if initErr != nil {
 		logger.Error("initialization failed", slog.String("error", initErr.Error()))
-		return awsevents.APIGatewayProxyResponse{
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 500,
 			Body:       "service initialization failed",
 		}, nil
@@ -58,7 +58,7 @@ func APIGatewayHandler(ctx context.Context, req awsevents.APIGatewayProxyRequest
 		logger.Debug("received api gateway request", slog.String("request", string(j)))
 	}
 
-	path := req.Path
+	path := req.RawPath
 	if appInst.Config.BasePath != "" {
 		path = strings.TrimPrefix(path, appInst.Config.BasePath)
 		if path == "" {
@@ -74,30 +74,23 @@ func APIGatewayHandler(ctx context.Context, req awsevents.APIGatewayProxyRequest
 		return handleServerConfig(ctx, req)
 	}
 
-	if req.HTTPMethod != "POST" {
-		return awsevents.APIGatewayProxyResponse{
+	if req.RequestContext.HTTP.Method != "POST" {
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 405,
 			Body:       "method not allowed",
 		}, nil
 	}
 
-	eventType := req.Headers["X-GitHub-Event"]
-	if eventType == "" {
-		eventType = req.Headers["x-github-event"]
-	}
-
-	signature := req.Headers["X-Hub-Signature-256"]
-	if signature == "" {
-		signature = req.Headers["x-hub-signature-256"]
-	}
+	eventType := req.Headers["x-github-event"]
+	signature := req.Headers["x-hub-signature-256"]
 
 	if err := github.ValidateWebhookSignature(
 		[]byte(req.Body),
 		signature,
 		appInst.Config.GitHubWebhookSecret,
 	); err != nil {
 		logger.Warn("webhook signature validation failed", slog.String("error", err.Error()))
-		return awsevents.APIGatewayProxyResponse{
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 401,
 			Body:       "unauthorized",
 		}, nil
@@ -107,23 +100,23 @@ func APIGatewayHandler(ctx context.Context, req awsevents.APIGatewayProxyRequest
 		logger.Error("webhook processing failed",
 			slog.String("event_type", eventType),
 			slog.String("error", err.Error()))
-		return awsevents.APIGatewayProxyResponse{
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 500,
 			Body:       "webhook processing failed",
 		}, nil
 	}
 
-	return awsevents.APIGatewayProxyResponse{
+	return awsevents.APIGatewayV2HTTPResponse{
 		StatusCode: 200,
 		Body:       "ok",
 	}, nil
 }
 
 // handleServerStatus returns the application status and feature flags.
 // responds with JSON containing configuration state and enabled features.
-func handleServerStatus(ctx context.Context, req awsevents.APIGatewayProxyRequest) (awsevents.APIGatewayProxyResponse, error) {
-	if req.HTTPMethod != "GET" {
-		return awsevents.APIGatewayProxyResponse{
+func handleServerStatus(ctx context.Context, req awsevents.APIGatewayV2HTTPRequest) (awsevents.APIGatewayV2HTTPResponse, error) {
+	if req.RequestContext.HTTP.Method != "GET" {
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 405,
 			Body:       "method not allowed",
 		}, nil
@@ -133,13 +126,13 @@ func handleServerStatus(ctx context.Context, req awsevents.APIGatewayProxyReques
 	body, err := json.Marshal(status)
 	if err != nil {
 		logger.Error("failed to marshal status response", slog.String("error", err.Error()))
-		return awsevents.APIGatewayProxyResponse{
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 500,
 			Body:       "failed to generate status response",
 		}, nil
 	}
 
-	return awsevents.APIGatewayProxyResponse{
+	return awsevents.APIGatewayV2HTTPResponse{
 		StatusCode: 200,
 		Headers:    map[string]string{"Content-Type": "application/json"},
 		Body:       string(body),
@@ -148,9 +141,9 @@ func handleServerStatus(ctx context.Context, req awsevents.APIGatewayProxyReques
 
 // handleServerConfig returns the application configuration with secrets
 // redacted. useful for debugging and verifying environment settings.
-func handleServerConfig(ctx context.Context, req awsevents.APIGatewayProxyRequest) (awsevents.APIGatewayProxyResponse, error) {
-	if req.HTTPMethod != "GET" {
-		return awsevents.APIGatewayProxyResponse{
+func handleServerConfig(ctx context.Context, req awsevents.APIGatewayV2HTTPRequest) (awsevents.APIGatewayV2HTTPResponse, error) {
+	if req.RequestContext.HTTP.Method != "GET" {
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 405,
 			Body:       "method not allowed",
 		}, nil
@@ -160,13 +153,13 @@ func handleServerConfig(ctx context.Context, req awsevents.APIGatewayProxyReques
 	body, err := json.Marshal(redacted)
 	if err != nil {
 		logger.Error("failed to marshal config response", slog.String("error", err.Error()))
-		return awsevents.APIGatewayProxyResponse{
+		return awsevents.APIGatewayV2HTTPResponse{
 			StatusCode: 500,
 			Body:       "failed to generate config response",
 		}, nil
 	}
 
-	return awsevents.APIGatewayProxyResponse{
+	return awsevents.APIGatewayV2HTTPResponse{
 		StatusCode: 200,
 		Headers:    map[string]string{"Content-Type": "application/json"},
 		Body:       string(body),
@@ -196,17 +189,19 @@ func EventBridgeHandler(ctx context.Context, evt awsevents.CloudWatchEvent) erro
 }
 
 // UniversalHandler detects the event type and routes to the appropriate
-// handler. supports both API Gateway and EventBridge events.
+// handler. supports API Gateway HTTP API (v2.0) and EventBridge events.
 func UniversalHandler(ctx context.Context, event json.RawMessage) (any, error) {
 	if initErr != nil {
 		return nil, initErr
 	}
 
-	var apiGatewayReq awsevents.APIGatewayProxyRequest
-	if err := json.Unmarshal(event, &apiGatewayReq); err == nil && apiGatewayReq.RequestContext.RequestID != "" {
+	// try API Gateway HTTP API (v2.0)
+	var apiGatewayReq awsevents.APIGatewayV2HTTPRequest
+	if err := json.Unmarshal(event, &apiGatewayReq); err == nil && apiGatewayReq.RequestContext.HTTP.Method != "" {
 		return APIGatewayHandler(ctx, apiGatewayReq)
 	}
 
+	// try EventBridge
 	var eventBridgeEvent awsevents.CloudWatchEvent
 	if err := json.Unmarshal(event, &eventBridgeEvent); err == nil && eventBridgeEvent.DetailType != "" {
 		return nil, EventBridgeHandler(ctx, eventBridgeEvent)