preliminary support for HTTPS and async functions

Author: Stormacq, Sebastien

Package.swift

@@ -14,14 +14,14 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.8.0")
-    ],
+        .package(url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.9.0"),
+        .package(url: "https://github.com/IBM-Swift/SwiftyRequest.git", from: "3.1.0")    ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "HelloSwiftLambda",
-            dependencies: ["LambdaRuntime", "HeliumLogger"],
+            dependencies: ["LambdaRuntime", "HeliumLogger", "SwiftyRequest"],
             path: "lambda-function/Sources"
         ),
         .target(

event.json

@@ -10,10 +10,25 @@ import Foundation
 import LambdaRuntime
 import LoggerAPI
 
-func handler(context: Context, event: LambdaEvent) throws -> LambdaResponse {
+import SwiftyRequest
+
+func handler(context: Context, event: LambdaEvent, completion: @escaping LambdaCallback) throws -> Void {
     Log.debug("Starting lambda handler")
 
-    return [ "result": event["key1"] ?? "no key1 provided" ]
+    let request = RestRequest(method: .get, url: "https://httpbin.org/get?value=\(event["key1"] ?? "no key1 provided")")
+    
+    request.responseString { result in
+        switch result {
+        case .success(let response):
+            print("Success")
+            completion([ "result": "\(response.body)" ])
+        case .failure(let error):
+            print("Failure")
+            completion([ "result": "\(error)" ])
+        }
+    }
+    
+    return
 
 }
 
@@ -48,4 +63,4 @@ try LambdaRuntime(handler).run()
 //         return  [ "error": String(resp.statusCode) ]
 //     }
 
-// }
+// }

lambda-function/Sources/handler/main.swift

@@ -15,14 +15,18 @@ public class LambdaRuntime {
 
     private var context : Context
     private let runtimeApi : LambaRuntimeAPI
-    private let handler : LambdaHandler
+    private let handler : AsyncLambdaHandler
 
     private let MAX_RETRIES = 3
     private var retry = 0
-    
+
+//    // support sync handler for ease of programing
+//    public init(_ handler: SyncLambdaHandler) throws {
+//    }
+
     // initialize the runtime and load shared libraries, if any
     // also takes the custom handler that will be the core of the lambda function
-    public init(_ handler: @escaping LambdaHandler) throws {
+    public init(_ handler: @escaping AsyncLambdaHandler) throws {
 
         // initialize logger
         let logger = HeliumLogger(.verbose)
@@ -119,11 +123,23 @@ public class LambdaRuntime {
 
             // 3. call handler
             do {
-                let response = try handler(self.context, event)
-                Log.debug("Handler returned : \(response)")
+                var response: LambdaResponse?
+                let dispatchGroup = DispatchGroup()
+                dispatchGroup.enter()
+                do {
+                    try handler(self.context, event, { (result) in
+                        response = result
+                        Log.debug("Handler returned : \(String(describing: response))")
+                        dispatchGroup.leave()
+                    })
+                } catch {
+                    response = ["error" : "\(error)"]
+                    dispatchGroup.leave()
+                }
+                dispatchGroup.wait()
 
                 // 4. call success or error
-                try runtimeApi.invocationSuccess(awsRequestId: awsRequestId, response: response)
+                try runtimeApi.invocationSuccess(awsRequestId: awsRequestId, response: response!)
             } catch {
                 Log.debug("An error occured in the handler or when signaling the success :  \(error)")
                 runtimeApi.invocationError(awsRequestId: awsRequestId, error: error)

lambda-runtime/Sources/LambdaRuntime/LambdaRuntime.swift

@@ -21,7 +21,9 @@ public typealias LambdaResponse = [String:Any]
 //
 // Lambda handler function
 //
-public typealias LambdaHandler = (Context, LambdaEvent) throws -> LambdaResponse
+public typealias LambdaCallback      = (LambdaResponse) -> Void
+public typealias AsyncLambdaHandler  = (Context, LambdaEvent, @escaping LambdaCallback) throws -> Void
+//public typealias SyncLambdaHandler   = (Context, LambdaEvent) throws -> LambdaResponse
 
 // this is the Context object passed to the handler.
 // constant values are identical accross invocation and are initialized from the container env variables

lambda-runtime/Sources/LambdaRuntime/LambdaStructure.swift

@@ -23,7 +23,8 @@ then
 fi
 
 echo "Building"
-docker run  -it --rm  -v $(pwd):/$PROJECT_DIR --env PROJECT_DIR=/$PROJECT_DIR swift /bin/bash -c "cd $PROJECT_DIR && swift build -c $BUILD_TYPE"
+# TODO - should install zlib in a custom docker image
+docker run  -it --rm  -v $(pwd):/$PROJECT_DIR --env PROJECT_DIR=/$PROJECT_DIR swift /bin/bash -c "apt-get update && apt-get install -y zlib1g-dev && cd $PROJECT_DIR && swift build -c $BUILD_TYPE"
 
 echo "Packaging"
 mkdir $LAMBDA_DIR 2>/dev/null # create the directory, silently fails when it already exists
@@ -36,7 +37,7 @@ zip $LAMBDA_ZIP bootstrap  $EXECUTABLE_NAME
 popd >/dev/null
 
 # create lambda function if it does not exist 
-echo "Deploying to AWS (creating IAM role and function as needed)"
+echo 'Deploying to AWS (creating IAM role and function as needed)'
 IAM_ROLE_ARN=$(aws iam list-roles --query "Roles[? RoleName == '$IAM_ROLE_NAME'].Arn" --output text)
 if [ -z "$IAM_ROLE_ARN" ];
 then