Update swift-aws-lambda-runtime.git to 1.0.0-alpha.1

Author: Andrea-Scuderi

Products/Package.resolved

@@ -17,7 +17,8 @@ let package = Package(
  ),
  ],
  dependencies: [
- .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "0.5.0"),
+ .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.1"),
+ .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", branch: "main"),
  .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
  .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
  ],
@@ -35,7 +36,7 @@ let package = Package(
  name: "Products",
  dependencies: [
  .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
- .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-runtime"),
+ .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-events"),
  "ProductService"
  ]
  ),

Products/Package.swift

@@ -61,8 +61,6 @@ public class ProductService {
  }
 }
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-
 public extension ProductService {
 
  func createItem(product: Product) async throws -> Product {
@@ -131,80 +129,3 @@ public extension ProductService {
  return data.items ?? []
  }
 }
-
-#else
-
-public extension ProductService {
- 
- func createItem(product: Product) -> EventLoopFuture<Product> {
- 
- var product = product
- let date = Date()
- product.createdAt = date.iso8601
- product.updatedAt = date.iso8601
- let input = DynamoDB.PutItemCodableInput(item: product, tableName: tableName)
- 
- return db.putItem(input).flatMap { _ -> EventLoopFuture<Product> in
- return self.readItem(key: product.sku)
- }
- }
- 
- func readItem(key: String) -> EventLoopFuture<Product> {
- let input = DynamoDB.GetItemInput(
- key: [Product.Field.sku: DynamoDB.AttributeValue.s(key)],
- tableName: tableName
- )
- return db.getItem(input, type: Product.self).flatMapThrowing { data -> Product in
- guard let product = data.item else {
- throw ProductError.notFound
- }
- return product
- }
- }
- 
- func updateItem(product: Product) -> EventLoopFuture<Product> {
- var product = product
- let date = Date()
- let updatedAt = date.iso8601
- product.updatedAt = date.iso8601
- 
- let input = DynamoDB.UpdateItemInput(
- conditionExpression: "attribute_exists(#createdAt)",
- expressionAttributeNames: [
- "#name": Product.Field.name,
- "#description": Product.Field.description,
- "#updatedAt": Product.Field.updatedAt,
- "#createdAt": Product.Field.createdAt
- ],
- expressionAttributeValues: [
- ":name": DynamoDB.AttributeValue.s(product.name),
- ":description": DynamoDB.AttributeValue.s(product.description),
- ":updatedAt": DynamoDB.AttributeValue.s(updatedAt)
- ],
- key: [Product.Field.sku: DynamoDB.AttributeValue.s(product.sku)],
- returnValues: DynamoDB.ReturnValue.allNew,
- tableName: tableName,
- updateExpression: "SET #name = :name, #description = :description, #updatedAt = :updatedAt"
- )
- return db.updateItem(input).flatMap { _ -> EventLoopFuture<Product> in
- return self.readItem(key: product.sku)
- }
- }
- 
- func deleteItem(key: String) -> EventLoopFuture<Void> {
- let input = DynamoDB.DeleteItemInput(
- key: [Product.Field.sku: DynamoDB.AttributeValue.s(key)],
- tableName: tableName
- )
- return db.deleteItem(input).map { _ in Void() }
- }
- 
- func listItems() -> EventLoopFuture<[Product]> {
- let input = DynamoDB.ScanInput(tableName: tableName)
- return db.scan(input, type: Product.self).flatMapThrowing { data -> [Product] in
- return data.items ?? []
- }
- }
-}
-
-#endif

Products/Sources/ProductService/ProductService.swift

@@ -23,7 +23,7 @@ public enum APIError: Error {
  case invalidHandler
 }
 
-extension APIGateway.V2.Request {
+extension APIGatewayV2Request {
 
  static private let decoder = JSONDecoder()
 
@@ -37,7 +37,7 @@ extension APIGateway.V2.Request {
  }
 }
 
-extension APIGateway.V2.Response {
+extension APIGatewayV2Response {
 
  private static let encoder = JSONEncoder()
 
@@ -48,24 +48,24 @@ extension APIGateway.V2.Response {
  "Access-Control-Allow-Methods": "OPTIONS,GET,POST,PUT,DELETE",
  "Access-Control-Allow-Credentials": "true",
  ]
- 
+  
  public init(with error: Error, statusCode: AWSLambdaEvents.HTTPResponseStatus) {
  self.init(
  statusCode: statusCode,
- headers: APIGateway.V2.Response.defaultHeaders,
+ headers: APIGatewayV2Response.defaultHeaders,
  body: "{\"message\":\"\(String(describing: error))\"}",
  isBase64Encoded: false
  )
  }
 
- public init<Out: Encodable>(with object: Out, statusCode: AWSLambdaEvents.HTTPResponseStatus) {
+ public init<Output: Encodable>(with object: Output, statusCode: AWSLambdaEvents.HTTPResponseStatus) {
  var body: String = "{}"
  if let data = try? Self.encoder.encode(object) {
  body = String(data: data, encoding: .utf8) ?? body
  }
  self.init(
  statusCode: statusCode,
- headers: APIGateway.V2.Response.defaultHeaders,
+ headers: APIGatewayV2Response.defaultHeaders,
  body: body,
  isBase64Encoded: false
  )

Products/Sources/Products/APIGateway+Extensions.swift

@@ -15,6 +15,7 @@
 import SotoDynamoDB
 import AWSLambdaEvents
 import AWSLambdaRuntime
+import AWSLambdaRuntimeCore
 import AsyncHTTPClient
 import Logging
 import NIO
@@ -29,13 +30,10 @@ enum Operation: String {
 }
 
 struct EmptyResponse: Codable {}
-
-#if compiler(>=5.5) && canImport(_Concurrency)
-
-struct AsyncProductLambda: AsyncLambdaHandler {
+struct AsyncProductLambda: LambdaHandler {
 
- typealias In = APIGateway.V2.Request
- typealias Out = APIGateway.V2.Response
+ typealias Event = APIGatewayV2Request
+ typealias Output = APIGatewayV2Response
 
  let dbTimeout: Int64 = 30
  let region: Region
@@ -61,7 +59,7 @@ struct AsyncProductLambda: AsyncLambdaHandler {
  return tableName
  }
 
- init(context: Lambda.InitializationContext) throws {
+ init(context: LambdaInitializationContext) async throws {
 
  guard let handler = Lambda.env("_HANDLER"),
  let operation = Operation(rawValue: handler) else {
@@ -92,9 +90,7 @@ struct AsyncProductLambda: AsyncLambdaHandler {
  )
  }
 
- func handle(event: AWSLambdaEvents.APIGateway.V2.Request, context: AWSLambdaRuntimeCore.Lambda.Context) async throws -> AWSLambdaEvents.APIGateway.V2.Response {
-  return await AsyncProductLambdaHandler(service: service, operation: operation).handle(context: context, event: event)
+ func handle(_ event: AWSLambdaEvents.APIGatewayV2Request, context: AWSLambdaRuntimeCore.LambdaContext) async throws -> AWSLambdaEvents.APIGatewayV2Response {
+ return await AsyncProductLambdaHandler(service: service, operation: operation).handle(context: context, event: event)
  }
 }
-
-#endif

Products/Sources/Products/AsyncProductLambda.swift

@@ -27,17 +27,15 @@ import AWSLambdaRuntime
 import Logging
 import NIO
 
-#if compiler(>=5.5) && canImport(_Concurrency)
-
 struct AsyncProductLambdaHandler {
 
- typealias In = APIGateway.V2.Request
- typealias Out = APIGateway.V2.Response
+ typealias Event = APIGatewayV2Request
+ typealias Output = APIGatewayV2Response
 
  let service: ProductService
  let operation: Operation
 
- func handle(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func handle(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
 
  switch self.operation {
  case .create:
@@ -53,66 +51,64 @@ struct AsyncProductLambdaHandler {
  }
  }
 
- func createLambdaHandler(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func createLambdaHandler(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
  guard let product: Product = try? event.bodyObject() else {
  let error = APIError.invalidRequest
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  do {
  let result = try await service.createItem(product: product)
- return APIGateway.V2.Response(with: result, statusCode: .created)
+ return APIGatewayV2Response(with: result, statusCode: .created)
  } catch {
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  }
 
- func readLambdaHandler(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func readLambdaHandler(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
  guard let sku = event.pathParameters?["sku"] else {
  let error = APIError.invalidRequest
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  do {
  let result = try await service.readItem(key: sku)
- return APIGateway.V2.Response(with: result, statusCode: .ok)
+ return APIGatewayV2Response(with: result, statusCode: .ok)
  } catch {
- return APIGateway.V2.Response(with: error, statusCode: .notFound)
+ return APIGatewayV2Response(with: error, statusCode: .notFound)
  }
  }
 
- func updateLambdaHandler(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func updateLambdaHandler(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
  guard let product: Product = try? event.bodyObject() else {
  let error = APIError.invalidRequest
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  do {
  let result = try await service.updateItem(product: product)
- return APIGateway.V2.Response(with: result, statusCode: .ok)
+ return APIGatewayV2Response(with: result, statusCode: .ok)
  } catch {
- return APIGateway.V2.Response(with: error, statusCode: .notFound)
+ return APIGatewayV2Response(with: error, statusCode: .notFound)
  }
  }
 
- func deleteUpdateLambdaHandler(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func deleteUpdateLambdaHandler(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
  guard let sku = event.pathParameters?["sku"] else {
  let error = APIError.invalidRequest
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  do {
  try await service.deleteItem(key: sku)
- return APIGateway.V2.Response(with: EmptyResponse(), statusCode: .ok)
+ return APIGatewayV2Response(with: EmptyResponse(), statusCode: .ok)
  } catch {
- return APIGateway.V2.Response(with: error, statusCode: .notFound)
+ return APIGatewayV2Response(with: error, statusCode: .notFound)
  }
  }
 
- func listUpdateLambdaHandler(context: Lambda.Context, event: APIGateway.V2.Request) async -> APIGateway.V2.Response {
+ func listUpdateLambdaHandler(context: AWSLambdaRuntimeCore.LambdaContext, event: APIGatewayV2Request) async -> APIGatewayV2Response {
  do {
  let result = try await service.listItems()
- return APIGateway.V2.Response(with: result, statusCode: .ok)
+ return APIGatewayV2Response(with: result, statusCode: .ok)
  } catch {
- return APIGateway.V2.Response(with: error, statusCode: .forbidden)
+ return APIGatewayV2Response(with: error, statusCode: .forbidden)
  }
  }
 }
-
-#endif