Update Examples with SwiftNIO 2.0

Author: Andrea-Scuderi

Examples/HTTPSRequest/Package.resolved

@@ -8,7 +8,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         //.package(path: "../../../aws-lambda-swift-sprinter-nio-plugin"),
-        .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0-alpha.3"),
+        .package(url: "https://github.com/Andrea-Scuderi/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0-alpha.3"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
     targets: [

Examples/HTTPSRequest/Package.swift

@@ -32,6 +32,10 @@ struct Response: Codable {
     let content: String
 }
 
+enum MyError: Error {
+    case invalidParameters
+}
+
 let logger = Logger(label: "AWS.Lambda.HTTPSRequest")
 
 /**
@@ -60,10 +64,6 @@ let syncCodableNIOLambda: SyncCodableNIOLambda<Event, Response> = { (event, cont
     return future
 }
 
-enum MyError: Error {
-    case invalidParameters
-}
-
 /**
  How to use the `SyncDictionaryNIOLambda` lambda handler.
 

Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift

@@ -8,7 +8,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         //.package(path: "../../../aws-lambda-swift-sprinter-core"),
-        .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.2")
+        .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.3")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Examples/HelloWorld/Package.resolved

@@ -8,7 +8,9 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         //.package(path: "../../../aws-lambda-swift-sprinter-core"),
-        .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.2"),
+        //.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.3"),
+        //.package(path: "../../../aws-lambda-swift-sprinter-nio-plugin"),
+        .package(url: "https://github.com/Andrea-Scuderi/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0-alpha.3"),
         .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.0.0-rc1"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
@@ -17,7 +19,7 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "S3Test",
-            dependencies: ["LambdaSwiftSprinter", "S3", "Logging"]
+            dependencies: ["LambdaSwiftSprinterNioPlugin", "S3", "Logging"]
         ),
         .testTarget(
             name: "S3TestTests",

Examples/HelloWorld/Package.swift

@@ -16,9 +16,11 @@ import Foundation
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
-import LambdaSwiftSprinter
+import LambdaSwiftSprinterNioPlugin
 import Logging
 import S3
+import NIO
+import NIOFoundationCompat
 
 struct Bucket: Codable {
     let name: String
@@ -29,32 +31,48 @@ struct Response: Codable {
     let value: String?
 }
 
-let s3 = S3(region: .euwest1)
+let s3 = S3(region: .useast1)
 
 let logger = Logger(label: "AWS.Lambda.S3Test")
 
-let getObject: AsyncCodableLambda<Bucket, Response> = { event, _, completion in
-
+let getObject: SyncCodableNIOLambda<Bucket, Response> = { (event, context) throws -> EventLoopFuture<Response> in
+    
     let getObjectRequest = S3.GetObjectRequest(bucket: event.name, key: event.key)
-    do {
-        let response = try s3.getObject(getObjectRequest).wait()
-
-        guard let body = response.body else {
-            logger.info("Body is empty")
-            completion(.success(Response(value: "")))
-            return
+    let future = s3.getObject(getObjectRequest)
+        .flatMapThrowing { (response) throws -> String in
+            guard let body = response.body,
+                let value = String(data: body, encoding: .utf8) else {
+                return ""
+            }
+            return value
+        }.map { content -> Response in
+            return Response(value: content)
         }
-        let value = String(data: body, encoding: .utf8)
-        completion(.success(Response(value: value)))
-    } catch {
-        completion(.failure(error))
-    }
+    return future
 }
 
+//let getObject: AsyncCodableNIOLambda<Bucket, Response> = { event, _, completion in
+//
+//    let getObjectRequest = S3.GetObjectRequest(bucket: event.name, key: event.key)
+//    do {
+//        let response = try s3.getObject(getObjectRequest).wait()
+//
+//        guard let body = response.body else {
+//            logger.info("Body is empty")
+//            completion(.success(Response(value: "")))
+//            return
+//        }
+//        let value = String(data: body, encoding: .utf8)
+//        completion(.success(Response(value: value)))
+//    } catch {
+//        completion(.failure(error))
+//    }
+//}
+
 do {
-    let sprinter = try SprinterCURL()
+    let sprinter = try SprinterNIO()
     sprinter.register(handler: "getObject", lambda: getObject)
     try sprinter.run()
 } catch {
     logger.error("\(String(describing: error))")
-}
+}

Examples/S3Test/Package.resolved

@@ -1,6 +1,6 @@
 # aws-lambda-swift-sprinter
 
-[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.2](https://img.shields.io/badge/Swift-5.1.2-blue.svg)](https://swift.org/download/)  ![](https://img.shields.io/badge/version-1.0.0--alpha.2-red) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master)
+[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.2](https://img.shields.io/badge/Swift-5.1.2-blue.svg)](https://swift.org/download/)  ![](https://img.shields.io/badge/version-1.0.0--alpha.3-red) ![](https://travis-ci.com/swift-sprinter/aws-lambda-swift-sprinter.svg?branch=master)
 
 ![](./images/aws-lambda-swift-sprinter.png)