Remove BreezeLambdaAPIHandler

Author: Andrea Scuderi

Sources/BreezeDynamoDBService/BreezeDynamoDBConfig.swift

@@ -27,8 +27,8 @@ public struct BreezeDynamoDBConfig: Sendable {
         self.endpoint = endpoint
     }
 
-    let region: Region
-    let tableName: String
-    let keyName: String
-    let endpoint: String?
+    public let region: Region
+    public let tableName: String
+    public let keyName: String
+    public let endpoint: String?
 }

Sources/BreezeLambdaAPI/BreezeLambdaAPIHandler.swift

@@ -58,6 +58,15 @@ public actor BreezeLambdaAPIService<T: BreezeCodable>: Service {
         return nil
     }
 
+    static func operation() throws -> BreezeOperation {
+        guard let handler = Lambda.env("_HANDLER"),
+              let operation = BreezeOperation(handler: handler)
+        else {
+            throw BreezeLambdaAPIError.invalidHandler
+        }
+        return operation
+    }
+    
     public init(dbTimeout: Int64 = 30) throws {
         do {
             self.timeout = .seconds(dbTimeout)
@@ -78,6 +87,7 @@ public actor BreezeLambdaAPIService<T: BreezeCodable>: Service {
             self.dynamoDBService = BreezeDynamoDBService(config: config, serviceConfig: serviceConfig)
             self.breezeLambdaService = BreezeLambdaService<T>(
                 dynamoDBService: dynamoDBService,
+                operation: try Self.operation(),
                 logger: logger
             )
             self.serviceGroup = ServiceGroup(

Sources/BreezeLambdaAPI/BreezeLambdaAPIService.swift

@@ -17,18 +17,18 @@ import AWSLambdaRuntime
 import BreezeDynamoDBService
 import Logging
 
-struct BreezeLambdaHandler<T: BreezeCodable> {
+struct BreezeLambdaHandler<T: BreezeCodable>: LambdaHandler, Sendable {
     typealias Event = APIGatewayV2Request
     typealias Output = APIGatewayV2Response
 
-    let service: BreezeDynamoDBManaging
+    let dbManager: BreezeDynamoDBManaging
     let operation: BreezeOperation
 
     var keyName: String {
-        self.service.keyName
+        self.dbManager.keyName
     }
-
-    func handle(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
+    
+    public func handle(_ event: APIGatewayV2Request, context: LambdaContext) async throws -> APIGatewayV2Response {
         switch self.operation {
         case .create:
             return await self.createLambdaHandler(context: context, event: event)
@@ -49,7 +49,7 @@ struct BreezeLambdaHandler<T: BreezeCodable> {
             return APIGatewayV2Response(with: error, statusCode: .forbidden)
         }
         do {
-            let result: T = try await service.createItem(item: item)
+            let result: T = try await dbManager.createItem(item: item)
             return APIGatewayV2Response(with: result, statusCode: .created)
         } catch {
             return APIGatewayV2Response(with: error, statusCode: .forbidden)
@@ -62,7 +62,7 @@ struct BreezeLambdaHandler<T: BreezeCodable> {
             return APIGatewayV2Response(with: error, statusCode: .forbidden)
         }
         do {
-            let result: T = try await service.readItem(key: key)
+            let result: T = try await dbManager.readItem(key: key)
             return APIGatewayV2Response(with: result, statusCode: .ok)
         } catch {
             return APIGatewayV2Response(with: error, statusCode: .notFound)
@@ -75,7 +75,7 @@ struct BreezeLambdaHandler<T: BreezeCodable> {
             return APIGatewayV2Response(with: error, statusCode: .forbidden)
         }
         do {
-            let result: T = try await service.updateItem(item: item)
+            let result: T = try await dbManager.updateItem(item: item)
             return APIGatewayV2Response(with: result, statusCode: .ok)
         } catch {
             return APIGatewayV2Response(with: error, statusCode: .notFound)
@@ -97,7 +97,7 @@ struct BreezeLambdaHandler<T: BreezeCodable> {
         }
         do {
             let simpleItem = SimpleItem(key: key, createdAt: createdAt, updatedAt: updatedAt)
-            try await self.service.deleteItem(item: simpleItem)
+            try await self.dbManager.deleteItem(item: simpleItem)
             return APIGatewayV2Response(with: BreezeEmptyResponse(), statusCode: .ok)
         } catch {
             return APIGatewayV2Response(with: error, statusCode: .notFound)
@@ -108,7 +108,7 @@ struct BreezeLambdaHandler<T: BreezeCodable> {
         do {
             let key = event.queryStringParameters?["exclusiveStartKey"]
             let limit: Int? = event.queryStringParameter("limit")
-            let result: ListResponse<T> = try await service.listItems(key: key, limit: limit)
+            let result: ListResponse<T> = try await dbManager.listItems(key: key, limit: limit)
             return APIGatewayV2Response(with: result, statusCode: .ok)
         } catch {
             return APIGatewayV2Response(with: error, statusCode: .forbidden)

Sources/BreezeLambdaAPI/BreezeLambdaHandler.swift

@@ -23,14 +23,16 @@ import Logging
 actor BreezeLambdaService<T: BreezeCodable>: Service {
 
     let dynamoDBService: BreezeDynamoDBServing
+    let operation: BreezeOperation
     let logger: Logger
 
-    init(dynamoDBService: BreezeDynamoDBServing, logger: Logger) {
+    init(dynamoDBService: BreezeDynamoDBServing, operation: BreezeOperation, logger: Logger) {
         self.dynamoDBService = dynamoDBService
+        self.operation = operation
         self.logger = logger
     }
 
-    var breezeApi: BreezeLambdaAPIHandler<T>?
+    var breezeApi: BreezeLambdaHandler<T>?
 
     func handler(event: APIGatewayV2Request, context: LambdaContext) async throws -> APIGatewayV2Response {
         guard let breezeApi else { throw BreezeLambdaAPIError.invalidHandler }
@@ -40,7 +42,10 @@ actor BreezeLambdaService<T: BreezeCodable>: Service {
     func run() async throws {
         do {
             logger.info("Initializing BreezeLambdaAPIHandler...")
-            let breezeApi = try await BreezeLambdaAPIHandler<T>(service: dynamoDBService)
+            guard let dbManager = await dynamoDBService.dbManager else {
+                throw BreezeLambdaAPIError.invalidService
+            }
+            let breezeApi = BreezeLambdaHandler<T>(dbManager: dbManager, operation: operation)
             self.breezeApi = breezeApi
             logger.info("Starting BreezeLambdaAPIHandler...")
             let runtime = LambdaRuntime(body: handler)

Sources/BreezeLambdaAPI/BreezeLambdaService.swift

@@ -16,7 +16,7 @@ import BreezeDynamoDBService
 @testable import BreezeLambdaAPI
 import SotoDynamoDB
 
-actor BreezeDynamoDBServiceMock: BreezeDynamoDBManaging {
+actor BreezeDynamoDBManagerMock: BreezeDynamoDBManaging {
     let keyName: String
 
     private var response: (any BreezeCodable)?