Migrate Examples to runtime 3.x

.github/workflows/integration_tests.yml

@@ -42,7 +42,7 @@ on:
       matrix_linux_swift_container_image:
         type: string
         description: "Container image for the matrix test jobs. Defaults to Swift 6.4"
-        default: "swiftlang/swift:nightly-6.4.x-bookworm"
+        default: "swift:6.4-noble"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:

.github/workflows/pull_request.yml

@@ -15,9 +15,9 @@ jobs:
       license_header_check_project_name: "SwiftAWSLambdaRuntime"
       shell_check_enabled: true
       python_lint_check_enabled: true
-      api_breakage_check_container_image: "swiftlang/swift:nightly-6.4.x-bookworm"
-      docs_check_container_image: "swiftlang/swift:nightly-6.4.x-bookworm"
-      format_check_container_image: "swiftlang/swift:nightly-6.4.x-bookworm"
+      api_breakage_check_container_image: "swift:6.4-noble"
+      docs_check_container_image: "swift:6.4-noble"
+      format_check_container_image: "swift:6.4-noble"
       yamllint_check_enabled: true
       docs_check_enabled: true
 

Examples/APIGatewayV1/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/APIGatewayV2+LambdaAuthorizer/Package.swift

@@ -13,7 +13,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/APIGatewayV2/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/BackgroundTasks/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/CDK/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/HelloJSON/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/HelloWorld/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/HelloWorldNoTraits/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/JSONLogging/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.11.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/ManagedInstances/Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/MultiSourceAPI/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/MultiTenant/Package.swift

@@ -13,7 +13,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/OCIImage/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.12.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/ResourcesPackaging/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         .executableTarget(

Examples/S3EventNotifier/Package.swift

@@ -8,7 +8,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/S3_AWSSDK/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
         .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "1.0.0"),

Examples/S3_Soto/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
         .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0"),

Examples/ServiceLifecycle+Postgres/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.4.0"),
         .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.30.0"),

Examples/Streaming+APIGateway/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],
     targets: [

Examples/Streaming+Codable/Package.swift

@@ -23,7 +23,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/Streaming+FunctionUrl/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/Testing/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../.."),
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0"),
 
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "1.0.0"),
     ],

Examples/Tutorial/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         // For local development, uncomment the line below and comment the remote dependency:
         // .package(name: "swift-aws-lambda-runtime", path: "../..")
 
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.9.0")
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "3.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Examples/_MyFirstFunction/create_function.sh

@@ -39,8 +39,8 @@ echo "⚡️ Create your Swift command line project"
 swift package init --type executable --name MyLambda
 
 echo "📦 Add the AWS Lambda Swift runtime to your project"
-swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --branch main
-swift package add-dependency https://github.com/swift-server/swift-aws-lambda-events.git --branch main
+swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --from 3.0.0
+swift package add-dependency https://github.com/swift-server/swift-aws-lambda-events.git --from 3.0.0
 swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime
 swift package add-target-dependency AWSLambdaEvents MyLambda --package swift-aws-lambda-events
 

scripts/integration-test.sh

@@ -36,7 +36,7 @@ set -euo pipefail
 # Configuration
 # ---------------------------------------------------------------------------
 
-FUNCTION_NAME="swift-lambda-e2e-test-$(date +%s)"
+FUNCTION_NAME="SwiftLambdaE2ERest$(date +%s)"
 AWS_REGION="us-east-1"
 CLEANUP_NEEDED=false
 WORK_DIR=""
@@ -131,7 +131,7 @@ scaffold_project() {
             return
         fi
     else
-        WORK_DIR=$(mktemp -d -t "swift-lambda-e2e-XXXXXX")
+        WORK_DIR=$(mktemp -d -t "SwiftLambdaE2E")
         log "  Working directory: ${WORK_DIR}"
     fi
 
@@ -142,15 +142,15 @@ scaffold_project() {
 
     # Add macOS 15 platform requirement (needed by AWSLambdaRuntime)
     # Use -i.bak (works on both BSD/macOS and GNU/Linux sed) and remove the backup.
-    sed -i.bak 's/name: "'"${FUNCTION_NAME}"'",/name: "'"${FUNCTION_NAME}"'",\n    platforms: [.macOS(.v15)],/' Package.swift
+    sed -i.bak 's/name: "'"${FUNCTION_NAME}"'"\n    "target:",/name: "'"${FUNCTION_NAME}"'",\n    platforms: [.macOS(.v15)],\n    target:/' Package.swift
     rm -f Package.swift.bak
 
     # Add the lambda runtime dependency
-    swift package add-dependency https://github.com/swift-server/swift-aws-lambda-runtime.git --branch sebsto/new-plugins
+    swift package add-dependency https://github.com/awslabs/swift-aws-lambda-runtime.git --from 3.0.0
     swift package add-target-dependency AWSLambdaRuntime "${FUNCTION_NAME}" --package swift-aws-lambda-runtime
 
     # Also add AWSLambdaEvents for the URL template
-    swift package add-dependency https://github.com/swift-server/swift-aws-lambda-events.git --branch main
+    swift package add-dependency https://github.com/awslabs/swift-aws-lambda-events.git --from 1.0.0
     swift package add-target-dependency AWSLambdaEvents "${FUNCTION_NAME}" --package swift-aws-lambda-events
 
     log "  Swift package initialized."
@@ -191,7 +191,7 @@ build_function() {
         return
     fi
 
-    swift package --allow-network-connections docker lambda-build --products "${FUNCTION_NAME}"
+    swift package --disable-sandbox lambda-build --cross-compile container --products "${FUNCTION_NAME}"
 
     log "  Build and packaging complete."
 }