Reduced public exposure.

Author: fabianfett

Package.swift

@@ -33,6 +33,9 @@ let package = Package(
             .product(name: "Backtrace", package: "swift-backtrace"),
             .product(name: "NIOHTTP1", package: "swift-nio"),
         ]),
+        .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
+            .byName(name: "AWSLambdaRuntimeCore"),
+        ]),
         .testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
             .byName(name: "AWSLambdaRuntimeCore"),
             .byName(name: "AWSLambdaRuntime"),

Sources/AWSLambdaRuntime/Lambda+Codable.swift

@@ -30,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.
@@ -43,20 +43,20 @@ 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)
+        self.run(CodableVoidClosureWrapper(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))
-    }
+//    // 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: )
+//    }
+//
+//    // 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))
+//    }
 }
 
 internal struct CodableClosureWrapper<In: Decodable, Out: Encodable>: LambdaHandler {

Sources/AWSLambdaRuntimeCore/Lambda.swift

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

Sources/AWSLambdaRuntimeCore/LambdaConfiguration.swift

@@ -17,12 +17,12 @@ import Logging
 import NIO
 
 extension Lambda {
-    public struct Configuration: CustomStringConvertible {
-        public let general: General
-        public let lifecycle: Lifecycle
-        public let runtimeEngine: RuntimeEngine
+    internal struct Configuration: CustomStringConvertible {
+        let general: General
+        let lifecycle: Lifecycle
+        let runtimeEngine: RuntimeEngine
 
-        public init() {
+        init() {
             self.init(general: .init(), lifecycle: .init(), runtimeEngine: .init())
         }
 
@@ -32,19 +32,19 @@ extension Lambda {
             self.runtimeEngine = runtimeEngine ?? RuntimeEngine()
         }
 
-        public struct General: CustomStringConvertible {
+        struct General: CustomStringConvertible {
             let logLevel: Logger.Level
 
             init(logLevel: Logger.Level? = nil) {
                 self.logLevel = logLevel ?? env("LOG_LEVEL").flatMap(Logger.Level.init) ?? .info
             }
 
-            public var description: String {
+            var description: String {
                 "\(General.self)(logLevel: \(self.logLevel))"
             }
         }
 
-        public struct Lifecycle: CustomStringConvertible {
+        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")
             }
 
-            public var description: String {
+            var description: String {
                 "\(Lifecycle.self)(id: \(self.id), maxTimes: \(self.maxTimes), stopSignal: \(self.stopSignal))"
             }
         }
 
-        public struct RuntimeEngine: CustomStringConvertible {
+        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) }
             }
 
-            public var description: String {
+            var description: String {
                 "\(RuntimeEngine.self)(ip: \(self.ip), port: \(self.port), keepAlive: \(self.keepAlive), requestTimeout: \(String(describing: self.requestTimeout))"
             }
         }
 
-        public var description: String {
+        var description: String {
             "\(Configuration.self)\n  \(self.general))\n  \(self.lifecycle)\n  \(self.runtimeEngine)"
         }
     }

Tests/AWSLambdaRuntimeTests/Lambda+StringTest.swift renamed to Tests/AWSLambdaRuntimeCoreTests/Lambda+StringTest.swift

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

Tests/AWSLambdaRuntimeTests/LambdaRunnerTest.swift renamed to Tests/AWSLambdaRuntimeCoreTests/LambdaRunnerTest.swift

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

Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTest.swift renamed to Tests/AWSLambdaRuntimeCoreTests/LambdaRuntimeClientTest.swift

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

Tests/AWSLambdaRuntimeTests/LambdaTest.swift renamed to Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift

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

Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift renamed to Tests/AWSLambdaRuntimeCoreTests/MockLambdaServer.swift

@@ -12,6 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if false
 @testable import AWSLambdaRuntime
 @testable import AWSLambdaRuntimeCore
 import NIO
@@ -279,3 +280,4 @@ private struct Response: Codable {
         self.requestId = requestId
     }
 }
+#endif