[RFC] Drop event label from handle methods in LambdaHandlers

Examples/LambdaFunctions/Sources/Benchmark/main.swift

@@ -25,7 +25,7 @@ struct BenchmarkHandler: EventLoopLambdaHandler {
  typealias In = String
  typealias Out = String
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<String> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<String> {
  context.eventLoop.makeSucceededFuture("hello, world!")
  }
 }

Examples/LambdaFunctions/Sources/CurrencyExchange/CurrencyExchangeHandler.swift

@@ -35,7 +35,7 @@ struct CurrencyExchangeHandler: LambdaHandler {
  self.calculator = ExchangeRatesCalculator()
  }
 
- func handle(event: Request, context: Lambda.Context) async throws -> [Exchange] {
+ func handle(_ event: Request, context: Lambda.Context) async throws -> [Exchange] {
  try await withCheckedThrowingContinuation { continuation in
  self.calculator.run(logger: context.logger) { result in
  switch result {

Examples/LambdaFunctions/Sources/ErrorHandling/ErrorsHappenHandler.swift

@@ -23,7 +23,7 @@ struct ErrorsHappenHandler: LambdaHandler {
 
  init(context: Lambda.InitializationContext) async throws {}
 
- func handle(event request: Request, context: Lambda.Context) async throws -> Response {
+ func handle(_ request: Request, context: Lambda.Context) async throws -> Response {
  // switch over the error type "requested" by the request, and trigger such error accordingly
  switch request.error {
  // no error here!

Examples/LambdaFunctions/Sources/HelloWorld/HelloWorldHandler.swift

@@ -24,7 +24,7 @@ struct HelloWorldHandler: LambdaHandler {
  // setup your resources that you want to reuse here.
  }
 
- func handle(event: String, context: Lambda.Context) async throws -> String {
+ func handle(_ event: String, context: Lambda.Context) async throws -> String {
  "hello, world"
  }
 }

Examples/LocalDebugging/MyLambda/Sources/MyLambda/MyLambdaHandler.swift

@@ -26,7 +26,7 @@ struct MyLambdaHandler: LambdaHandler {
  // setup your resources that you want to reuse for every invocation here.
  }
 
- func handle(event request: Request, context: Lambda.Context) async throws -> Response {
+ func handle(_ request: Request, context: Lambda.Context) async throws -> Response {
  // TODO: something useful
  Response(message: "Hello, \(request.name)!")
  }

Sources/AWSLambdaRuntimeCore/LambdaHandler.swift

@@ -38,15 +38,15 @@ public protocol LambdaHandler: EventLoopLambdaHandler {
  /// - context: Runtime `Context`.
  ///
  /// - Returns: A Lambda result ot type `Out`.
- func handle(event: In, context: Lambda.Context) async throws -> Out
+ func handle(_ event: In, context: Lambda.Context) async throws -> Out
 }
 
 @available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
 extension LambdaHandler {
- public func handle(event: In, context: Lambda.Context) -> EventLoopFuture<Out> {
+ public func handle(_ event: In, context: Lambda.Context) -> EventLoopFuture<Out> {
  let promise = context.eventLoop.makePromise(of: Out.self)
  promise.completeWithTask {
- try await self.handle(event: event, context: context)
+ try await self.handle(event, context: context)
  }
  return promise.futureResult
  }
@@ -82,7 +82,7 @@ public protocol EventLoopLambdaHandler: ByteBufferLambdaHandler {
  ///
  /// - Returns: An `EventLoopFuture` to report the result of the Lambda back to the runtime engine.
  /// The `EventLoopFuture` should be completed with either a response of type `Out` or an `Error`
- func handle(event: In, context: Lambda.Context) -> EventLoopFuture<Out>
+ func handle(_ event: In, context: Lambda.Context) -> EventLoopFuture<Out>
 
  /// Encode a response of type `Out` to `ByteBuffer`
  /// Concrete Lambda handlers implement this method to provide coding functionality.
@@ -106,15 +106,15 @@ public protocol EventLoopLambdaHandler: ByteBufferLambdaHandler {
 extension EventLoopLambdaHandler {
  /// Driver for `ByteBuffer` -> `In` decoding and `Out` -> `ByteBuffer` encoding
  @inlinable
- public func handle(event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?> {
+ public func handle(_ event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?> {
  let input: In
  do {
  input = try self.decode(buffer: event)
  } catch {
  return context.eventLoop.makeFailedFuture(CodecError.requestDecoding(error))
  }
 
- return self.handle(event: input, context: context).flatMapThrowing { output in
+ return self.handle(input, context: context).flatMapThrowing { output in
  do {
  return try self.encode(allocator: context.allocator, value: output)
  } catch {
@@ -148,7 +148,7 @@ public protocol ByteBufferLambdaHandler {
  ///
  /// - Returns: An `EventLoopFuture` to report the result of the Lambda back to the runtime engine.
  /// The `EventLoopFuture` should be completed with either a response encoded as `ByteBuffer` or an `Error`
- func handle(event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?>
+ func handle(_ event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?>
 
  /// Clean up the Lambda resources asynchronously.
  /// Concrete Lambda handlers implement this method to shutdown resources like `HTTPClient`s and database connections.

Sources/AWSLambdaRuntimeCore/LambdaRunner.swift

@@ -62,15 +62,15 @@ extension Lambda {
  self.isGettingNextInvocation = true
  return self.runtimeClient.getNextInvocation(logger: logger).peekError { error in
  logger.error("could not fetch work from lambda runtime engine: \(error)")
- }.flatMap { invocation, event in
+ }.flatMap { invocation, bytes in
  // 2. send invocation to handler
  self.isGettingNextInvocation = false
  let context = Context(logger: logger,
  eventLoop: self.eventLoop,
  allocator: self.allocator,
  invocation: invocation)
  logger.debug("sending invocation to lambda handler \(handler)")
- return handler.handle(event: event, context: context)
+ return handler.handle(bytes, context: context)
  // Hopping back to "our" EventLoop is important in case the handler returns a future that
  // originiated from a foreign EventLoop/EventLoopGroup.
  // This can happen if the handler uses a library (lets say a DB client) that manages its own threads/loops

Sources/AWSLambdaTesting/Lambda+Testing.swift

@@ -97,7 +97,7 @@ extension Lambda {
  let handler = try promise.futureResult.wait()
 
  return try eventLoop.flatSubmit {
- handler.handle(event: event, context: context)
+ handler.handle(event, context: context)
  }.wait()
  }
 }

Sources/CodableSample/main.swift

@@ -29,7 +29,7 @@ struct Handler: EventLoopLambdaHandler {
  typealias In = Request
  typealias Out = Response
 
- func handle(event: Request, context: Lambda.Context) -> EventLoopFuture<Response> {
+ func handle(_ event: Request, context: Lambda.Context) -> EventLoopFuture<Response> {
  // as an example, respond with the input event's reversed body
  context.eventLoop.makeSucceededFuture(Response(body: String(event.body.reversed())))
  }

Sources/StringSample/main.swift

@@ -20,7 +20,7 @@ struct Handler: EventLoopLambdaHandler {
  typealias In = String
  typealias Out = String
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<String> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<String> {
  // as an example, respond with the event's reversed body
  context.eventLoop.makeSucceededFuture(String(event.reversed()))
  }

Tests/AWSLambdaRuntimeCoreTests/LambdaHandlerTest.swift

@@ -39,7 +39,7 @@ class LambdaHandlerTest: XCTestCase {
  self.initialized = true
  }
 
- func handle(event: String, context: Lambda.Context) async throws -> String {
+ func handle(_ event: String, context: Lambda.Context) async throws -> String {
  event
  }
  }
@@ -68,7 +68,7 @@ class LambdaHandlerTest: XCTestCase {
  throw TestError("kaboom")
  }
 
- func handle(event: String, context: Lambda.Context) async throws {
+ func handle(_ event: String, context: Lambda.Context) async throws {
  XCTFail("How can this be called if init failed")
  }
  }
@@ -91,7 +91,7 @@ class LambdaHandlerTest: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: String, context: Lambda.Context) async throws -> String {
+ func handle(_ event: String, context: Lambda.Context) async throws -> String {
  event
  }
  }
@@ -114,7 +114,7 @@ class LambdaHandlerTest: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: String, context: Lambda.Context) async throws {}
+ func handle(_ event: String, context: Lambda.Context) async throws {}
  }
 
  let maxTimes = Int.random(in: 1 ... 10)
@@ -136,7 +136,7 @@ class LambdaHandlerTest: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: String, context: Lambda.Context) async throws -> String {
+ func handle(_ event: String, context: Lambda.Context) async throws -> String {
  throw TestError("boom")
  }
  }
@@ -159,7 +159,7 @@ class LambdaHandlerTest: XCTestCase {
  typealias In = String
  typealias Out = String
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<String> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<String> {
  context.eventLoop.makeSucceededFuture(event)
  }
  }
@@ -181,7 +181,7 @@ class LambdaHandlerTest: XCTestCase {
  typealias In = String
  typealias Out = Void
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<Void> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<Void> {
  context.eventLoop.makeSucceededFuture(())
  }
  }
@@ -203,7 +203,7 @@ class LambdaHandlerTest: XCTestCase {
  typealias In = String
  typealias Out = String
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<String> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<String> {
  context.eventLoop.makeFailedFuture(TestError("boom"))
  }
  }

Tests/AWSLambdaRuntimeCoreTests/LambdaHandlers.swift

@@ -19,7 +19,7 @@ struct EchoHandler: EventLoopLambdaHandler {
  typealias In = String
  typealias Out = String
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<String> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<String> {
  context.eventLoop.makeSucceededFuture(event)
  }
 }
@@ -34,7 +34,7 @@ struct FailedHandler: EventLoopLambdaHandler {
  self.reason = reason
  }
 
- func handle(event: String, context: Lambda.Context) -> EventLoopFuture<Void> {
+ func handle(_ event: String, context: Lambda.Context) -> EventLoopFuture<Void> {
  context.eventLoop.makeFailedFuture(TestError(self.reason))
  }
 }

Tests/AWSLambdaRuntimeCoreTests/LambdaLifecycleTest.swift

@@ -54,7 +54,7 @@ class LambdaLifecycleTest: XCTestCase {
  self.shutdown = shutdown
  }
 
- func handle(event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?> {
+ func handle(_ event: ByteBuffer, context: Lambda.Context) -> EventLoopFuture<ByteBuffer?> {
  self.handler(context, event)
  }
 

Tests/AWSLambdaRuntimeTests/Lambda+CodeableTest.swift

@@ -43,7 +43,7 @@ class CodableLambdaTest: XCTestCase {
 
  let expected: Request
 
- func handle(event: Request, context: Lambda.Context) -> EventLoopFuture<Void> {
+ func handle(_ event: Request, context: Lambda.Context) -> EventLoopFuture<Void> {
  XCTAssertEqual(event, self.expected)
  return context.eventLoop.makeSucceededVoidFuture()
  }
@@ -52,7 +52,7 @@ class CodableLambdaTest: XCTestCase {
  let handler = Handler(expected: request)
 
  XCTAssertNoThrow(inputBuffer = try JSONEncoder().encode(request, using: self.allocator))
- XCTAssertNoThrow(outputBuffer = try handler.handle(event: XCTUnwrap(inputBuffer), context: self.newContext()).wait())
+ XCTAssertNoThrow(outputBuffer = try handler.handle(XCTUnwrap(inputBuffer), context: self.newContext()).wait())
  XCTAssertNil(outputBuffer)
  }
 
@@ -68,7 +68,7 @@ class CodableLambdaTest: XCTestCase {
 
  let expected: Request
 
- func handle(event: Request, context: Lambda.Context) -> EventLoopFuture<Response> {
+ func handle(_ event: Request, context: Lambda.Context) -> EventLoopFuture<Response> {
  XCTAssertEqual(event, self.expected)
  return context.eventLoop.makeSucceededFuture(Response(requestId: event.requestId))
  }
@@ -77,7 +77,7 @@ class CodableLambdaTest: XCTestCase {
  let handler = Handler(expected: request)
 
  XCTAssertNoThrow(inputBuffer = try JSONEncoder().encode(request, using: self.allocator))
- XCTAssertNoThrow(outputBuffer = try handler.handle(event: XCTUnwrap(inputBuffer), context: self.newContext()).wait())
+ XCTAssertNoThrow(outputBuffer = try handler.handle(XCTUnwrap(inputBuffer), context: self.newContext()).wait())
  XCTAssertNoThrow(response = try JSONDecoder().decode(Response.self, from: XCTUnwrap(outputBuffer)))
  XCTAssertEqual(response?.requestId, request.requestId)
  }
@@ -93,7 +93,7 @@ class CodableLambdaTest: XCTestCase {
 
  init(context: Lambda.InitializationContext) async throws {}
 
- func handle(event: Request, context: Lambda.Context) async throws {
+ func handle(_ event: Request, context: Lambda.Context) async throws {
  XCTAssertEqual(event, self.expected)
  }
  }
@@ -107,7 +107,7 @@ class CodableLambdaTest: XCTestCase {
  handler.expected = request
 
  XCTAssertNoThrow(inputBuffer = try JSONEncoder().encode(request, using: self.allocator))
- XCTAssertNoThrow(outputBuffer = try handler.handle(event: XCTUnwrap(inputBuffer), context: self.newContext()).wait())
+ XCTAssertNoThrow(outputBuffer = try handler.handle(XCTUnwrap(inputBuffer), context: self.newContext()).wait())
  XCTAssertNil(outputBuffer)
  }
  }
@@ -122,7 +122,7 @@ class CodableLambdaTest: XCTestCase {
 
  init(context: Lambda.InitializationContext) async throws {}
 
- func handle(event: Request, context: Lambda.Context) async throws -> Response {
+ func handle(_ event: Request, context: Lambda.Context) async throws -> Response {
  XCTAssertEqual(event, self.expected)
  return Response(requestId: event.requestId)
  }
@@ -138,7 +138,7 @@ class CodableLambdaTest: XCTestCase {
  handler.expected = request
 
  XCTAssertNoThrow(inputBuffer = try JSONEncoder().encode(request, using: self.allocator))
- XCTAssertNoThrow(outputBuffer = try handler.handle(event: XCTUnwrap(inputBuffer), context: self.newContext()).wait())
+ XCTAssertNoThrow(outputBuffer = try handler.handle(XCTUnwrap(inputBuffer), context: self.newContext()).wait())
  XCTAssertNoThrow(response = try JSONDecoder().decode(Response.self, from: XCTUnwrap(outputBuffer)))
  XCTAssertEqual(response?.requestId, request.requestId)
  }

Tests/AWSLambdaTestingTests/Tests.swift

@@ -35,7 +35,7 @@ class LambdaTestingTests: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: Request, context: Lambda.Context) async throws -> Response {
+ func handle(_ event: Request, context: Lambda.Context) async throws -> Response {
  Response(message: "echo" + event.name)
  }
  }
@@ -59,7 +59,7 @@ class LambdaTestingTests: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: Request, context: Lambda.Context) async throws {
+ func handle(_ event: Request, context: Lambda.Context) async throws {
  LambdaTestingTests.VoidLambdaHandlerInvokeCount += 1
  }
  }
@@ -79,7 +79,7 @@ class LambdaTestingTests: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: String, context: Lambda.Context) async throws {
+ func handle(_ event: String, context: Lambda.Context) async throws {
  throw MyError()
  }
  }
@@ -96,7 +96,7 @@ class LambdaTestingTests: XCTestCase {
 
  init(context: Lambda.InitializationContext) {}
 
- func handle(event: String, context: Lambda.Context) async throws -> String {
+ func handle(_ event: String, context: Lambda.Context) async throws -> String {
  try await Task.sleep(nanoseconds: 500 * 1000 * 1000)
  return event
  }