Improve formatting and remove unused import

Author: Andrea-Scuderi

Examples/LambdaFunctions/Sources/ProductAPI/APIGateway+Extensions.swift

@@ -12,34 +12,37 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import AWSLambdaEvents
+import Foundation
 
-public extension APIGateway.V2.Request {
-    func object<T: Codable>() throws -> T {
+extension APIGateway.V2.Request {
+    public func object<T: Codable>() throws -> T {
         let decoder = JSONDecoder()
         guard let body = self.body,
-            let dataBody = body.data(using: .utf8) else {
+            let dataBody = body.data(using: .utf8)
+            else {
                 throw APIError.invalidRequest
         }
         return try decoder.decode(T.self, from: dataBody)
     }
 }
 
-let defaultHeaders = ["Content-Type": "application/json",
-                      "Access-Control-Allow-Origin": "*",
-                      "Access-Control-Allow-Methods": "OPTIONS,GET,POST,PUT,DELETE",
-                      "Access-Control-Allow-Credentials": "true"]
-
 extension APIGateway.V2.Response {
 
+    static let defaultHeaders = [
+        "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "OPTIONS,GET,POST,PUT,DELETE",
+        "Access-Control-Allow-Credentials": "true",
+    ]
+    
     init(with error: Error, statusCode: AWSLambdaEvents.HTTPResponseStatus) {
 
         self.init(
             statusCode: statusCode,
-            headers: defaultHeaders,
+            headers: APIGateway.V2.Response.defaultHeaders,
             multiValueHeaders: nil,
-            body: "{\"message\":\"\(error.localizedDescription)\"}",
+            body: "{\"message\":\"\(String(describing: error))\"}",
             isBase64Encoded: false
         )
     }
@@ -53,7 +56,7 @@ extension APIGateway.V2.Response {
         }
         self.init(
             statusCode: statusCode,
-            headers: defaultHeaders,
+            headers: APIGateway.V2.Response.defaultHeaders,
             multiValueHeaders: nil,
             body: body,
             isBase64Encoded: false
@@ -62,7 +65,6 @@ extension APIGateway.V2.Response {
     }
 
     init<Out: Encodable>(with result: Result<Out, Error>, statusCode: AWSLambdaEvents.HTTPResponseStatus) {
-        
         switch result {
         case .success(let value):
             self.init(with: value, statusCode: statusCode)

Examples/LambdaFunctions/Sources/ProductAPI/Product+DynamoDB.swift

@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import AWSDynamoDB
 
 public struct ProductField {
@@ -23,25 +22,28 @@ public struct ProductField {
     static let updatedAt = "updatedAt"
 }
 
-public extension Product {
-    var dynamoDictionary: [String : DynamoDB.AttributeValue] {
-        var dictionary = [ProductField.sku: DynamoDB.AttributeValue(s:sku),
-                          ProductField.name: DynamoDB.AttributeValue(s:name),
-                          ProductField.description: DynamoDB.AttributeValue(s:description)]
+extension Product {
+    public var dynamoDictionary: [String: DynamoDB.AttributeValue] {
+        var dictionary = [
+            ProductField.sku: DynamoDB.AttributeValue(s: sku),
+            ProductField.name: DynamoDB.AttributeValue(s: name),
+            ProductField.description: DynamoDB.AttributeValue(s: description),
+        ]
         if let createdAt = createdAt {
-            dictionary[ProductField.createdAt] = DynamoDB.AttributeValue(s:createdAt)
+            dictionary[ProductField.createdAt] = DynamoDB.AttributeValue(s: createdAt)
         }
 
         if let updatedAt = updatedAt {
-            dictionary[ProductField.updatedAt] = DynamoDB.AttributeValue(s:updatedAt)
+            dictionary[ProductField.updatedAt] = DynamoDB.AttributeValue(s: updatedAt)
         }
         return dictionary
     }
 
-    init(dictionary: [String: DynamoDB.AttributeValue]) throws {
+    public init(dictionary: [String: DynamoDB.AttributeValue]) throws {
         guard let name = dictionary[ProductField.name]?.s,
             let sku = dictionary[ProductField.sku]?.s,
-            let description = dictionary[ProductField.description]?.s else {
+            let description = dictionary[ProductField.description]?.s
+            else {
                 throw APIError.invalidItem
         }
         self.name = name

Examples/LambdaFunctions/Sources/ProductAPI/Product.swift

@@ -12,13 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
-
 public struct Product: Codable {
     public let sku: String
     public let name: String
     public let description: String
     public var createdAt: String?
     public var updatedAt: String?
 }
-

Examples/LambdaFunctions/Sources/ProductAPI/ProductLambda.swift

@@ -12,16 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
-#if canImport(FoundationNetworking)
-import FoundationNetworking
-#endif
-import AWSLambdaRuntime
 import AWSDynamoDB
-import NIO
-import Logging
-import AsyncHTTPClient
 import AWSLambdaEvents
+import AWSLambdaRuntime
+import AsyncHTTPClient
+import Logging
+import NIO
 
 enum Operation: String {
     case create
@@ -42,19 +38,19 @@ struct ProductLambda: LambdaHandler {
     typealias In = APIGateway.V2.Request
     typealias Out = APIGateway.V2.Response
 
-    let dbTimeout:Int64 = 30
+    let dbTimeout: Int64 = 30
 
     let region: Region
     let db: AWSDynamoDB.DynamoDB
     let service: ProductService
     let tableName: String
     let operation: Operation
-
+    
     var httpClient: HTTPClient
 
     static func currentRegion() -> Region {
 
-        if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"] {
+        if let awsRegion = Lambda.env("AWS_REGION") {
             let value = Region(rawValue: awsRegion)
             return value
 
@@ -78,7 +74,7 @@ struct ProductLambda: LambdaHandler {
 
         self.region = Self.currentRegion()
         logger.info("\(Self.currentRegion())")
-
+        
         let lambdaRuntimeTimeout: TimeAmount = .seconds(dbTimeout)
         let timeout = HTTPClient.Configuration.Timeout(
             connect: lambdaRuntimeTimeout,
@@ -102,9 +98,14 @@ struct ProductLambda: LambdaHandler {
         )
         logger.info("ProductService")
     }
-
-    func handle(context: Lambda.Context, event: APIGateway.V2.Request, callback: @escaping (Result<APIGateway.V2.Response, Error>) -> Void) {
-        let _ = ProductLambdaHandler(service: service, operation: operation).handle(context: context, event: event)
+    
+    func handle(
+        context: Lambda.Context, event: APIGateway.V2.Request,
+        callback: @escaping (Result<APIGateway.V2.Response, Error>) -> Void
+    ) {
+        let _ = ProductLambdaHandler(service: service, operation: operation).handle(
+            context: context, event: event
+        )
             .always { (result) in
                 callback(result)
         }