From af769741c59ec86679ec74d2e511fde02c9445e1 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 13 Jan 2025 15:14:50 -0800 Subject: [PATCH 1/7] Revert "feat: Add support for accountId field on Credentials & CredentialsProvider (#304)" This reverts commit ea264775fd39379d59fb93e22f9619e9af552c1b. --- .../auth/credentials/Credentials.swift | 18 +-------------- .../credentials/CredentialsProvider.swift | 22 +++---------------- .../crt/ContinuationCore.swift | 6 +---- .../auth/CredentialsProviderTests.swift | 7 ++---- .../auth/CredentialsTests.swift | 20 +---------------- 5 files changed, 8 insertions(+), 65 deletions(-) diff --git a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift index 0cedf7c29..4dd6866e1 100644 --- a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift +++ b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift @@ -8,13 +8,9 @@ public final class Credentials { let rawValue: OpaquePointer - // TODO: remove this property once aws-c-auth supports account_id - private let accountId: String? - - init(rawValue: OpaquePointer, accountId: String? = nil) { + init(rawValue: OpaquePointer) { self.rawValue = rawValue aws_credentials_acquire(rawValue) - self.accountId = accountId } /// Creates a new set of aws credentials @@ -23,14 +19,12 @@ public final class Credentials { /// - accessKey: value for the aws access key id field /// - secret: value for the secret access key field /// - sessionToken: (Optional) security token associated with the credentials - /// - accountId: (Optional) the account ID for the resolved credentials, if known /// - expiration: (Optional) Point in time after which credentials will no longer be valid. /// For credentials that do not expire, use nil. /// If expiration.timeIntervalSince1970 is greater than UInt64.max, it will be converted to nil. /// - Throws: CommonRuntimeError.crtError public init(accessKey: String, secret: String, - accountId: String? = nil, sessionToken: String? = nil, expiration: Date? = nil) throws { @@ -57,7 +51,6 @@ public final class Credentials { throw CommonRunTimeError.crtError(.makeFromLastError()) } self.rawValue = rawValue - self.accountId = accountId } /// Gets the access key from the `aws_credentials` instance @@ -76,15 +69,6 @@ public final class Credentials { return secret.toOptionalString() } - /// Gets the account ID from the `Credentials`, if any. - /// - /// Temporarily, `accountId` is backed by a Swift instance variable. - /// In the future, when the C implementation implements `account_id` the implementation will get account ID from the `aws_credentials` instance. - /// - Returns:`String?`: The AWS `accountId` or nil - public func getAccountId() -> String? { - accountId - } - /// Gets the session token from the `aws_credentials` instance /// /// - Returns:`String?`: The AWS Session token or nil diff --git a/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift b/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift index 5d9b4b9e9..e4c71b551 100644 --- a/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift +++ b/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift @@ -14,12 +14,8 @@ public class CredentialsProvider: CredentialsProviding { let rawValue: UnsafeMutablePointer - // TODO: remove this property once aws-c-auth supports account_id - private let accountId: String? - - init(credentialsProvider: UnsafeMutablePointer, accountId: String? = nil) { + init(credentialsProvider: UnsafeMutablePointer) { self.rawValue = credentialsProvider - self.accountId = accountId } /// Retrieves credentials from a provider by calling its implementation of get credentials and returns them to @@ -29,10 +25,7 @@ public class CredentialsProvider: CredentialsProviding { /// - Throws: CommonRuntimeError.crtError public func getCredentials() async throws -> Credentials { return try await withCheckedThrowingContinuation { (continuation: CheckedContinuation) in - let continuationCore = ContinuationCore( - continuation: continuation, - userData: ["accountId": accountId as Any] - ) + let continuationCore = ContinuationCore(continuation: continuation) if aws_credentials_provider_get_credentials(rawValue, onGetCredentials, continuationCore.passRetained()) != AWS_OP_SUCCESS { @@ -59,14 +52,6 @@ extension CredentialsProvider { self.init(credentialsProvider: unsafeProvider) } - // TODO: Remove the following initializer when aws-c-auth provides account_id in credentials - /// Creates a credentials provider that sources the credentials from the provided source and `accountId` - @_spi(AccountIDTempSupport) - public convenience init(source: Source, accountId: String?) throws { - let unsafeProvider = try source.makeProvider() - self.init(credentialsProvider: unsafeProvider, accountId: accountId) - } - /// Create a credentials provider that depends on provider to fetch the credentials. /// It will retain the provider until shutdown callback is triggered for AwsCredentialsProvider /// - Parameters: @@ -583,8 +568,7 @@ private func onGetCredentials(credentials: OpaquePointer?, } // Success - let accountId = continuationCore.userData?["accountId"] as? String - continuationCore.continuation.resume(returning: Credentials(rawValue: credentials!, accountId: accountId)) + continuationCore.continuation.resume(returning: Credentials(rawValue: credentials!)) } // We need to share this pointer to C in a task block but Swift compiler complains diff --git a/Source/AwsCommonRuntimeKit/crt/ContinuationCore.swift b/Source/AwsCommonRuntimeKit/crt/ContinuationCore.swift index 7b7a2fc8d..fb2d6fba2 100644 --- a/Source/AwsCommonRuntimeKit/crt/ContinuationCore.swift +++ b/Source/AwsCommonRuntimeKit/crt/ContinuationCore.swift @@ -1,17 +1,13 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0. -// TODO: Remove userData property once it is no longer needed for accountId on credentials - /// Core classes have manual memory management. /// You have to balance the retain & release calls in all cases to avoid leaking memory. class ContinuationCore { let continuation: CheckedContinuation - let userData: [String: Any]? - init(continuation: CheckedContinuation, userData: [String: Any]? = nil) { + init(continuation: CheckedContinuation) { self.continuation = continuation - self.userData = userData } func passRetained() -> UnsafeMutableRawPointer { diff --git a/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift b/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift index 2e12bdcc4..0f873cc99 100644 --- a/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift +++ b/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift @@ -2,12 +2,11 @@ // SPDX-License-Identifier: Apache-2.0. import XCTest -@_spi(AccountIDTempSupport) @testable import AwsCommonRuntimeKit +@testable import AwsCommonRuntimeKit class CredentialsProviderTests: XCBaseTestCase { let accessKey = "AccessKey" let secret = "Sekrit" - var accountId: String? = nil let sessionToken = "Token" let shutdownWasCalled = XCTestExpectation(description: "Shutdown callback was called") @@ -69,14 +68,12 @@ class CredentialsProviderTests: XCBaseTestCase { wait(for: [shutdownWasCalled], timeout: 15) } - // TODO: change this test to not pass accountId separately once the source function handles it func testCreateCredentialsProviderStatic() async throws { - accountId = "0123456789" do { let provider = try CredentialsProvider(source: .static(accessKey: accessKey, secret: secret, sessionToken: sessionToken, - shutdownCallback: getShutdownCallback()), accountId: accountId) + shutdownCallback: getShutdownCallback())) let credentials = try await provider.getCredentials() XCTAssertNotNil(credentials) assertCredentials(credentials: credentials) diff --git a/Test/AwsCommonRuntimeKitTests/auth/CredentialsTests.swift b/Test/AwsCommonRuntimeKitTests/auth/CredentialsTests.swift index 3ffdcc23b..62d18ad9f 100644 --- a/Test/AwsCommonRuntimeKitTests/auth/CredentialsTests.swift +++ b/Test/AwsCommonRuntimeKitTests/auth/CredentialsTests.swift @@ -8,15 +8,13 @@ class CredentialsTests: XCBaseTestCase { func testCreateAWSCredentials() async throws { let accessKey = "AccessKey" let secret = "Secret" - let accountId = "0123456789" let sessionToken = "Token" let expiration = Date(timeIntervalSinceNow: 10) - let credentials = try Credentials(accessKey: accessKey, secret: secret, accountId: accountId, sessionToken: sessionToken, expiration: expiration) + let credentials = try Credentials(accessKey: accessKey, secret: secret, sessionToken: sessionToken, expiration: expiration) XCTAssertEqual(accessKey, credentials.getAccessKey()) XCTAssertEqual(secret, credentials.getSecret()) - XCTAssertEqual(accountId, credentials.getAccountId()) XCTAssertEqual(sessionToken, credentials.getSessionToken()) XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration()!.timeIntervalSince1970)) @@ -40,22 +38,6 @@ class CredentialsTests: XCBaseTestCase { XCTAssertNil(credentials2.getExpiration()) } - func testCreateAWSCredentialsWithoutAccountId() async throws { - let accessKey = "AccessKey" - let secret = "Secret" - let sessionToken = "Token" - let expiration = Date(timeIntervalSinceNow: 10) - - let credentials = try Credentials(accessKey: accessKey, secret: secret, accountId: nil, sessionToken: sessionToken, expiration: expiration) - - XCTAssertEqual(accessKey, credentials.getAccessKey()) - XCTAssertEqual(secret, credentials.getSecret()) - XCTAssertNil(credentials.getAccountId()) - XCTAssertEqual(sessionToken, credentials.getSessionToken()) - XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration()!.timeIntervalSince1970)) - - } - func testCreateAWSCredentialsWithoutSessionToken() async throws { let accessKey = "AccessKey" let secret = "Secret" From d374a23e9ca5537f25ebe2f6be2b902d01f692d2 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 13 Jan 2025 15:25:50 -0800 Subject: [PATCH 2/7] use account id from C --- .../auth/credentials/Credentials.swift | 16 ++++++++++++++-- .../auth/credentials/CredentialsProvider.swift | 6 +++++- .../auth/CredentialsProviderTests.swift | 16 ++++++++++++++++ aws-common-runtime/aws-c-auth | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift index 4dd6866e1..a9821f2b0 100644 --- a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift +++ b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift @@ -19,6 +19,7 @@ public final class Credentials { /// - accessKey: value for the aws access key id field /// - secret: value for the secret access key field /// - sessionToken: (Optional) security token associated with the credentials + /// - accountId: (Optional) account id associated with the credentials /// - expiration: (Optional) Point in time after which credentials will no longer be valid. /// For credentials that do not expire, use nil. /// If expiration.timeIntervalSince1970 is greater than UInt64.max, it will be converted to nil. @@ -26,6 +27,7 @@ public final class Credentials { public init(accessKey: String, secret: String, sessionToken: String? = nil, + accountId: String? = nil, expiration: Date? = nil) throws { let expirationTimeout: UInt64 @@ -39,13 +41,15 @@ public final class Credentials { guard let rawValue = (withByteCursorFromStrings( accessKey, secret, - sessionToken) { accessKeyCursor, secretCursor, sessionTokenCursor in + sessionToken, + accountId) { accessKeyCursor, secretCursor, sessionTokenCursor, accountIdCursor in - return aws_credentials_new( + return aws_credentials_new_with_account_id( allocator.rawValue, accessKeyCursor, secretCursor, sessionTokenCursor, + accountIdCursor, expirationTimeout) }) else { throw CommonRunTimeError.crtError(.makeFromLastError()) @@ -77,6 +81,14 @@ public final class Credentials { return token.toOptionalString() } + /// Gets the account id from the `aws_credentials` instance + /// + /// - Returns:`String?`: The account id or nil + public func getAccountId() -> String? { + let accountId = aws_credentials_get_account_id(rawValue) + return accountId.toOptionalString() + } + /// Gets the expiration timeout from the `aws_credentials` instance /// /// - Returns:`Data?`: The timeout in seconds of when the credentials expire. diff --git a/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift b/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift index e4c71b551..d03b93a59 100644 --- a/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift +++ b/Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift @@ -83,12 +83,14 @@ extension CredentialsProvider.Source { /// - accessKey: The access key to use. /// - secret: The secret to use. /// - sessionToken: (Optional) Session token to use. + /// - accountId: (Optional) Account id to use. /// - shutdownCallback: (Optional) shutdown callback /// - Returns: `CredentialsProvider` /// - Throws: CommonRuntimeError.crtError public static func `static`(accessKey: String, secret: String, sessionToken: String? = nil, + accountId: String? = nil, shutdownCallback: ShutdownCallback? = nil) -> Self { Self { @@ -98,10 +100,12 @@ extension CredentialsProvider.Source { guard let provider: UnsafeMutablePointer = withByteCursorFromStrings( accessKey, secret, - sessionToken, { accessKeyCursor, secretCursor, sessionTokenCursor in + sessionToken, + accountId, { accessKeyCursor, secretCursor, sessionTokenCursor, accountIdCursor in staticOptions.access_key_id = accessKeyCursor staticOptions.secret_access_key = secretCursor staticOptions.session_token = sessionTokenCursor + staticOptions.account_id = accountIdCursor return aws_credentials_provider_new_static(allocator.rawValue, &staticOptions) }) else { diff --git a/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift b/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift index 0f873cc99..519d8bb14 100644 --- a/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift +++ b/Test/AwsCommonRuntimeKitTests/auth/CredentialsProviderTests.swift @@ -81,6 +81,22 @@ class CredentialsProviderTests: XCBaseTestCase { wait(for: [shutdownWasCalled], timeout: 15) } + func testCreateCredentialsProviderStaticWithAccountId() async throws { + do { + let accountId = "Account ID" + let provider = try CredentialsProvider(source: .static(accessKey: accessKey, + secret: secret, + sessionToken: sessionToken, + accountId: accountId, + shutdownCallback: getShutdownCallback())) + let credentials = try await provider.getCredentials() + XCTAssertNotNil(credentials) + assertCredentials(credentials: credentials) + XCTAssertEqual(accountId, credentials.getAccountId()) + } + wait(for: [shutdownWasCalled], timeout: 15) + } + func testCredentialsProviderEnvThrow() async { let exceptionWasThrown = XCTestExpectation(description: "Exception was thrown because of missing credentials in environment") do { diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth index 3982bd75f..ff9eabdea 160000 --- a/aws-common-runtime/aws-c-auth +++ b/aws-common-runtime/aws-c-auth @@ -1 +1 @@ -Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 +Subproject commit ff9eabdea914e036d217e62d9f49a6ebbdf3584d From fc10496d50d143e75c807e8ccef646f0c706082c Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Mon, 27 Jan 2025 10:57:17 -0800 Subject: [PATCH 3/7] latest submodules --- aws-common-runtime/aws-c-auth | 2 +- aws-common-runtime/aws-c-cal | 2 +- aws-common-runtime/aws-c-common | 2 +- aws-common-runtime/s2n | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth index ff9eabdea..274a1d213 160000 --- a/aws-common-runtime/aws-c-auth +++ b/aws-common-runtime/aws-c-auth @@ -1 +1 @@ -Subproject commit ff9eabdea914e036d217e62d9f49a6ebbdf3584d +Subproject commit 274a1d21330731cc51bb742794adc70ada5f4380 diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal index 656762aef..fbbe2612a 160000 --- a/aws-common-runtime/aws-c-cal +++ b/aws-common-runtime/aws-c-cal @@ -1 +1 @@ -Subproject commit 656762aefbee2bc8f509cb23cd107abff20a72bb +Subproject commit fbbe2612a3385d1ded02a52d20ad7fd2da4501f4 diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common index 63187b976..5e6c08186 160000 --- a/aws-common-runtime/aws-c-common +++ b/aws-common-runtime/aws-c-common @@ -1 +1 @@ -Subproject commit 63187b976a482309e23296c5f967fc19c4131746 +Subproject commit 5e6c08186fa5d8c7679acf95b86ada4119ca23b8 diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n index 493b77167..6cc9f53d7 160000 --- a/aws-common-runtime/s2n +++ b/aws-common-runtime/s2n @@ -1 +1 @@ -Subproject commit 493b77167dc367c394de23cfe78a029298e2a254 +Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f From 6d02c9acf03c2d25730820efd9d21cdded1c4199 Mon Sep 17 00:00:00 2001 From: Vera Xia Date: Mon, 10 Feb 2025 14:07:13 -0800 Subject: [PATCH 4/7] update submodule aws-c-io --- Package.swift | 4 ++++ aws-common-runtime/aws-c-io | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 98535e612..e88131782 100644 --- a/Package.swift +++ b/Package.swift @@ -133,14 +133,18 @@ awsCIoPlatformExcludes.append("source/posix") awsCIoPlatformExcludes.append("source/linux") awsCIoPlatformExcludes.append("source/s2n") awsCIoPlatformExcludes.append("source/darwin") +cSettingsIO.append(.define("AWS_ENABLE_IO_COMPLETION_PORTS")) #elseif os(Linux) awsCIoPlatformExcludes.append("source/windows") awsCIoPlatformExcludes.append("source/bsd") awsCIoPlatformExcludes.append("source/darwin") +cSettingsIO.append(.define("AWS_ENABLE_EPOLL")) #else // macOS, iOS, watchOS, tvOS awsCIoPlatformExcludes.append("source/windows") awsCIoPlatformExcludes.append("source/linux") awsCIoPlatformExcludes.append("source/s2n") +cSettingsIO.append(.define("__APPLE__")) +cSettingsIO.append(.define("AWS_ENABLE_KQUEUE")) #endif ////////////////////////////////////////////////////////////////////// diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io index fcb38c804..3041dabfc 160000 --- a/aws-common-runtime/aws-c-io +++ b/aws-common-runtime/aws-c-io @@ -1 +1 @@ -Subproject commit fcb38c804364dd627c335da752a99a125a88f6e9 +Subproject commit 3041dabfc13fe9bc9a0467e15aa1d5a09c7fc06f From df7988d93579f077b96b24fc4399cee4f02850a5 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 12 Feb 2025 09:30:34 -0800 Subject: [PATCH 5/7] Update mobules --- .../auth/credentials/Credentials.swift | 18 ++++++++++-------- aws-common-runtime/aws-c-auth | 2 +- aws-common-runtime/aws-c-cal | 2 +- aws-common-runtime/aws-c-common | 2 +- aws-common-runtime/aws-c-compression | 2 +- aws-common-runtime/aws-c-event-stream | 2 +- aws-common-runtime/aws-c-http | 2 +- aws-common-runtime/aws-c-io | 2 +- aws-common-runtime/aws-c-sdkutils | 2 +- aws-common-runtime/aws-checksums | 2 +- aws-common-runtime/s2n | 2 +- 11 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift index a9821f2b0..35066360f 100644 --- a/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift +++ b/Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift @@ -44,14 +44,16 @@ public final class Credentials { sessionToken, accountId) { accessKeyCursor, secretCursor, sessionTokenCursor, accountIdCursor in - return aws_credentials_new_with_account_id( - allocator.rawValue, - accessKeyCursor, - secretCursor, - sessionTokenCursor, - accountIdCursor, - expirationTimeout) - }) else { + var options = aws_credentials_options() + options.access_key_id_cursor = accessKeyCursor + options.secret_access_key_cursor = secretCursor + options.session_token_cursor = sessionTokenCursor + options.account_id_cursor = accountIdCursor + options.expiration_timepoint_seconds = expirationTimeout + + return aws_credentials_new_with_options(allocator.rawValue, &options) + }) + else { throw CommonRunTimeError.crtError(.makeFromLastError()) } self.rawValue = rawValue diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth index 274a1d213..2d85beff9 160000 --- a/aws-common-runtime/aws-c-auth +++ b/aws-common-runtime/aws-c-auth @@ -1 +1 @@ -Subproject commit 274a1d21330731cc51bb742794adc70ada5f4380 +Subproject commit 2d85beff96bee7ee4734c21c7fc6b15e9d07b85e diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal index fbbe2612a..7299c6ab9 160000 --- a/aws-common-runtime/aws-c-cal +++ b/aws-common-runtime/aws-c-cal @@ -1 +1 @@ -Subproject commit fbbe2612a3385d1ded02a52d20ad7fd2da4501f4 +Subproject commit 7299c6ab9244595b140d604475cdd6c6921be8ae diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common index 5e6c08186..0e7637fa8 160000 --- a/aws-common-runtime/aws-c-common +++ b/aws-common-runtime/aws-c-common @@ -1 +1 @@ -Subproject commit 5e6c08186fa5d8c7679acf95b86ada4119ca23b8 +Subproject commit 0e7637fa852a472bd4c37fc07a325a09c942a5fc diff --git a/aws-common-runtime/aws-c-compression b/aws-common-runtime/aws-c-compression index c6c1191e5..f951ab2b8 160000 --- a/aws-common-runtime/aws-c-compression +++ b/aws-common-runtime/aws-c-compression @@ -1 +1 @@ -Subproject commit c6c1191e525e5aa6ead9e1afc392e35d3b50331e +Subproject commit f951ab2b819fc6993b6e5e6cfef64b1a1554bfc8 diff --git a/aws-common-runtime/aws-c-event-stream b/aws-common-runtime/aws-c-event-stream index d2dcc9344..4bd476bd0 160000 --- a/aws-common-runtime/aws-c-event-stream +++ b/aws-common-runtime/aws-c-event-stream @@ -1 +1 @@ -Subproject commit d2dcc9344dae24de320866045d85166d8a91a0d1 +Subproject commit 4bd476bd0c629e8fab4ec0ace92830efc6a79e6c diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http index fc3eded24..590c7b597 160000 --- a/aws-common-runtime/aws-c-http +++ b/aws-common-runtime/aws-c-http @@ -1 +1 @@ -Subproject commit fc3eded2465c37d07fd9cc15e9b5b011224c9c9a +Subproject commit 590c7b597f87e5edc080b8b77418690c30319832 diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io index 3041dabfc..b1774b65e 160000 --- a/aws-common-runtime/aws-c-io +++ b/aws-common-runtime/aws-c-io @@ -1 +1 @@ -Subproject commit 3041dabfc13fe9bc9a0467e15aa1d5a09c7fc06f +Subproject commit b1774b65e3ce3598dcc2a46ec8f0cbb589a275e5 diff --git a/aws-common-runtime/aws-c-sdkutils b/aws-common-runtime/aws-c-sdkutils index 1ae8664f9..ba6a28fab 160000 --- a/aws-common-runtime/aws-c-sdkutils +++ b/aws-common-runtime/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 1ae8664f90cb5ab5e23b161a31e021c6d3a28e72 +Subproject commit ba6a28fab7ed5d7f1b3b1d12eb672088be093824 diff --git a/aws-common-runtime/aws-checksums b/aws-common-runtime/aws-checksums index 3e4101b9f..fb8bd0b8c 160000 --- a/aws-common-runtime/aws-checksums +++ b/aws-common-runtime/aws-checksums @@ -1 +1 @@ -Subproject commit 3e4101b9f85a2c090774d27ae2131fca1082f522 +Subproject commit fb8bd0b8cff00c8c24a35d601fce1b4c611df6da diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n index 6cc9f53d7..806830de6 160000 --- a/aws-common-runtime/s2n +++ b/aws-common-runtime/s2n @@ -1 +1 @@ -Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f +Subproject commit 806830de6a3b98d0bdead01f8408ecb5a6f58723 From eb2185faaace4432a2956becebedf38fa1a7225e Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 12 Feb 2025 09:35:56 -0800 Subject: [PATCH 6/7] remove define --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index e88131782..59aaf7d5c 100644 --- a/Package.swift +++ b/Package.swift @@ -143,7 +143,6 @@ cSettingsIO.append(.define("AWS_ENABLE_EPOLL")) awsCIoPlatformExcludes.append("source/windows") awsCIoPlatformExcludes.append("source/linux") awsCIoPlatformExcludes.append("source/s2n") -cSettingsIO.append(.define("__APPLE__")) cSettingsIO.append(.define("AWS_ENABLE_KQUEUE")) #endif From 3eeee2be17aae5f7e09d664d41da423ffb7dc34b Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Khan Date: Wed, 12 Feb 2025 09:41:41 -0800 Subject: [PATCH 7/7] update common --- aws-common-runtime/aws-c-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common index 0e7637fa8..6401c830f 160000 --- a/aws-common-runtime/aws-c-common +++ b/aws-common-runtime/aws-c-common @@ -1 +1 @@ -Subproject commit 0e7637fa852a472bd4c37fc07a325a09c942a5fc +Subproject commit 6401c830ffcd82ee9c9e26255f2fadf7092c7321