cleanup

Author: tomerd

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 
@@ -15,7 +15,7 @@ let package = Package(
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.33.0")),
+        .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.43.1")),
         .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.4.2")),
         .package(url: "https://github.com/swift-server/swift-backtrace.git", .upToNextMajor(from: "1.2.3")),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),

Sources/AWSLambdaRuntimeCore/Lambda.swift

@@ -60,7 +60,7 @@ public enum Lambda {
 
             var result: Result<Int, Error>!
             MultiThreadedEventLoopGroup.withCurrentThreadAsEventLoop { eventLoop in
-                let runtime = LambdaRuntime(handlerType, eventLoop: eventLoop, logger: logger, configuration: configuration)
+                let runtime = LambdaRuntime(handlerType: handlerType, eventLoop: eventLoop, logger: logger, configuration: configuration)
                 #if DEBUG
                 let signalSource = trap(signal: configuration.lifecycle.stopSignal) { signal in
                     logger.info("intercepted signal: \(signal)")

Sources/AWSLambdaRuntimeCore/LambdaRunner.swift

@@ -60,7 +60,7 @@ internal final class LambdaRunner {
             }
     }
 
-    func run(logger: Logger, handler: any ByteBufferLambdaHandler) -> EventLoopFuture<Void> {
+    func run(handler: any ByteBufferLambdaHandler, logger: Logger) -> EventLoopFuture<Void> {
         logger.debug("lambda invocation sequence starting")
         // 1. request invocation from lambda runtime engine
         self.isGettingNextInvocation = true

Sources/AWSLambdaRuntimeCore/LambdaRuntime.swift

@@ -62,10 +62,10 @@ public final class LambdaRuntime {
     ///     - eventLoop: An `EventLoop` to run the Lambda on.
     ///     - logger: A `Logger` to log the Lambda events.
     public convenience init(_ handlerType: (some ByteBufferLambdaHandler).Type, eventLoop: EventLoop, logger: Logger) {
-        self.init(handlerType, eventLoop: eventLoop, logger: logger, configuration: .init())
+        self.init(handlerType: handlerType, eventLoop: eventLoop, logger: logger, configuration: .init())
     }
 
-    init(_ handlerType: (some ByteBufferLambdaHandler).Type, eventLoop: EventLoop, logger: Logger, configuration: LambdaConfiguration) {
+    init(handlerType: (some ByteBufferLambdaHandler).Type, eventLoop: EventLoop, logger: Logger, configuration: LambdaConfiguration) {
         self.eventLoop = eventLoop
         self.shutdownPromise = eventLoop.makePromise(of: Int.self)
         self.logger = logger
@@ -165,7 +165,7 @@ public final class LambdaRuntime {
                 }
                 var logger = self.logger
                 logger[metadataKey: "lifecycleIteration"] = "\(count)"
-                runner.run(logger: logger, handler: handler).whenComplete { result in
+                runner.run(handler: handler, logger: logger).whenComplete { result in
                     switch result {
                     case .success:
                         logger.log(level: .debug, "lambda invocation sequence completed successfully")

Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift

@@ -279,15 +279,15 @@ class LambdaTest: XCTestCase {
             let runner = LambdaRunner(eventLoop: eventLoopGroup.next(), configuration: configuration)
 
             try runner.run(
-                logger: logger,
                 handler: CodableEventLoopLambdaHandler(
                     handler: handler1,
                     allocator: ByteBufferAllocator()
-                )
+                ),
+                logger: logger
             ).wait()
 
             try runner.initialize(handlerType: CodableEventLoopLambdaHandler<Handler>.self, logger: logger, terminator: LambdaTerminator()).flatMap { handler2 in
-                runner.run(logger: logger, handler: handler2)
+                runner.run(handler: handler2, logger: logger)
             }.wait()
         }
 

Tests/AWSLambdaRuntimeCoreTests/Utils.swift

@@ -37,7 +37,7 @@ func runLambda(behavior: LambdaServerBehavior, handlerType: (some ByteBufferLamb
     let server = try MockLambdaServer(behavior: behavior).start().wait()
     defer { XCTAssertNoThrow(try server.stop().wait()) }
     try runner.initialize(handlerType: handlerType, logger: logger, terminator: terminator).flatMap { handler in
-        runner.run(logger: logger, handler: handler)
+        runner.run(handler: handler, logger: logger)
     }.wait()
 }