Support for Swift 6 (#15)

Author: Andrea-Scuderi

.github/workflows/build-examples.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - swift:5.10.1-amazonlinux2
+          - swift:6.1.2-amazonlinux2
     services:
       localstack:
         image: localstack/localstack
@@ -46,12 +46,12 @@ jobs:
       - name: Build ItemAPI
         run: |
           cd $GITHUB_WORKSPACE/src/Examples/ItemAPI/BreezeItemAPI
-          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache
+          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache --allow-network-connections docker
       - name: Build WebHook
         run: |
           cd $GITHUB_WORKSPACE/src/Examples/Webhook/BreezeWebHook
-          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache
+          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache --allow-network-connections docker
       - name: Build GitHubWebHook
         run: |
           cd $GITHUB_WORKSPACE/src/Examples/GitHubWebhook/BreezeGitHubWebHook
-          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache
+          swift package archive -c release --cache-path $GITHUB_WORKSPACE/cache --allow-network-connections docker

.github/workflows/meterian.yml renamed to .github/workflows/meterian.yml.disabled

@@ -18,9 +18,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - swift:5.7.3
-          - swift:5.8.1
-          - swift:5.9.2
+          - swift:6.1.2
           - swift:5.10.1
     services:
       localstack:

.github/workflows/swift-test.yml

@@ -0,0 +1,22 @@
+{
+    "configurations": [
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:Breeze}",
+            "name": "Debug breeze",
+            "program": "${workspaceFolder:Breeze}/.build/debug/breeze",
+            "preLaunchTask": "swift: Build Debug breeze"
+        },
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:Breeze}",
+            "name": "Release breeze",
+            "program": "${workspaceFolder:Breeze}/.build/release/breeze",
+            "preLaunchTask": "swift: Build Release breeze"
+        }
+    ]
+}

.vscode/launch.json

@@ -71,15 +71,15 @@ Refer to the [DynamoDB documentation](https://docs.aws.amazon.com/amazondynamodb
 To package the Lambda is required to create a Swift Package using the following `Package.swift` file.
 
 ```swift
-// swift-tools-version:5.7
+// swift-tools-version:6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "swift-breeze-item-api",
     platforms: [
-        .macOS(.v13),
+        .macOS(.v15),
     ],
     products: [
         .executable(name: "ItemAPI", targets: ["ItemAPI"]),
@@ -97,7 +97,6 @@ let package = Package(
         )
     ]
 )
-
 ```
 
 To be executed on a Lambda, the package needs to be built on `AmazonLinux2` and deployed.

Docs/GenerateLambdaAPI.md

@@ -1,20 +1,20 @@
-// swift-tools-version:5.7
+// swift-tools-version:6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "BreezeGitHubWebHook",
     platforms: [
-        .macOS(.v13),
+        .macOS(.v15),
     ],
     products: [
         .executable(name: "GitHubWebHook", targets: ["GitHubWebHook"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-crypto.git", from: "1.0.0"),
-        .package(url: "https://github.com/swift-serverless/BreezeLambdaWebHook.git", from: "0.5.0"),
-        .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.2")
+        .package(url: "https://github.com/swift-serverless/BreezeLambdaWebHook.git", branch: "main"),
+        .package(url: "https://github.com/andrea-scuderi/swift-aws-lambda-runtime.git", branch: "main"),
     ],
     targets: [
         .executableTarget(

Examples/GitHubWebhook/BreezeGitHubWebHook/Package.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 import AWSLambdaEvents
-import AWSLambdaRuntimeCore
+import AWSLambdaRuntime
 import BreezeLambdaWebHook
 
 enum GitHubWebHookError: Error {
@@ -31,7 +31,7 @@ class GitHubWebHook: BreezeLambdaWebHookHandler {
         self.handlerContext = handlerContext
     }
 
-    private func validateGitHubSignature(context: AWSLambdaRuntimeCore.LambdaContext, event: AWSLambdaEvents.APIGatewayV2Request) throws -> String {
+    private func validateGitHubSignature(context: LambdaContext, event: AWSLambdaEvents.APIGatewayV2Request) throws -> String {
         guard let key = Lambda.env("WEBHOOK_SECRET") else {
             throw GitHubWebHookError.invalidKey
         }
@@ -47,7 +47,7 @@ class GitHubWebHook: BreezeLambdaWebHookHandler {
         return payload
     }
 
-    func handle(context: AWSLambdaRuntimeCore.LambdaContext, event: AWSLambdaEvents.APIGatewayV2Request) async -> AWSLambdaEvents.APIGatewayV2Response {
+    func handle(_ event: APIGatewayV2Request, context: LambdaContext) async -> APIGatewayV2Response {
         do {
             context.logger.info("event: \(event)")
             let payload = try validateGitHubSignature(context: context, event: event)

Examples/GitHubWebhook/BreezeGitHubWebHook/Sources/GitHubWebHook/GitHubWebHook.swift

@@ -14,7 +14,8 @@
 
 import Foundation
 import AWSLambdaEvents
-import AWSLambdaRuntimeCore
+import AWSLambdaRuntime
 import BreezeLambdaWebHook
+import Logging
 
-BreezeLambdaWebHook<GitHubWebHook>.main()
+try await BreezeLambdaWebHook<GitHubWebHook>(name:"GitHubWebHook").run()

Examples/GitHubWebhook/BreezeGitHubWebHook/Sources/GitHubWebHook/main.swift

@@ -1,3 +1,3 @@
-FROM swift:5.10.1-amazonlinux2 as builder
+FROM swift:6.1.2-amazonlinux2 as builder
 RUN yum -y update && \
     yum -y install git zip

Examples/GitHubWebhook/Dockerfile

@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-SWIFT_VERSION=5.10.1
+SWIFT_VERSION=6.1.2
 SWIFT_DOCKER_IMAGE=swift-amazonlinux2-builder:$(SWIFT_VERSION)
 SWIFT_CONFIGURATION=release
 
@@ -32,7 +32,7 @@ archive_lambda: create_build_directory
 		--volume "$(MOUNT_ROOT)/:/src" \
 		--workdir "/src/$(DOCKER_PROJECT_PATH)" \
 		$(SWIFT_DOCKER_IMAGE) \
-		/bin/bash -c "swift package archive -c $(SWIFT_CONFIGURATION) --verbose --output-path /src/$(DOCKER_BUILD_PATH)"
+		/bin/bash -c "swift package archive -c $(SWIFT_CONFIGURATION) --verbose --output-path /src/$(DOCKER_BUILD_PATH) --allow-network-connections docker"
 
 build_lambda:
 	docker run \