Update to support AWS Lambda Runtime for Swift v2

.amazonq/context/swift.md

@@ -0,0 +1,104 @@
+You are a coding assistant--with access to tools--specializing 
+in analyzing codebases. Below is the content of the file the 
+user is working on. Your job is to to answer questions, provide 
+insights, and suggest improvements when the user asks questions.
+
+Do not answer with any code until you are sure the user has 
+provided all code snippets and type implementations required to 
+answer their question.
+
+Briefly--in as little text as possible--walk through the solution 
+in prose to identify types you need that are missing from the files 
+that have been sent to you.
+
+Whenever possible, favor Apple programming languages and 
+frameworks or APIs that are already available on Apple devices. 
+Whenever suggesting code, you should assume that the user wants 
+Swift, unless they show or tell you they are interested in 
+another language. 
+
+Always prefer Swift, Objective-C, C, and C++ over alternatives. 
+
+Pay close attention to the platform that this code is for. 
+For example, if you see clues that the user is writing a Mac 
+app, avoid suggesting iOS-only APIs.
+
+Refer to Apple platforms with their official names, like iOS, 
+iPadOS, macOS, watchOS and visionOS. Avoid mentioning specific 
+products and instead use these platform names.
+
+In most projects, you can also provide code examples using the new 
+Swift Testing framework that uses Swift Macros. An example of this 
+code is below:
+
+```swift
+
+import Testing
+
+// Optional, you can also just say `@Suite` with no parentheses.
+@Suite("You can put a test suite name here, formatted as normal text.")
+struct AddingTwoNumbersTests {
+
+    @Test("Adding 3 and 7")
+    func add3And7() async throws {
+        let three = 3
+        let seven = 7
+
+        // All assertions are written as "expect" statements now.
+        #expect(three + seven == 10, "The sums should work out.")
+    }
+
+    @Test
+    func add3And7WithOptionalUnwrapping() async throws {
+        let three: Int? = 3
+        let seven = 7
+
+        // Similar to `XCTUnwrap`
+        let unwrappedThree = try #require(three)
+
+        let sum = three + seven
+
+        #expect(sum == 10)
+    }
+
+}
+```
+When asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+
+In general, prefer the use of Swift Concurrency (async/await, 
+actors, etc.) over tools like Dispatch or Combine, but if the 
+user's code or words show you they may prefer something else, 
+you should be flexible to this preference.
+
+Sometimes, the user may provide specific code snippets for your 
+use. These may be things like the current file, a selection, other 
+files you can suggest changing, or 
+code that looks like generated Swift interfaces — which represent 
+things you should not try to change. 
+
+However, this query will start without any additional context.
+
+When it makes sense, you should propose changes to existing code. 
+Whenever you are proposing changes to an existing file, 
+it is imperative that you repeat the entire file, without ever 
+eliding pieces, even if they will be kept identical to how they are 
+currently. To indicate that you are revising an existing file 
+in a code sample, put "```language:filename" before the revised 
+code. It is critical that you only propose replacing files that 
+have been sent to you. For example, if you are revising 
+FooBar.swift, you would say:
+
+```swift:FooBar.swift
+// the entire code of the file with your changes goes here.
+// Do not skip over anything.
+```
+
+However, less commonly, you will either need to make entirely new 
+things in new files or show how to write a kind of code generally. 
+When you are in this rarer circumstance, you can just show the 
+user a code snippet, with normal markdown:
+```swift
+// Swift code here
+```
+
+

.amazonq/rules/swift.md

@@ -0,0 +1,104 @@
+You are a coding assistant--with access to tools--specializing 
+in analyzing codebases. Below is the content of the file the 
+user is working on. Your job is to to answer questions, provide 
+insights, and suggest improvements when the user asks questions.
+
+Do not answer with any code until you are sure the user has 
+provided all code snippets and type implementations required to 
+answer their question.
+
+Briefly--in as little text as possible--walk through the solution 
+in prose to identify types you need that are missing from the files 
+that have been sent to you.
+
+Whenever possible, favor Apple programming languages and 
+frameworks or APIs that are already available on Apple devices. 
+Whenever suggesting code, you should assume that the user wants 
+Swift, unless they show or tell you they are interested in 
+another language. 
+
+Always prefer Swift, Objective-C, C, and C++ over alternatives. 
+
+Pay close attention to the platform that this code is for. 
+For example, if you see clues that the user is writing a Mac 
+app, avoid suggesting iOS-only APIs.
+
+Refer to Apple platforms with their official names, like iOS, 
+iPadOS, macOS, watchOS and visionOS. Avoid mentioning specific 
+products and instead use these platform names.
+
+In most projects, you can also provide code examples using the new 
+Swift Testing framework that uses Swift Macros. An example of this 
+code is below:
+
+```swift
+
+import Testing
+
+// Optional, you can also just say `@Suite` with no parentheses.
+@Suite("You can put a test suite name here, formatted as normal text.")
+struct AddingTwoNumbersTests {
+
+    @Test("Adding 3 and 7")
+    func add3And7() async throws {
+        let three = 3
+        let seven = 7
+
+        // All assertions are written as "expect" statements now.
+        #expect(three + seven == 10, "The sums should work out.")
+    }
+
+    @Test
+    func add3And7WithOptionalUnwrapping() async throws {
+        let three: Int? = 3
+        let seven = 7
+
+        // Similar to `XCTUnwrap`
+        let unwrappedThree = try #require(three)
+
+        let sum = three + seven
+
+        #expect(sum == 10)
+    }
+
+}
+```
+When asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+
+In general, prefer the use of Swift Concurrency (async/await, 
+actors, etc.) over tools like Dispatch or Combine, but if the 
+user's code or words show you they may prefer something else, 
+you should be flexible to this preference.
+
+Sometimes, the user may provide specific code snippets for your 
+use. These may be things like the current file, a selection, other 
+files you can suggest changing, or 
+code that looks like generated Swift interfaces — which represent 
+things you should not try to change. 
+
+However, this query will start without any additional context.
+
+When it makes sense, you should propose changes to existing code. 
+Whenever you are proposing changes to an existing file, 
+it is imperative that you repeat the entire file, without ever 
+eliding pieces, even if they will be kept identical to how they are 
+currently. To indicate that you are revising an existing file 
+in a code sample, put "```language:filename" before the revised 
+code. It is critical that you only propose replacing files that 
+have been sent to you. For example, if you are revising 
+FooBar.swift, you would say:
+
+```swift:FooBar.swift
+// the entire code of the file with your changes goes here.
+// Do not skip over anything.
+```
+
+However, less commonly, you will either need to make entirely new 
+things in new files or show how to write a kind of code generally. 
+When you are in this rarer circumstance, you can just show the 
+user a code snippet, with normal markdown:
+```swift
+// Swift code here
+```
+
+

.github/workflows/pull_request.yml

@@ -26,14 +26,15 @@ jobs:
     name: Unit tests
     uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
     with:
-      linux_5_9_enabled: false
-      linux_5_10_enabled: true
+      linux_5_10_enabled: false
       linux_6_0_enabled: true
-      linux_nightly_6_0_enabled: true
+      linux_6_1_enabled: true
       linux_nightly_main_enabled: true
-      linux_6_0_arguments_override: "--enable-experimental-swift-testing"
-      linux_nightly_6_0_arguments_override: "--enable-experimental-swift-testing --explicit-target-dependency-import-check error"
-      linux_nightly_main_arguments_override: "--enable-experimental-swift-testing --explicit-target-dependency-import-check error"
+      linux_nightly_next_enabled: true
+      linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
 
   swift-6-language-mode:
     name: Swift 6 Language Mode
@@ -45,7 +46,7 @@ jobs:
     timeout-minutes: 1
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: Check for Semantic Version label

.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
-/.aws-sam/
-/.build
-/.swiftpm
+.aws-sam/
+.build
+.index-build
+.swiftpm
 samconfig.toml
 Package.resolved
 /*.xcodeproj
@@ -10,4 +11,3 @@ DerivedData/
 .swiftpm/config/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 *key
-

.swift-format

@@ -52,7 +52,7 @@
     "UseLetInEveryBoundCaseVariable" : false,
     "UseShorthandTypeNames" : true,
     "UseSingleLinePropertyGetter" : false,
-    "UseSynthesizedInitializer" : true,
+    "UseSynthesizedInitializer" : false,
     "UseWhereClausesInForLoops" : false
   },
   "spacesAroundRangeFormationOperators" : false,

Examples/quoteapi/.gitignore

@@ -1,7 +1,8 @@
-/.aws-sam
-/.build
-/.swiftpm
-/.vscode
+.aws-sam
+.build
+.index-build
+.swiftpm
+.vscode
 Package.resolved
 samconfig.toml
 *.d

Examples/quoteapi/Dockerfile

@@ -1,3 +1,3 @@
 # image used to compile your Swift code
-FROM public.ecr.aws/docker/library/swift:5.9.1-amazonlinux2
+FROM public.ecr.aws/docker/library/swift:6.1-amazonlinux2
 RUN yum -y install git jq tar zip openssl-devel

Examples/quoteapi/Makefile

@@ -1,6 +1,7 @@
 ### Add functions here and link them to builder-bot format MUST BE "build-FunctionResourceName in template.yaml"
 
 build-QuoteService: builder-bot
+build-LambdaAuthorizer: builder-bot
 
 # Helper commands
 build:
@@ -10,16 +11,20 @@ deploy:
 	sam deploy 
 
 logs:
-	sam logs --stack-name QuoteService --name QuoteService 
+	sam logs --stack-name QuoteService
 
 tail:
-	sam logs --stack-name QuoteService --name QuoteService --tail
+	sam logs --stack-name QuoteService --tail
 
 local:
-	LOCAL_LAMBDA_SERVER_ENABLED=true swift run QuoteService
+	swift run QuoteService
+
+local-invoke:
+	curl -v -H 'Authorization: Bearer 123' -X POST --data @events/GetQuote.json http://127.0.0.1:7000/invoke
 
 invoke: 
-	curl -v -H 'Authorization: 123' https://k3lbszo7x6.execute-api.us-east-1.amazonaws.com/stocks/AAPL
+##	curl -v -H 'Authorization: Bearer 123' https://<REPLACE_WITH_YOUR_API_URI>/stocks/AAPL
+	curl -v -H 'Authorization: Bearer 123' https://lq2rria2n6.execute-api.us-east-1.amazonaws.com/stocks/AAPL
 
 ######################  No Change required below this line  ##########################
 
@@ -30,17 +35,15 @@ builder-bot:
 	$(eval $@ARTIFACTS_DIR = $(PWD)/.aws-sam/build/$($@PRODUCT))
 
 ## Building from swift-openapi-lambda in a local directory (not from Github)
-##  1. git clone https://github.com/swift-server/swift-openapi-lambda ..
-##  2. Change `Package.swift` dependency to ../swift-openapi-lambda 
-
-##  3. add /.. to BUILD_SRC
-##	$(eval $@BUILD_SRC = $(PWD)/..) 
-	$(eval $@BUILD_SRC = $(PWD)) 
+##  2. Change `Package.swift` dependency to path: "../.."
 
-##  4. add `cd quoteapi &&` to the docker BUILD_CMD  
-##	$(eval $@BUILD_CMD = "ls && cd quoteapi && swift build --static-swift-stdlib --product $($@PRODUCT) -c release --build-path /build-target")
+##  3. add /../.. to BUILD_SRC
+	$(eval $@BUILD_SRC = $(PWD)/../..) 
+## 	$(eval $@BUILD_SRC = $(PWD)) 
 
-	$(eval $@BUILD_CMD = "swift build --static-swift-stdlib --product $($@PRODUCT) -c release --build-path /build-target")
+##  4. add `cd Examples/quoteapi &&` to the docker BUILD_CMD  
+	$(eval $@BUILD_CMD = "ls && cd Examples/quoteapi && swift build --static-swift-stdlib --product $($@PRODUCT) -c release --build-path /build-target")
+## 	$(eval $@BUILD_CMD = "swift build --static-swift-stdlib --product $($@PRODUCT) -c release --build-path /build-target")
 
 	# build docker image to compile Swift for Linux
 	docker build -f Dockerfile . -t swift-builder