Swift 6

Author: adam-fowler

.github/workflows/api-breakage.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     container:
-      image: swift:5.10
+      image: swift:latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/benchmark.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.10'
+          - 'swift:latest'
     container:
       image: ${{ matrix.image }}
     steps:

.github/workflows/ci.yml

@@ -40,10 +40,9 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.8'
           - 'swift:5.9'
           - 'swift:5.10'
-          - 'swiftlang/swift:nightly-jammy'
+          - 'swift:6.0'
     container:
       image: ${{ matrix.image }}
     steps:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Soto for AWS open source project

Sources/SotoCore/HTTP/AWSHTTPBody.swift

@@ -51,6 +51,10 @@ public struct AWSHTTPBody: Sendable {
         self.storage = .asyncSequence(sequence: .init(asyncSequence), length: length)
     }
 
+    public init<BufferSequence: AsyncSequence & Sendable>(asyncSequence: BufferSequence, length: Int?) where BufferSequence.Element: Collection<UInt8> & Sendable {
+        self.storage = .asyncSequence(sequence: .init(asyncSequence.map { .init(bytes: $0) }), length: length)
+    }
+
     public func collect(upTo length: Int) async throws -> ByteBuffer {
         switch self.storage {
         case .byteBuffer(let buffer):

Sources/SotoTestUtils/TestUtils.swift

@@ -141,4 +141,4 @@ public func withTeardown<Value>(_ process: () async throws -> Value, teardown: (
     }
     await teardown()
     return result
-}
+}

Tests/SotoCoreTests/AWSClientTests.swift

@@ -52,42 +52,43 @@ class AWSClientTests: XCTestCase {
         let awsServer = AWSTestServer(serviceProtocol: .json)
         let elg = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         let httpClient = HTTPClient(eventLoopGroupProvider: .shared(elg))
-        defer {
+        try await withTeardown {
+            let config = createServiceConfig(
+                serviceProtocol: .json(version: "1.1"),
+                endpoint: awsServer.address
+            )
+            let client = createAWSClient(
+                credentialProvider: .static(accessKeyId: "foo", secretAccessKey: "bar"),
+                httpClient: httpClient
+            )
+            defer {
+                XCTAssertNoThrow(try client.syncShutdown())
+            }
+            async let responseTask: AWSTestServer.HTTPBinResponse = client.execute(
+                operation: "test",
+                path: "/",
+                httpMethod: .POST,
+                serviceConfig: config,
+                input: Input(content: "test"),
+                logger: TestEnvironment.logger
+            )
+
+            XCTAssertNoThrow(try awsServer.httpBin())
+
+            let httpBinResponse = try await responseTask
+            let httpHeaders = HTTPHeaders(httpBinResponse.headers.map { ($0, $1) })
+
+            XCTAssertEqual(httpHeaders["content-length"].first, "18")
+            XCTAssertEqual(httpHeaders["content-type"].first, "application/x-amz-json-1.1")
+            XCTAssertNotNil(httpHeaders["authorization"].first)
+            XCTAssertNotNil(httpHeaders["x-amz-date"].first)
+            XCTAssertEqual(httpHeaders["user-agent"].first, "Soto/6.0")
+            XCTAssertEqual(httpHeaders["host"].first, "localhost:\(awsServer.serverPort)")
+        } teardown: {
             try? awsServer.stop()
-            try? httpClient.syncShutdown()
-            try? elg.syncShutdownGracefully()
-        }
-        let config = createServiceConfig(
-            serviceProtocol: .json(version: "1.1"),
-            endpoint: awsServer.address
-        )
-        let client = createAWSClient(
-            credentialProvider: .static(accessKeyId: "foo", secretAccessKey: "bar"),
-            httpClient: httpClient
-        )
-        defer {
-            XCTAssertNoThrow(try client.syncShutdown())
+            try? await httpClient.shutdown()
+            try? await elg.shutdownGracefully()
         }
-        async let responseTask: AWSTestServer.HTTPBinResponse = client.execute(
-            operation: "test",
-            path: "/",
-            httpMethod: .POST,
-            serviceConfig: config,
-            input: Input(content: "test"),
-            logger: TestEnvironment.logger
-        )
-
-        XCTAssertNoThrow(try awsServer.httpBin())
-
-        let httpBinResponse = try await responseTask
-        let httpHeaders = HTTPHeaders(httpBinResponse.headers.map { ($0, $1) })
-
-        XCTAssertEqual(httpHeaders["content-length"].first, "18")
-        XCTAssertEqual(httpHeaders["content-type"].first, "application/x-amz-json-1.1")
-        XCTAssertNotNil(httpHeaders["authorization"].first)
-        XCTAssertNotNil(httpHeaders["x-amz-date"].first)
-        XCTAssertEqual(httpHeaders["user-agent"].first, "Soto/6.0")
-        XCTAssertEqual(httpHeaders["host"].first, "localhost:\(awsServer.serverPort)")
     }
 
     func testClientNoInputNoOutput() async throws {