more sendables

dayaffe · dayaffe · commit 0890f1c8d6c9 · 2025-04-14T11:26:06.000-04:00
diff --git a/AWSSDKSwiftCLI/tmp/aws-sdk-swift-or-smithy-swift/Package.version b/AWSSDKSwiftCLI/tmp/aws-sdk-swift-or-smithy-swift/Package.version
@@ -0,0 +1 @@
+1.2.4
diff --git a/AWSSDKSwiftCLI/tmp/aws-sdk-swift-or-smithy-swift/Package.version.next b/AWSSDKSwiftCLI/tmp/aws-sdk-swift-or-smithy-swift/Package.version.next
@@ -0,0 +1 @@
+1.2.5
diff --git a/AWSSDKSwiftCLI/tmp/build-request.json b/AWSSDKSwiftCLI/tmp/build-request.json
@@ -0,0 +1 @@
+{"features":[]}
diff --git a/AWSSDKSwiftCLI/tmp/feature-service-id.json b/AWSSDKSwiftCLI/tmp/feature-service-id.json
@@ -0,0 +1 @@
+{}
diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 //
 // Copyright Amazon.com Inc. or its affiliates.
diff --git a/PerformanceTests/Package.swift b/PerformanceTests/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/SPRCLI/Package.swift b/SPRCLI/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSClientRuntime/Package.swift.txt b/Sources/Core/AWSClientRuntime/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/AccountIDEndpointMode.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Endpoints/AccountIDEndpointMode.swift
@@ -6,7 +6,7 @@
 //
 
 /// Determines how & whether an account ID-based endpoint will be used for requests.
-public enum AccountIDEndpointMode: String, Equatable {
+public enum AccountIDEndpointMode: String, Equatable, Sendable {
     // Note : these case names match string values for the accountIdEndpointMode endpoint param.
     // Do not rename them
 
diff --git a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
@@ -475,3 +475,5 @@ func XCTAssertThrowsErrorAsync(
         block(error)
     }
 }
+
+extension SigningConfig: @retroactive @unchecked Sendable {}
diff --git a/Sources/Core/AWSSDKChecksums/Package.swift.txt b/Sources/Core/AWSSDKChecksums/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSSDKChecksums/Sources/AWSSDKChecksums/AWSChecksumCalculationMode.swift b/Sources/Core/AWSSDKChecksums/Sources/AWSSDKChecksums/AWSChecksumCalculationMode.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-public enum AWSChecksumCalculationMode: String {
+public enum AWSChecksumCalculationMode: String, Sendable {
     case whenRequired = "when_required"
     case whenSupported = "when_supported"
 
diff --git a/Sources/Core/AWSSDKCommon/Package.swift.txt b/Sources/Core/AWSSDKCommon/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSSDKEventStreamsAuth/Package.swift.txt b/Sources/Core/AWSSDKEventStreamsAuth/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSSDKEventStreamsAuth/Sources/AWSSSDKEventStreamsAuth/AWSMessageSigner.swift b/Sources/Core/AWSSDKEventStreamsAuth/Sources/AWSSSDKEventStreamsAuth/AWSMessageSigner.swift
@@ -15,7 +15,7 @@ import struct Smithy.Attributes
 import struct Smithy.AttributeKey
 
 /// Signs a `Message` using the AWS SigV4 signing algorithm
-public class AWSMessageSigner: MessageSigner {
+public class AWSMessageSigner: MessageSigner, @unchecked Sendable {
     let encoder: MessageEncoder
     let signer: () async throws -> MessageDataSigner
     let signingConfig: () async throws -> AWSSigningConfig
diff --git a/Sources/Core/AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests/TestCustomAWSCredentialIdentityResolver.swift b/Sources/Core/AWSSDKEventStreamsAuth/Tests/AWSSDKEventStreamsAuthTests/TestCustomAWSCredentialIdentityResolver.swift
@@ -8,7 +8,7 @@
 import Smithy
 import SmithyIdentity
 
-class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver {
+class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver, @unchecked Sendable {
     let credentials: AWSCredentialIdentity
 
     init(credentials: AWSCredentialIdentity) {
diff --git a/Sources/Core/AWSSDKHTTPAuth/Package.swift.txt b/Sources/Core/AWSSDKHTTPAuth/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift b/Sources/Core/AWSSDKHTTPAuth/Sources/AWSSDKHTTPAuth/AWSSigV4Signer.swift
@@ -32,7 +32,7 @@ import struct Foundation.TimeInterval
 import struct Foundation.URL
 import AWSSDKChecksums
 
-public class AWSSigV4Signer: SmithyHTTPAuthAPI.Signer {
+public class AWSSigV4Signer: SmithyHTTPAuthAPI.Signer, @unchecked Sendable {
 
     public init() {}
 
diff --git a/Sources/Core/AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests/SigV4SigningTests.swift b/Sources/Core/AWSSDKHTTPAuth/Tests/AWSSDKHTTPAuthTests/SigV4SigningTests.swift
@@ -302,7 +302,7 @@ class Sigv4SigningTests: XCTestCase {
     }
 }
 
-class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver {
+class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver, @unchecked Sendable {
     let credentials: AWSCredentialIdentity
     
     init(credentials: AWSCredentialIdentity) {
diff --git a/Sources/Core/AWSSDKIdentity/Package.swift.txt b/Sources/Core/AWSSDKIdentity/Package.swift.txt
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests/AWSCredentialIdentityResolverTests/CachedAWSCredentialIdentityResolverTests.swift b/Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests/AWSCredentialIdentityResolverTests/CachedAWSCredentialIdentityResolverTests.swift
@@ -10,13 +10,25 @@ import struct AWSSDKIdentity.CachedAWSCredentialIdentityResolver
 
 class CachedAWSCredentialIdentityResolverTests: XCTestCase {
 
+    actor Counter {
+        private var value: Int = 0
+
+        func increment() {
+            value += 1
+        }
+
+        func get() -> Int {
+            return value
+        }
+    }
+
     func testGetIdentity() async throws {
-        var counter: Int = 0
+        let counter = Counter()
         let accessKey = UUID().uuidString
         let secret = UUID().uuidString
         let accountID = UUID().uuidString
         let coreProvider = MockAWSCredentialIdentityResolver {
-            counter += 1
+            await counter.increment()
             return .init(accessKey: accessKey, secret: secret, accountID: accountID)
         }
         let subject = try CachedAWSCredentialIdentityResolver(
@@ -30,13 +42,15 @@ class CachedAWSCredentialIdentityResolverTests: XCTestCase {
         _ = try await subject.getIdentity()
 
         // Counter is 1 because the last three accesses use cached credentials
-        XCTAssertEqual(counter, 1)
+        let finalCount = await counter.get()
+        XCTAssertEqual(finalCount, 1)
 
         try! await Task.sleep(nanoseconds: 1_000_000_000 / 100)  // 0.01 seconds
         let credentials = try await subject.getIdentity()
 
         // Counter is 2 because we slept long enough for cache to expire
-        XCTAssertEqual(counter, 2)
+        let countAfterSleep = await counter.get()
+        XCTAssertEqual(countAfterSleep, 2)
         XCTAssertEqual(credentials.accessKey, accessKey)
         XCTAssertEqual(credentials.secret, secret)
         XCTAssertEqual(credentials.accountID, accountID)
diff --git a/Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests/Mocks/MockAWSCredentialIdentityResolver.swift b/Sources/Core/AWSSDKIdentity/Tests/AWSSDKIdentityTests/Mocks/MockAWSCredentialIdentityResolver.swift
@@ -10,8 +10,8 @@ import struct SmithyIdentity.AWSCredentialIdentity
 import protocol SmithyIdentity.AWSCredentialIdentityResolver
 
 struct MockAWSCredentialIdentityResolver: AWSCredentialIdentityResolver {
-    let _getIdentity: () async throws -> AWSCredentialIdentity
-    init(_ _getIdentity: @escaping () async throws -> AWSCredentialIdentity) {
+    let _getIdentity: @Sendable () async throws -> AWSCredentialIdentity
+    init(_ _getIdentity: @escaping @Sendable () async throws -> AWSCredentialIdentity) {
         self._getIdentity = _getIdentity
     }
     init() {
diff --git a/codegen/Package.swift b/codegen/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 //
 // Copyright Amazon.com Inc. or its affiliates.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.9`
	`1`	`+// swift-tools-version:6.0`
`2`	`2`
`3`	`3`	`//`
`4`	`4`	`// Copyright Amazon.com Inc. or its affiliates.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version: 5.9`
	`1`	`+// swift-tools-version: 6.0`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -475,3 +475,5 @@ func XCTAssertThrowsErrorAsync(`
`475`	`475`	`block(error)`
`476`	`476`	`}`
`477`	`477`	`}`
	`478`	`+`
	`479`	`+extension SigningConfig: @retroactive @unchecked Sendable {}`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ class Sigv4SigningTests: XCTestCase {`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`-class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver {`
	`305`	`+class TestCustomAWSCredentialIdentityResolver: AWSCredentialIdentityResolver, @unchecked Sendable {`
`306`	`306`	`let credentials: AWSCredentialIdentity`
`307`	`307`
`308`	`308`	`init(credentials: AWSCredentialIdentity) {`