Update APIGateway example to use AWSLambdaEvents (#76)

motivation: example of how to use the API Gateway model

changes: Update APIGateway example to use AWSLambdaEvents

Author: fabianfett

Examples/LambdaFunctions/APIGateway-template.yml

@@ -13,21 +13,18 @@ Resources:
 # Add an API Gateway event source for the Lambda
       Events:
         HttpGet:
-          Type: Api
+          Type: HttpApi
           Properties:
-            RestApiId: !Ref lambdaApiGateway
+            ApiId: !Ref lambdaApiGateway
             Path: '/samples/apig'
-            Method: get
+            Method: GET
 # Instructs new versions to be published to an alias named "live".
       AutoPublishAlias: live
 
   lambdaApiGateway:
-    Type: AWS::Serverless::Api
-    Properties:
-      Name: Lambda API Gateway
-      StageName: Beta
+    Type: AWS::Serverless::HttpApi
 
 Outputs:
   LambdaApiGatewayEndpoint:
     Description: 'API Gateway endpoint URL.'
-    Value: !Sub 'https://${lambdaApiGateway}.execute-api.${AWS::Region}.amazonaws.com/Beta/samples/apig'
+    Value: !Sub 'https://${lambdaApiGateway}.execute-api.${AWS::Region}.amazonaws.com/samples/apig'

Examples/LambdaFunctions/Package.swift

@@ -30,13 +30,14 @@ let package = Package(
             .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
         ]),
         .target(name: "Benchmark", dependencies: [
-            .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+            .product(name: "AWSLambdaRuntimeCore", package: "swift-aws-lambda-runtime"),
         ]),
         .target(name: "ErrorHandling", dependencies: [
             .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
         ]),
         .target(name: "APIGateway", dependencies: [
             .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+            .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-runtime"),
         ]),
         .target(name: "CurrencyExchange", dependencies: [
             .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),

Examples/LambdaFunctions/Sources/APIGateway/main.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import AWSLambdaEvents
 import AWSLambdaRuntime
 import NIO
 
@@ -23,63 +24,11 @@ Lambda.run(APIGatewayProxyLambda())
 
 // FIXME: Use proper Event abstractions once added to AWSLambdaRuntime
 struct APIGatewayProxyLambda: EventLoopLambdaHandler {
-    public typealias In = APIGatewayRequest
-    public typealias Out = APIGatewayResponse
+    public typealias In = APIGateway.V2.Request
+    public typealias Out = APIGateway.V2.Response
 
-    public func handle(context: Lambda.Context, payload: APIGatewayRequest) -> EventLoopFuture<APIGatewayResponse> {
+    public func handle(context: Lambda.Context, payload: APIGateway.V2.Request) -> EventLoopFuture<APIGateway.V2.Response> {
         context.logger.debug("hello, api gateway!")
-        return context.eventLoop.makeSucceededFuture(APIGatewayResponse(statusCode: 200,
-                                                                        headers: nil,
-                                                                        multiValueHeaders: nil,
-                                                                        body: "hello, world!",
-                                                                        isBase64Encoded: false))
+        return context.eventLoop.makeSucceededFuture(APIGateway.V2.Response(statusCode: .ok, body: "hello, world!"))
     }
 }
-
-struct APIGatewayRequest: Codable {
-    let resource: String
-    let path: String
-    let httpMethod: String?
-    let headers: [String: String]?
-    let multiValueHeaders: [String: [String]]?
-    let queryStringParameters: [String: String]?
-    let multiValueQueryStringParameters: [String: [String]]?
-    let pathParameters: [String: String]?
-    let stageVariables: [String: String]?
-    let requestContext: Context?
-    let body: String?
-    let isBase64Encoded: Bool?
-
-    struct Context: Codable {
-        let accountId: String?
-        let resourceId: String?
-        let stage: String?
-        let requestId: String?
-        let identity: Identity?
-        let resourcePath: String?
-        let httpMethod: String?
-        let apiId: String
-    }
-
-    struct Identity: Codable {
-        let cognitoIdentityPoolId: String?
-        let accountId: String?
-        let cognitoIdentityId: String?
-        let caller: String?
-        let apiKey: String?
-        let sourceIp: String?
-        let cognitoAuthenticationType: String?
-        let cognitoAuthenticationProvider: String?
-        let userArn: String?
-        let userAgent: String?
-        let user: String?
-    }
-}
-
-struct APIGatewayResponse: Codable {
-    let statusCode: Int
-    let headers: [String: String]?
-    let multiValueHeaders: [String: [String]]?
-    let body: String?
-    let isBase64Encoded: Bool?
-}

Examples/LambdaFunctions/Sources/Benchmark/main.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import AWSLambdaRuntime
+import AWSLambdaRuntimeCore
 import NIO
 
 // If you would like to benchmark Swift's Lambda Runtime,

Examples/LambdaFunctions/scripts/build-and-package.sh

@@ -20,10 +20,10 @@ executable=$1
 echo "-------------------------------------------------------------------------"
 echo "building \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v `pwd`:/workspace -w /workspace builder bash -cl "swift build --product $executable -c release -Xswiftc -g"
+docker run --rm -v "$(pwd)/../..":/workspace -w /workspace/Examples/LambdaFunctions builder bash -cl "swift build --product $executable -c release -Xswiftc -g"
 echo "done"
 
 echo "-------------------------------------------------------------------------"
 echo "packaging \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v `pwd`:/workspace -w /workspace builder bash -cl "./scripts/package.sh $executable"
+docker run --rm -v "$(pwd)/../..":/workspace -w /workspace/Examples/LambdaFunctions builder bash -cl "./scripts/package.sh $executable"