Update for swift-aws-lambda-events v0.3.0

hummingbird-project · May 24, 2024 · 7b1bf61 · 7b1bf61
1 parent c1baaf1
commit 7b1bf61
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         .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", from: "0.1.0"),
+        .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "0.3.0"),
         .package(url: "https://github.com/swift-extras/swift-extras-base64.git", from: "1.0.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.1"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),

diff --git a/Sources/HummingbirdLambda/APIGatewayV2Lambda.swift b/Sources/HummingbirdLambda/APIGatewayV2Lambda.swift
@@ -62,7 +62,7 @@ extension APIGatewayV2Request: APIRequest {
         return context.http.path
     }
 
-    var httpMethod: AWSLambdaEvents.HTTPMethod { context.http.method }
+    var httpMethod: HTTPRequest.Method { context.http.method }
     var queryString: String { self.rawQueryString }
     var httpHeaders: [(name: String, value: String)] {
         self.headers.flatMap { header in
@@ -77,7 +77,7 @@ extension APIGatewayV2Request: APIRequest {
 // conform `APIGatewayV2Response` to `APIResponse` so we can use Response.apiReponse()
 extension APIGatewayV2Response: APIResponse {
     package init(
-        statusCode: AWSLambdaEvents.HTTPResponseStatus,
+        statusCode: HTTPResponse.Status,
         headers: AWSLambdaEvents.HTTPHeaders?,
         multiValueHeaders: HTTPMultiValueHeaders?,
         body: String?,

diff --git a/Sources/HummingbirdLambda/Request+APIGateway.swift b/Sources/HummingbirdLambda/Request+APIGateway.swift
@@ -22,7 +22,7 @@ import NIOCore
 
 protocol APIRequest {
     var path: String { get }
-    var httpMethod: AWSLambdaEvents.HTTPMethod { get }
+    var httpMethod: HTTPRequest.Method { get }
     var queryString: String { get }
     var httpHeaders: [(name: String, value: String)] { get }
     var body: String? { get }
@@ -36,10 +36,6 @@ extension Request {
             return string.addingPercentEncoding(withAllowedCharacters: .urlQueryComponentAllowed) ?? string
         }
 
-        guard let method = HTTPRequest.Method(from.httpMethod.rawValue) else {
-            throw HTTPError(.badRequest)
-        }
-
         // construct URI with query parameters
         var uri = from.path
         if from.queryString.count > 0 {
@@ -64,7 +60,7 @@ extension Request {
 
         self.init(
             head: .init(
-                method: method,
+                method: from.httpMethod,
                 scheme: "https",
                 authority: authority,
                 path: uri,

diff --git a/Sources/HummingbirdLambda/Response+APIGateway.swift b/Sources/HummingbirdLambda/Response+APIGateway.swift
@@ -20,7 +20,7 @@ import NIOHTTP1
 
 package protocol APIResponse {
     init(
-        statusCode: AWSLambdaEvents.HTTPResponseStatus,
+        statusCode: HTTPResponse.Status,
         headers: AWSLambdaEvents.HTTPHeaders?,
         multiValueHeaders: HTTPMultiValueHeaders?,
         body: String?,
@@ -72,7 +72,7 @@ extension Response {
         }
 
         return .init(
-            statusCode: AWSLambdaEvents.HTTPResponseStatus(code: UInt(self.status.code)),
+            statusCode: self.status,
             headers: singleHeaders,
             multiValueHeaders: multiHeaders,
             body: body,

diff --git a/Tests/HummingbirdLambdaTests/LambdaTests.swift b/Tests/HummingbirdLambdaTests/LambdaTests.swift
@@ -150,9 +150,10 @@ final class LambdaTests: XCTestCase {
         }
         try await HelloLambda.test { client in
             try await client.execute(uri: "/", method: .post) { response in
+                let expectedBody = "{\"error\":{\"message\":\"\(HelloLambda.body)\"}}\n"
                 XCTAssertEqual(response.statusCode, .badRequest)
-                XCTAssertEqual(response.body, HelloLambda.body)
-                XCTAssertEqual(response.headers?["Content-Length"], HelloLambda.body.utf8.count.description)
+                XCTAssertEqual(response.body, expectedBody)
+                XCTAssertEqual(response.headers?["Content-Length"], expectedBody.utf8.count.description)
             }
         }
     }