Moved Foundation to FoundationCompat lib

Author: fabianfett

Package.swift

@@ -6,6 +6,7 @@ let package = Package(
     name: "swift-aws-lambda-runtime",
     products: [
         .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
+        .library(name: "AWSLambdaRuntimeFoundationCompat", targets: ["AWSLambdaRuntimeFoundationCompat"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
@@ -17,12 +18,16 @@ let package = Package(
             .product(name: "Logging", package: "swift-log"),
             .product(name: "Backtrace", package: "swift-backtrace"),
             .product(name: "NIOHTTP1", package: "swift-nio"),
+        ]),
+        .target(name: "AWSLambdaRuntimeFoundationCompat", dependencies: [
+            .byName(name: "AWSLambdaRuntime"),
+            .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOFoundationCompat", package: "swift-nio"),
         ]),
-        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: ["AWSLambdaRuntime"]),
+        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: ["AWSLambdaRuntime", "AWSLambdaRuntimeFoundationCompat"]),
         // samples
         .target(name: "StringSample", dependencies: ["AWSLambdaRuntime"]),
-        .target(name: "CodableSample", dependencies: ["AWSLambdaRuntime"]),
+        .target(name: "CodableSample", dependencies: ["AWSLambdaRuntime", "AWSLambdaRuntimeFoundationCompat"]),
         // perf tests
         .target(name: "MockServer", dependencies: [
             .product(name: "NIOHTTP1", package: "swift-nio"),

Sources/AWSLambdaRuntime/Lambda.swift

@@ -46,13 +46,13 @@ public enum Lambda {
 
     // for testing and internal use
     @discardableResult
-    internal static func run(configuration: Configuration = .init(), handler: ByteBufferLambdaHandler) -> Result<Int, Error> {
+    public static func run(configuration: Configuration = .init(), handler: ByteBufferLambdaHandler) -> Result<Int, Error> {
         self.run(configuration: configuration, factory: { $0.makeSucceededFuture(handler) })
     }
 
     // for testing and internal use
     @discardableResult
-    internal static func run(configuration: Configuration = .init(), factory: @escaping (EventLoop) throws -> ByteBufferLambdaHandler) -> Result<Int, Error> {
+    public static func run(configuration: Configuration = .init(), factory: @escaping (EventLoop) throws -> ByteBufferLambdaHandler) -> Result<Int, Error> {
         self.run(configuration: configuration, factory: { eventloop -> EventLoopFuture<ByteBufferLambdaHandler> in
             do {
                 let handler = try factory(eventloop)

Sources/AWSLambdaRuntime/LambdaConfiguration.swift

@@ -17,12 +17,12 @@ import Logging
 import NIO
 
 extension Lambda {
-    internal struct Configuration: CustomStringConvertible {
-        let general: General
-        let lifecycle: Lifecycle
-        let runtimeEngine: RuntimeEngine
+    public struct Configuration: CustomStringConvertible {
+        public let general: General
+        public let lifecycle: Lifecycle
+        public let runtimeEngine: RuntimeEngine
 
-        init() {
+        public init() {
             self.init(general: .init(), lifecycle: .init(), runtimeEngine: .init())
         }
 
@@ -32,19 +32,19 @@ extension Lambda {
             self.runtimeEngine = runtimeEngine ?? RuntimeEngine()
         }
 
-        struct General: CustomStringConvertible {
+        public struct General: CustomStringConvertible {
             let logLevel: Logger.Level
 
             init(logLevel: Logger.Level? = nil) {
                 self.logLevel = logLevel ?? env("LOG_LEVEL").flatMap(Logger.Level.init) ?? .info
             }
 
-            var description: String {
+            public var description: String {
                 "\(General.self)(logLevel: \(self.logLevel))"
             }
         }
 
-        struct Lifecycle: CustomStringConvertible {
+        public struct Lifecycle: CustomStringConvertible {
             let id: String
             let maxTimes: Int
             let stopSignal: Signal
@@ -56,12 +56,12 @@ extension Lambda {
                 precondition(self.maxTimes >= 0, "maxTimes must be equal or larger than 0")
             }
 
-            var description: String {
+            public var description: String {
                 "\(Lifecycle.self)(id: \(self.id), maxTimes: \(self.maxTimes), stopSignal: \(self.stopSignal))"
             }
         }
 
-        struct RuntimeEngine: CustomStringConvertible {
+        public struct RuntimeEngine: CustomStringConvertible {
             let ip: String
             let port: Int
             let keepAlive: Bool
@@ -78,12 +78,12 @@ extension Lambda {
                 self.requestTimeout = requestTimeout ?? env("REQUEST_TIMEOUT").flatMap(Int64.init).flatMap { .milliseconds($0) }
             }
 
-            var description: String {
+            public var description: String {
                 "\(RuntimeEngine.self)(ip: \(self.ip), port: \(self.port), keepAlive: \(self.keepAlive), requestTimeout: \(String(describing: self.requestTimeout))"
             }
         }
 
-        var description: String {
+        public var description: String {
             "\(Configuration.self)\n  \(self.general))\n  \(self.lifecycle)\n  \(self.runtimeEngine)"
         }
     }

Sources/AWSLambdaRuntimeFoundationCompat/Context+Foundation.swift

@@ -0,0 +1,23 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the SwiftAWSLambdaRuntime open source project
+//
+// Copyright (c) 2017-2020 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import AWSLambdaRuntime
+import Foundation
+
+extension Lambda.Context {
+    var deadlineDate: Date {
+        let secondsSinceEpoch = Double(Int64(bitPattern: self.deadline.rawValue)) / -1_000_000_000
+        return Date(timeIntervalSince1970: secondsSinceEpoch)
+    }
+}

Sources/AWSLambdaRuntime/Lambda+Codable.swift renamed to Sources/AWSLambdaRuntimeFoundationCompat/Lambda+Codable.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftAWSLambdaRuntime open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+// Copyright (c) 2017-2020 Apple Inc. and the SwiftAWSLambdaRuntime project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import AWSLambdaRuntime
 import class Foundation.JSONDecoder
 import class Foundation.JSONEncoder
 import NIO

Sources/CodableSample/main.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the SwiftAWSLambdaRuntime open source project
 //
-// Copyright (c) 2017-2018 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+// Copyright (c) 2017-2020 Apple Inc. and the SwiftAWSLambdaRuntime project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import AWSLambdaRuntime
+import AWSLambdaRuntimeFoundationCompat
 import NIO
 
 struct Request: Codable {

Tests/AWSLambdaRuntimeTests/Lambda+CodeableTest.swift

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 @testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeFoundationCompat
 import NIO
 import XCTest