Merge branch 'main' into sebsto/new-plugin-proposal

Author: sebsto

.github/workflows/scripts/check-archive-plugin.sh

@@ -40,7 +40,14 @@ unzip -l "${ZIP_FILE}" | grep --silent bootstrap
 
 # if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt
 if [ "$EXAMPLE" == "ResourcesPackaging" ]; then
+    echo "Checking if resource was added to the ZIP file"
     unzip -l "${ZIP_FILE}" | grep --silent hello.txt
+    SUCCESS=$?
+    if [ "$SUCCESS" -eq 1 ]; then
+        log "❌ Resource not found." && exit 1
+    else
+        log "✅ Resource found."
+    fi
 fi    
 
 echo "✅ The archive plugin is OK with example ${EXAMPLE}"

Examples/CDK/infra/package-lock.json

@@ -11,13 +11,13 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "22.7.9",
-    "aws-cdk": "2.173.1",
+    "@types/node": "22.13.10",
+    "aws-cdk": "2.1003.0",
     "ts-node": "^10.9.2",
-    "typescript": "~5.6.3"
+    "typescript": "~5.8.2"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.173.1",
+    "aws-cdk-lib": "^2.189.1",
     "constructs": "^10.4.2"
   }
 }

Examples/CDK/infra/package.json

@@ -250,11 +250,11 @@ struct AWSLambdaPackager: CommandPlugin {
                 let relocatedResourcesDirectory = workingDirectory.appending(path: resourcesDirectoryName)
                 if FileManager.default.fileExists(atPath: artifactURL.path()) {
                     do {
+                        arguments.append(resourcesDirectoryName)
                         try FileManager.default.copyItem(
                             atPath: artifactURL.path(),
                             toPath: relocatedResourcesDirectory.path()
                         )
-                        arguments.append(resourcesDirectoryName)
                     } catch let error as CocoaError {
 
                         // On Linux, when the build has been done with Docker,

Plugins/AWSLambdaPackager/Plugin.swift

@@ -28,12 +28,19 @@ enum ControlPlaneResponse: Hashable {
     case error(ErrorResponse)
 }
 
-package struct InvocationMetadata: Hashable {
+@usableFromInline
+package struct InvocationMetadata: Hashable, Sendable {
+    @usableFromInline
     package let requestID: String
+    @usableFromInline
     package let deadlineInMillisSinceEpoch: Int64
+    @usableFromInline
     package let invokedFunctionARN: String
+    @usableFromInline
     package let traceID: String
+    @usableFromInline
     package let clientContext: String?
+    @usableFromInline
     package let cognitoIdentity: String?
 
     package init(headers: HTTPHeaders) throws(LambdaRuntimeError) {

Sources/AWSLambdaRuntime/ControlPlaneRequest.swift

@@ -45,6 +45,7 @@ extension Lambda {
     ///     - body: Code to run within the context of the mock server. Typically this would be a Lambda.run function call.
     ///
     /// - note: This API is designed strictly for local testing and is behind a DEBUG flag
+    @usableFromInline
     static func withLocalServer(
         invocationEndpoint: String? = nil,
         _ body: sending @escaping () async throws -> Void
@@ -237,7 +238,7 @@ private struct LambdaHTTPServer {
                         requestHead = head
 
                     case .body(let body):
-                        requestBody = body
+                        requestBody.setOrWriteImmutableBuffer(body)
 
                     case .end:
                         precondition(requestHead != nil, "Received .end without .head")

Sources/AWSLambdaRuntime/Docs.docc/Resources/tutorials/[email protected] renamed to Sources/AWSLambdaRuntime/Docs.docc/Resources/tutorials/[email protected]

@@ -30,6 +30,7 @@ import ucrt
 #endif
 
 public enum Lambda {
+    @inlinable
     package static func runLoop<RuntimeClient: LambdaRuntimeClientProtocol, Handler>(
         runtimeClient: RuntimeClient,
         handler: Handler,

Sources/AWSLambdaRuntime/Lambda+LocalServer.swift

@@ -88,7 +88,7 @@ public struct LambdaContext: CustomDebugStringConvertible, Sendable {
         self.storage.logger
     }
 
-    init(
+    public init(
         requestID: String,
         traceID: String,
         invokedFunctionARN: String,

Sources/AWSLambdaRuntime/Lambda.swift

@@ -27,8 +27,11 @@ import Foundation
 // sadly crashes the compiler today.
 public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: StreamingLambdaHandler {
     // TODO: We want to change this to Mutex as soon as this doesn't crash the Swift compiler on Linux anymore
+    @usableFromInline
     let handlerMutex: NIOLockedValueBox<Handler?>
+    @usableFromInline
     let logger: Logger
+    @usableFromInline
     let eventLoop: EventLoop
 
     public init(
@@ -48,6 +51,7 @@ public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: St
         self.logger.debug("LambdaRuntime initialized")
     }
 
+    @inlinable
     public func run() async throws {
         let handler = self.handlerMutex.withLockedValue { handler in
             let result = handler