Update test with configuration injection

Author: Andrea Scuderi

Sources/BreezeDemoApplication/BreezeDemoApplication.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -15,17 +15,43 @@
 import BreezeLambdaAPI
 import BreezeDynamoDBService
 
-struct Message: BreezeCodable {
-    var key: String
-    let message: String
-    var createdAt: String?
-    var updatedAt: String?
+struct Item: Codable {
+    public var key: String
+    public let name: String
+    public let description: String
+    public var createdAt: String?
+    public var updatedAt: String?
+    
+    enum CodingKeys: String, CodingKey {
+        case key = "itemKey"
+        case name
+        case description
+        case createdAt
+        case updatedAt
+    }
+}
+
+extension Item: BreezeCodable { }
+
+struct APIConfiguration: APIConfiguring {
+    let dbTimeout: Int64 = 30
+    func operation() throws -> BreezeOperation {
+        .list
+    }
+    
+    func getConfig() throws -> BreezeDynamoDBConfig {
+        BreezeDynamoDBConfig(region: .useast1, tableName: "Breeze", keyName: "itemKey", endpoint: "http://127.0.0.1:4566")
+    }
 }
 
 @main
 struct BreezeDemoApplication {
     static func main() async throws {
-        let lambdaAPIService = try BreezeLambdaAPIService<Message>(dbTimeout: 30)
-        try await lambdaAPIService.run()
+        do {
+            let lambdaAPIService = try BreezeLambdaAPI<Item>(apiConfig: APIConfiguration())
+            try await lambdaAPIService.run()
+        } catch {
+            print(error.localizedDescription)
+        }
     }
 }

Sources/BreezeDynamoDBService/BreezeCodable.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeDynamoDBService/BreezeDynamoDBConfig.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeDynamoDBService/BreezeDynamoDBManager.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeDynamoDBService/BreezeDynamoDBManaging.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeDynamoDBService/BreezeDynamoDBService.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -18,16 +18,37 @@ import BreezeHTTPClientService
 import Logging
 
 public protocol BreezeDynamoDBServing: Actor, Service {
-    var dbManager: BreezeDynamoDBManaging? { get }
+    func dbManager() async -> BreezeDynamoDBManaging
 }
 
 public actor BreezeDynamoDBService: BreezeDynamoDBServing {
-
-    public var dbManager: BreezeDynamoDBManaging?
+    
+    private var _dbManager: BreezeDynamoDBManaging?
     private let config: BreezeDynamoDBConfig
     private let serviceConfig: BreezeClientServiceConfig
     private let DBManagingType: BreezeDynamoDBManaging.Type
 
+    public func dbManager() async -> BreezeDynamoDBManaging {
+        if let _dbManager {
+            return _dbManager
+        }
+        let httpClient = await serviceConfig.httpClientService.httpClient
+        let awsClient = AWSClient(httpClient: httpClient)
+        self.awsClient = awsClient
+        let db = SotoDynamoDB.DynamoDB(
+            client: awsClient,
+            region: config.region,
+            endpoint: config.endpoint
+        )
+        let dbManager = DBManagingType.init(
+            db: db,
+            tableName: config.tableName,
+            keyName: config.keyName
+        )
+        _dbManager = dbManager
+        return dbManager
+    }
+    
     public init(
         config: BreezeDynamoDBConfig,
         serviceConfig: BreezeClientServiceConfig,
@@ -46,29 +67,15 @@ public actor BreezeDynamoDBService: BreezeDynamoDBServing {
 
     public func run() async throws {
         logger.info("Starting DynamoDBService...")
-        let httpClient = await serviceConfig.httpClientService.httpClient
-        let awsClient = AWSClient(httpClient: httpClient)
-        self.awsClient = awsClient
-        let db = SotoDynamoDB.DynamoDB(
-            client: awsClient,
-            region: config.region,
-            endpoint: config.endpoint
-        )
-        self.dbManager = DBManagingType.init(
-            db: db,
-            tableName: config.tableName,
-            keyName: config.keyName
-        )
-        
         logger.info("DynamoDBService is running with config...")
         logger.info("region: \(config.region)")
         logger.info("tableName: \(config.tableName)")
         logger.info("keyName: \(config.keyName)")
 
         try await gracefulShutdown()
 
-        logger.info("Shutting down DynamoDBService...")
-        try await awsClient.shutdown()
+        logger.info("Stopping DynamoDBService...")
+        try await awsClient?.shutdown()
         self.awsClient = nil
         logger.info("DynamoDBService is stopped.")
     }

Sources/BreezeDynamoDBService/Foundation+Extension.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeDynamoDBService/ListResponse.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeHTTPClientService/BreezeClientServiceConfig.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.

Sources/BreezeHTTPClientService/BreezeHTTPClientService.swift

@@ -1,4 +1,4 @@
-//    Copyright 2023 (c) Andrea Scuderi - https://github.com/swift-serverless
+//    Copyright 2024 (c) Andrea Scuderi - https://github.com/swift-serverless
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public actor BreezeHTTPClientService: BreezeHTTPClientServing {
         logger.info("HTTPClientService started...")
         try await gracefulShutdown()
 
-        logger.info("Shutting down HTTPClientService...")
+        logger.info("Stopping HTTPClientService...")
         try await httpClient.shutdown()
         logger.info("HTTPClientService shutdown completed.")
     }