Merge branch 'feature/swift-aws-lambda-runtime' into develop

Author: Andrea-Scuderi

Makefile

@@ -14,8 +14,8 @@
 
 # Use this tag to build a customized local image
 
-SWIFT_VERSION?=nightly-amazonlinux2
-LAYER_VERSION?=nightly-amazonlinux2
+SWIFT_VERSION?=nightly-master-amazonlinux2
+LAYER_VERSION?=nightly-master-amazonlinux2
 DOCKER_OS?=amazonlinux2
 
 # SWIFT_VERSION?=5.2.3-bionic
@@ -69,7 +69,16 @@ build_lambda:
 --volume "$(MOUNT_ROOT)/:/src" \
 --workdir "/src/$(DOCKER_PROJECT_PATH)" \
 $(SWIFT_DOCKER_IMAGE) \
-/bin/bash -c "swift build --configuration $(SWIFT_CONFIGURATION)"
+/bin/bash -c "swift build -c $(SWIFT_CONFIGURATION) -Xswiftc -g"
+
+docker_bash:
+docker run \
+-it \
+--rm \
+--volume "$(MOUNT_ROOT):/src" \
+--workdir "/src/" \
+$(SWIFT_DOCKER_IMAGE) \
+/bin/bash
 
 cp_lambda_to_sls_build_local: create_build_directory
 docker run \
@@ -90,7 +99,7 @@ package_lambda: create_build_directory build_lambda
 package_layer: create_build_directory
 $(eval SHARED_LIBRARIES := $(shell cat docker/$(SWIFT_VERSION)/swift-shared-libraries.txt | tr '\n' ' '))
 mkdir -p $(SHARED_LIBS_FOLDER)/lib
-ifeq '$(DOCKER_OS)' 'xenial'
+ifeq '$(DOCKER_OS)' 'bionic'
 docker run \
 --rm \
 --volume "$(shell pwd)/:/src" \

Products/.gitignore

@@ -3,3 +3,5 @@
 /Packages
 /*.xcodeproj
 xcuserdata/
+.swiftpm
+Package.resolved

Products/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -1,10 +1,13 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
  name: "swift-rest-api",
+ platforms: [
+ .macOS(.v10_13),
+ ],
  products: [
  // Products define the executables and libraries produced by a package, and make them visible to other packages.
  .executable(name: "Products", targets: ["Products"]),
@@ -14,7 +17,7 @@ let package = Package(
  ),
  ],
  dependencies: [
- .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0"),
+ .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "0.1.0"),
  .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "5.0.0-alpha.3"),
  .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
  ],
@@ -25,16 +28,20 @@ let package = Package(
  name: "ProductService",
  dependencies: [
  .product(name: "AWSDynamoDB", package: "aws-sdk-swift"),
- "Logging"
+ .product(name: "Logging", package: "swift-log")
  ]
  ),
  .target(
  name: "Products",
- dependencies: ["LambdaSwiftSprinterNioPlugin", "ProductService"]
+ dependencies: [
+ .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
+ .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-runtime"),
+ "ProductService"
+ ]
  ),
  .testTarget(
  name: "ProductServiceTests",
- dependencies: ["ProductService"]
+ dependencies: ["Products"]
  ),
  ]
 )

Products/Package.resolved

@@ -1,4 +1,4 @@
-// Copyright 2019 (c) Andrea Scuderi - https://github.com/swift-sprinter
+// Copyright 2020 (c) Andrea Scuderi - https://github.com/swift-sprinter
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Products/Package.swift

@@ -1,4 +1,4 @@
-// Copyright 2019 (c) Andrea Scuderi - https://github.com/swift-sprinter
+// Copyright 2020 (c) Andrea Scuderi - https://github.com/swift-sprinter
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Products/Sources/ProductService/APIGateway.swift

@@ -1,4 +1,4 @@
-// Copyright 2019 (c) Andrea Scuderi - https://github.com/swift-sprinter
+// Copyright 2020 (c) Andrea Scuderi - https://github.com/swift-sprinter
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ public enum APIError: Error {
  case invalidItem
  case tableNameNotFound
  case invalidRequest
+ case handlerNotFound
 }
 
 extension Date {