Swift 6 (#617)

* Swift 6

* swift format

* fix timestamp test

* More timestamp fixes

* Move client shutdown in testHeadersAreWritten to teardown

* swift format version

* Update contributing

* timestamp tests

* Update contributing.md

* Remove text about slack

* try #if compiler

.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:

.github/workflows/validate.yml

@@ -15,6 +15,6 @@ jobs:
     - name: Install Dependencies
       run: |
         brew install mint
-        mint install nicklockwood/swiftformat@0.48.17 --no-link
+        mint install nicklockwood/swiftformat@0.53.10 --no-link
     - name: run script
       run: ./scripts/validate.sh

.swiftformat

@@ -1,14 +1,14 @@
 # Minimum swiftformat version
---minversion 0.51.0
+--minversion 0.53.10
 
 # Swift version
---swiftversion 5.8
+--swiftversion 6.0
 
 # file options
 --exclude .build
 
 # rules
---disable redundantReturn, extensionAccessControl, typeSugar
+--disable redundantReturn, extensionAccessControl, typeSugar, conditionalAssignment, preferForLoop, redundantInternal, redundantStaticSelf
 
 # format options
 --ifdef no-indent

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Legal
 By submitting a pull request, you represent that you have the right to license your contribution to the community, and agree by submitting the patch
-that your contributions are licensed under the Apache 2.0 license (see [LICENSE](LICENSE.txt)).
+that your contributions are licensed under the Apache 2.0 license (see [LICENSE](LICENSE)).
 
 ## Contributor Conduct
 All contributors are expected to adhere to the project's [Code of Conduct](CODE_OF_CONDUCT.md).
@@ -28,7 +28,7 @@ The main development branch of the repository is  `main`. Each major version rel
 
 ### Formatting
 
-We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.51.15.
+We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.53.10.
 
 All new files need to include the following file header at the top
 ```swift
@@ -47,7 +47,3 @@ All new files need to include the following file header at the top
 //===----------------------------------------------------------------------===//
 ```
 Please ensure the dates are correct in the header.
-
-## Community
-
-You can also contribute by becoming an active member of the Soto community.  Join us on the soto-aws [slack](https://join.slack.com/t/soto-project/shared_invite/zt-juqk6l9w-z9zruW5pjlod4AscdWlz7Q).

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/Credential/ConfigFileLoader.swift

@@ -167,8 +167,7 @@ enum ConfigFileLoader {
                 return .assumeRole(roleArn: roleArn, sessionName: sessionName, region: region, sourceCredentialProvider: provider)
             }
             // If `credental_source` is defined, temporary credentials must be loaded from source
-            else if let credentialSource = credentials.credentialSource ?? config?.credentialSource
-            {
+            else if let credentialSource = credentials.credentialSource ?? config?.credentialSource {
                 let provider: CredentialProviderFactory
                 switch credentialSource {
                 case .environment:

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/SotoCore/Utils/crc32.swift

@@ -126,8 +126,7 @@ let crc32cTable: [CRC32] =
         0xAD7D_5351,
     ]
 
-private func crc32_with_table(crc: CRC32, buffer: UnsafeBufferPointer<UInt8>, table: [CRC32]) -> CRC32
-{
+private func crc32_with_table(crc: CRC32, buffer: UnsafeBufferPointer<UInt8>, table: [CRC32]) -> CRC32 {
     // use unsafe buffer pointer to avoid array bounds checking on table
     return table.withUnsafeBufferPointer { table in
         var crc = crc

Sources/SotoTestUtils/TestServer.swift

@@ -267,6 +267,7 @@ extension AWSTestServer {
                     "Content-Type": "application/json",
                 ]
                 return .result(.init(httpStatus: .ok, headers: headers, body: responseBody), continueProcessing: false)
+
             default:
                 return .error(.badRequest, continueProcessing: false)
             }
@@ -431,6 +432,7 @@ extension AWSTestServer {
                 if case .none = status {
                     status = .finished
                 }
+
             case .finished:
                 throw Error.corruptChunkedData
             }

Tests/SotoCoreTests/AWSClientTests.swift

@@ -52,42 +52,41 @@ class AWSClientTests: XCTestCase {
         let awsServer = AWSTestServer(serviceProtocol: .json)
         let elg = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         let httpClient = HTTPClient(eventLoopGroupProvider: .shared(elg))
-        defer {
-            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())
-        }
-        async let responseTask: AWSTestServer.HTTPBinResponse = client.execute(
-            operation: "test",
-            path: "/",
-            httpMethod: .POST,
-            serviceConfig: config,
-            input: Input(content: "test"),
-            logger: TestEnvironment.logger
-        )
+        try await withTeardown {
+            let config = createServiceConfig(
+                serviceProtocol: .json(version: "1.1"),
+                endpoint: awsServer.address
+            )
+            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())
+            XCTAssertNoThrow(try awsServer.httpBin())
 
-        let httpBinResponse = try await responseTask
-        let httpHeaders = HTTPHeaders(httpBinResponse.headers.map { ($0, $1) })
+            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)")
+            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? await client.shutdown()
+            try? await httpClient.shutdown()
+            try? await elg.shutdownGracefully()
+        }
     }
 
     func testClientNoInputNoOutput() async throws {