Readded state check for Lifecycle. Assert start happens in correct loop.

Author: fabianfett

Sources/AWSLambdaRuntimeCore/LambdaLifecycle.swift

@@ -27,7 +27,12 @@ extension Lambda {
         private let configuration: Configuration
         private let factory: HandlerFactory
 
-        private var state = State.idle
+        private var state = State.idle {
+            willSet {
+                assert(self.eventLoop.inEventLoop, "State may only be changed on the `Lifecycle`'s `eventLoop`")
+                precondition(newValue.order > self.state.order, "invalid state \(newValue) after \(self.state.order)")
+            }
+        }
 
         /// Create a new `Lifecycle`.
         ///
@@ -62,8 +67,12 @@ extension Lambda {
 
         /// Start the `Lifecycle`.
         ///
-        /// - Returns: An `EventLoopFuture` that is fulfilled after the Lambda hander has been created and initiliazed, and a first run has been schduled.
+        /// - Returns: An `EventLoopFuture` that is fulfilled after the Lambda hander has been created and initiliazed, and a first run has been scheduled.
+        ///
+        /// - note: This method must be called  on the `EventLoop` the `Lifecycle` has been initialized with.
         public func start() -> EventLoopFuture<Void> {
+            assert(self.eventLoop.inEventLoop, "Start must be called on the `EventLoop` the `Lifecycle` has been initialized with.")
+
             logger.info("lambda lifecycle starting with \(self.configuration)")
             self.state = .initializing
             // triggered when the Lambda has finished its last run

Sources/AWSLambdaRuntimeCore/LambdaRunner.swift

@@ -77,8 +77,9 @@ extension Lambda {
         /// cancels the current run, if we are waiting for next invocation (long poll from Lambda control plane)
         /// only needed for debugging purposes.
         func cancelWaitingForNextInvocation() {
-            guard self.isGettingNextInvocation else { return }
-            self.runtimeClient.cancel()
+            if self.isGettingNextInvocation {
+                self.runtimeClient.cancel()
+            }
         }
     }
 }

Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift

@@ -145,12 +145,19 @@ class LambdaTest: XCTestCase {
         }
         let result = Lambda.run(configuration: configuration, factory: { $0.makeSucceededFuture(EchoHandler()) })
 
-        guard case .success(let invocationCount) = result else {
-            return XCTFail("expected to have not failed")
+        switch result {
+        case .success(let invocationCount):
+            // this is an allowed outcome. the lambda was cancelled while it was processing a task.
+            // therefore: it was shut down before asking for a new invocation
+            XCTAssertGreaterThan(invocationCount, 0, "should have stopped before any request made")
+            XCTAssertLessThan(invocationCount, maxTimes, "should have stopped before \(maxTimes)")
+        case .failure(HTTPClient.Errors.cancelled):
+            // this is an allowed outcome. while the lambda was asking for a new invocation it was
+            // cancelled. for this reason the get new invocation request failed with .cancelled.
+            break
+        case .failure(let error):
+            XCTFail("Unexpected error: \(error)")
         }
-
-        XCTAssertGreaterThan(invocationCount, 0, "should have stopped before any request made")
-        XCTAssertLessThan(invocationCount, maxTimes, "should have stopped before \(maxTimes)")
     }
 
     func testTimeout() {