Run on amzn linux (#8)

This PR changes everything. Sorry. But growing up always comes with a pain.

- New package name: `swift-lambda-runtime`. The library is now called `LambdaRuntime` (#11)
- The Runtime now only has one handler function. This is more in line with the [go sdk](https://github.com/aws/aws-lambda-go). The end user still has the option to specify different handler methods by using the env variable `_HANDLER`
- The runtime is now intended to be used with the [amazonlinux-swift](https://fabianfett.de/amazonlinux-swift) project. That is why the makefile to extract Swift libraries from the Ubuntu Swift Dockerimage has been removed.
- `swift-base64-kit` has been added as a dependency to support future Event types.
- It is possible now to not return a result from the function (#10)
- The synchronous interface has been removed.
- The documentation explains how to create a development image (#9)
- The documentation has been changed to reflect the changes.

Author: fabianfett

.github/workflows/ci.yaml

@@ -10,6 +10,8 @@ on:
 jobs:
   "Integration-Tests":
     runs-on: ubuntu-18.04
+    env:
+      SWIFT_VERSION: 5.1.3
     steps:
     - name: Checkout
       uses: actions/checkout@v1
@@ -20,9 +22,12 @@ jobs:
     - name: Install aws-sam-cli
       run: sudo pip install aws-sam-cli
     - name: Build Docker Swift Dev Image
-      run: docker build -t swift-dev:5.1.2 .
-    - name: Build local layer
-      run: cd Layer && make create_layer
+      run: docker build --build-arg SWIFT_VERSION=${SWIFT_VERSION} -t fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev ./docker
+    - name: Download local layer
+      run: | 
+        mkdir -p Layer
+        curl -o Layer/swift-${SWIFT_VERSION}-RELEASE.zip https://amazonlinux-swift.s3.eu-central-1.amazonaws.com/layers/swift-${SWIFT_VERSION}-RELEASE.zip
+        unzip Layer/swift-${SWIFT_VERSION}-RELEASE.zip -d Layer/swift-lambda-layer
     - name: test local lambda
       run: make test_lambda
       env:
@@ -48,7 +53,7 @@ jobs:
     - name: Test
       run: swift test --enable-code-coverage --enable-test-discovery
     - name: Convert coverage files
-      run: llvm-cov export -format="lcov" .build/debug/swift-aws-lambdaPackageTests.xctest -instr-profile .build/debug/codecov/default.profdata > info.lcov
+      run: llvm-cov export -format="lcov" .build/debug/swift-lambda-runtimePackageTests.xctest -instr-profile .build/debug/codecov/default.profdata > info.lcov
     - name: Upload to codecov.io
       uses: codecov/[email protected]
       with:
@@ -72,6 +77,6 @@ jobs:
     - name: Xcode Tests
       run: |
         swift package generate-xcodeproj
-        xcodebuild -quiet -parallel-testing-enabled YES -scheme swift-aws-lambda-Package -enableCodeCoverage YES build test
+        xcodebuild -quiet -parallel-testing-enabled YES -scheme swift-lambda-runtime-Package -enableCodeCoverage YES build test
     - name: Codecov
-      run: bash <(curl -s https://codecov.io/bash) -J 'AWSLambda' -t ${{secrets.CODECOV_TOKEN}}
+      run: bash <(curl -s https://codecov.io/bash) -J 'LambdaRuntime' -t ${{secrets.CODECOV_TOKEN}}

.gitignore

@@ -2,6 +2,6 @@
 .build
 /*.xcodeproj
 xcuserdata
-Layer/swift-lambda-runtime
-Layer/swift-lambda-runtime.zip
-Examples/**/lambda.zip
+Layer
+Examples/**/lambda.zip
+packaged.yaml

Dockerfile

@@ -11,7 +11,7 @@ let package = Package(
   targets: [
     .target(
       name: "SquareNumber",
-      dependencies: ["AWSLambda"]
+      dependencies: ["LambdaRuntime"]
     ),
   ]
 )

Docs/Add-Layer-to-Function.png

@@ -1,4 +1,5 @@
-import AWSLambda
+import Foundation
+import LambdaRuntime
 import NIO
 
 struct Input: Codable {
@@ -9,9 +10,9 @@ struct Output: Codable {
   let result: Double
 }
 
-func squareNumber(input: Input, context: Context) -> Output {
+func squareNumber(input: Input, context: Context) -> EventLoopFuture<Output> {
   let squaredNumber = input.number * input.number
-  return Output(result: squaredNumber)
+  return context.eventLoop.makeSucceededFuture(Output(result: squaredNumber))
 }
 
 func printNumber(input: Input, context: Context) -> EventLoopFuture<Void> {
@@ -25,11 +26,18 @@ defer {
 }
 
 do {
-  let runtime = try Runtime.createRuntime(eventLoopGroup: group)
+  
+  let handler: LambdaRuntime.Handler
+  switch ProcessInfo.processInfo.environment["_HANDLER"] {
+  case "printNumber":
+    handler = LambdaRuntime.codable(printNumber)
+  default:
+    handler = LambdaRuntime.codable(squareNumber)
+  }
+  
+  let runtime = try LambdaRuntime.createRuntime(eventLoopGroup: group, handler: handler)
   defer { try! runtime.syncShutdown() }
 
-  runtime.register(for: "squareNumber", handler: Runtime.codable(squareNumber))
-  runtime.register(for: "printNumber",  handler: Runtime.codable(printNumber))
   try runtime.start().wait()
 }
 catch {

Examples/SquareNumber/Package.swift

@@ -15,16 +15,13 @@ Resources:
   SwiftLayer:
     Type: AWS::Serverless::LayerVersion
     Properties:
-      ContentUri: Layer/swift-lambda-runtime/
-      # ContentUri:
-      #   Bucket: de.fabianfett.denkan.app.sam
-      #   Key: swift-lambda-runtime.zip
+      ContentUri: Layer/swift-lambda-layer/
 
   SquareNumberFunction:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: Examples/SquareNumber/lambda.zip
-      Handler: "SquareNumber.squareNumber"
+      Handler: "squareNumber"
       Runtime: provided
       Layers:
       - !Ref SwiftLayer
@@ -33,7 +30,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: Examples/SquareNumber/lambda.zip
-      Handler: "SquareNumber.printNumber"
+      Handler: "printNumber"
       Runtime: provided
       Layers:
       - !Ref SwiftLayer

Examples/SquareNumber/Sources/SquareNumber/main.swift

@@ -12,13 +12,13 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.9.0")),
     .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.1.1")),
-    .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", .branch("master")),
+    .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", .upToNextMajor(from: "4.0.0")),
     .package(path: "../../"),
   ],
   targets: [
     .target(
       name: "TodoAPIGateway",
-      dependencies: ["AWSLambda", "Logging", "TodoService", "NIO", "NIOHTTP1", "DynamoDB"]),
+      dependencies: ["LambdaRuntime", "Logging", "TodoService", "NIO", "NIOHTTP1", "DynamoDB"]),
     .testTarget(
       name: "TodoAPIGatewayTests",
       dependencies: ["TodoAPIGateway"]),

Examples/SquareNumber/template.yaml

@@ -1,15 +1,8 @@
-//
-//  File.swift
-//  
-//
-//  Created by Fabian Fett on 19.11.19.
-//
-
 import Foundation
 import NIO
 import NIOHTTP1
 import TodoService
-import AWSLambda
+import LambdaRuntime
 
 class TodoController {
 
@@ -150,7 +143,7 @@ class TodoController {
       encoder.userInfo[.baseUrl] = URL(string: "\(proto)://\(host)/\(request.requestContext.stage)")!
     }
     else { //local
-      encoder.userInfo[.baseUrl] = URL(string: "\(proto)://\(host)/")!
+      encoder.userInfo[.baseUrl] = URL(string: "\(proto)://\(host)")!
     }
 
     return encoder