Merge branch 'main' into sebsto/example_test

Author: sebsto

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

@@ -0,0 +1,37 @@
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftAWSLambdaRuntime open source project
+##
+## Copyright (c) 2017-2024 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+EXAMPLE=HelloWorld
+OUTPUT_DIR=.build/plugins/AWSLambdaPackager/outputs/AWSLambdaPackager
+OUTPUT_FILE=${OUTPUT_DIR}/MyLambda/bootstrap
+ZIP_FILE=${OUTPUT_DIR}/MyLambda/MyLambda.zip
+
+pushd Examples/${EXAMPLE} || exit 1
+
+# package the example (docker and swift toolchain are installed on the GH runner)
+LAMBDA_USE_LOCAL_DEPS=../.. swift package archive --allow-network-connections docker || exit 1
+
+# did the plugin generated a Linux binary?
+[ -f "${OUTPUT_FILE}" ]
+file "${OUTPUT_FILE}" | grep --silent ELF
+
+# did the plugin created a ZIP file?
+[ -f "${ZIP_FILE}" ]
+
+# does the ZIP file contain the bootstrap?
+unzip -l "${ZIP_FILE}" | grep --silent bootstrap
+
+echo "✅ The archive plugin is OK"
+popd || exit 1

scripts/integration_tests.sh renamed to .github/workflows/scripts/integration_tests.sh

@@ -29,7 +29,7 @@ let package = Package(
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
                 .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-events"),
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Examples/APIGateway/Package.swift

@@ -15,13 +15,6 @@
 import AWSLambdaEvents
 import AWSLambdaRuntime
 
-#if canImport(FoundationEssentials)
-import FoundationEssentials
-#else
-import Foundation
-#endif
-
-let encoder = JSONEncoder()
 let runtime = LambdaRuntime {
     (event: APIGatewayV2Request, context: LambdaContext) -> APIGatewayV2Response in
 
@@ -31,10 +24,7 @@ let runtime = LambdaRuntime {
     header["content-type"] = "application/json"
 
     // echo the request in the response
-    let data = try encoder.encode(event)
-    let response = String(decoding: data, as: Unicode.UTF8.self)
-
-    return APIGatewayV2Response(statusCode: .ok, headers: header, body: response)
+    return try APIGatewayV2Response(statusCode: .ok, headers: header, encodableBody: event)
 }
 
 try await runtime.run()

Examples/APIGateway/Sources/main.swift

@@ -27,7 +27,7 @@ let package = Package(
             dependencies: [
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime")
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Examples/BackgroundTasks/Package.swift

@@ -29,7 +29,7 @@ let package = Package(
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
                 .product(name: "AWSLambdaEvents", package: "swift-aws-lambda-events"),
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Examples/CDK/Package.swift

@@ -27,7 +27,7 @@ let package = Package(
             dependencies: [
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime")
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Examples/HelloWorld/Package.swift

@@ -27,7 +27,7 @@ let package = Package(
             dependencies: [
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime")
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Examples/Streaming/Package.swift

@@ -20,7 +20,7 @@ let package = Package(
             dependencies: [
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime")
             ],
-            path: "."
+            path: "Sources"
         )
     ]
 )

Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-02-05-package.swift

@@ -45,7 +45,7 @@ let package = Package(
             dependencies: [
                 .product(name: "AWSLambdaRuntime", package: "swift-aws-lambda-runtime"),
             ],
-            path: "."
+            path: "Sources"
         ),
     ]
 )