Moved Foundation to AWSLambdaRuntime; AWSLambdaRuntime renamed to AWSLambdaRuntimeCore

Package.swift

@@ -8,8 +8,10 @@ let package = Package(
         .macOS(.v10_13),
     ],
     products: [
-        // core library
+        // this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
         .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
+        // this has all the main functionality for lambda and it does not link Foundation
+        .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
         // common AWS events
         .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]),
         // for testing only
@@ -22,23 +24,40 @@ let package = Package(
     ],
     targets: [
         .target(name: "AWSLambdaRuntime", dependencies: [
+            .byName(name: "AWSLambdaRuntimeCore"),
+            .product(name: "NIO", package: "swift-nio"),
+            .product(name: "NIOFoundationCompat", package: "swift-nio"),
+        ]),
+        .target(name: "AWSLambdaRuntimeCore", dependencies: [
             .product(name: "Logging", package: "swift-log"),
             .product(name: "Backtrace", package: "swift-backtrace"),
             .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
         ]),
-        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: ["AWSLambdaRuntime"]),
+        .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
+            .byName(name: "AWSLambdaRuntimeCore"),
+        ]),
+        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
+            .byName(name: "AWSLambdaRuntimeCore"),
+            .byName(name: "AWSLambdaRuntime"),
+        ]),
         .target(name: "AWSLambdaEvents", dependencies: []),
         .testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]),
         // testing helper
         .target(name: "AWSLambdaTesting", dependencies: [
-            "AWSLambdaRuntime",
+            .byName(name: "AWSLambdaRuntime"),
             .product(name: "NIO", package: "swift-nio"),
         ]),
-        .testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]),
+        .testTarget(name: "AWSLambdaTestingTests", dependencies: [
+            .byName(name: "AWSLambdaTesting"),
+            .byName(name: "AWSLambdaRuntime"),
+        ]),
         // samples
-        .target(name: "StringSample", dependencies: ["AWSLambdaRuntime"]),
-        .target(name: "CodableSample", dependencies: ["AWSLambdaRuntime"]),
+        .target(name: "StringSample", dependencies: [
+            .byName(name: "AWSLambdaRuntime"),
+        ]),
+        .target(name: "CodableSample", dependencies: [
+            .byName(name: "AWSLambdaRuntime"),
+        ]),
         // perf tests
         .target(name: "MockServer", dependencies: [
             .product(name: "NIOHTTP1", package: "swift-nio"),

Sources/AWSLambdaRuntime/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 AWSLambdaRuntimeCore
+import struct Foundation.Date
+
+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

@@ -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 @@
 //
 //===----------------------------------------------------------------------===//
 
+@_exported import AWSLambdaRuntimeCore
 import class Foundation.JSONDecoder
 import class Foundation.JSONEncoder
 import NIO
@@ -29,7 +30,7 @@ extension Lambda {
     ///
     /// - note: This is a blocking operation that will run forever, as its lifecycle is managed by the AWS Lambda Runtime Engine.
     public static func run<In: Decodable, Out: Encodable>(_ closure: @escaping CodableClosure<In, Out>) {
-        self.run(closure: closure)
+        self.run(CodableClosureWrapper(closure))
     }
 
     /// An asynchronous Lambda Closure that takes a `In: Decodable` and returns a `Result<Void, Error>` via a completion handler.
@@ -42,19 +43,7 @@ extension Lambda {
     ///
     /// - note: This is a blocking operation that will run forever, as its lifecycle is managed by the AWS Lambda Runtime Engine.
     public static func run<In: Decodable>(_ closure: @escaping CodableVoidClosure<In>) {
-        self.run(closure: closure)
-    }
-
-    // for testing
-    @discardableResult
-    internal static func run<In: Decodable, Out: Encodable>(configuration: Configuration = .init(), closure: @escaping CodableClosure<In, Out>) -> Result<Int, Error> {
-        self.run(configuration: configuration, handler: CodableClosureWrapper(closure))
-    }
-
-    // for testing
-    @discardableResult
-    internal static func run<In: Decodable>(configuration: Configuration = .init(), closure: @escaping CodableVoidClosure<In>) -> Result<Int, Error> {
-        self.run(configuration: configuration, handler: CodableVoidClosureWrapper(closure))
+        self.run(CodableVoidClosureWrapper(closure))
     }
 }
 

Sources/AWSLambdaTesting/Lambda+Testing.swift

@@ -17,6 +17,7 @@
 // @testable is used to access of internal functions
 #if DEBUG
 @testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import Dispatch
 import Logging
 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

Sources/StringSample/main.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import AWSLambdaRuntime
+import AWSLambdaRuntimeCore
 import NIO
 
 // in this example we are receiving and responding with strings

Tests/AWSLambdaRuntimeTests/Lambda+StringTest.swift → Tests/AWSLambdaRuntimeCoreTests/Lambda+StringTest.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import NIO
 import XCTest
 

Tests/AWSLambdaRuntimeTests/LambdaRunnerTest.swift → Tests/AWSLambdaRuntimeCoreTests/LambdaRunnerTest.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import XCTest
 
 class LambdaRunnerTest: XCTestCase {

Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTest.swift → Tests/AWSLambdaRuntimeCoreTests/LambdaRuntimeClientTest.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import XCTest
 
 class LambdaRuntimeClientTest: XCTestCase {

Tests/AWSLambdaRuntimeTests/LambdaTest.swift → Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import Logging
 import NIO
 import XCTest

Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift → Tests/AWSLambdaRuntimeCoreTests/MockLambdaServer.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import Foundation // for JSON
 import Logging
 import NIO

Tests/AWSLambdaRuntimeTests/Utils.swift → Tests/AWSLambdaRuntimeCoreTests/Utils.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@testable import AWSLambdaRuntime
+@testable import AWSLambdaRuntimeCore
 import Logging
 import NIO
 import XCTest