chore: kickoff release

harsh62 · web-flow · commit 65913945ef3a · 2023-05-04T16:36:03.000-04:00
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift
@@ -38,7 +38,7 @@ public extension AWSAPIPlugin {
         configure(using: dependencies)
 
         // Initialize SwiftSDK's CRT dependency for SigV4 signing functionality
-        AwsCommonRuntimeKit.initialize()
+        CommonRuntimeKit.initialize()
 
         log.info("Configure finished")
     }
diff --git a/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/AuthenticationProviderDeleteUserTests.swift b/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/AuthenticationProviderDeleteUserTests.swift
@@ -84,9 +84,7 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {
                 try GlobalSignOutOutputResponse(httpResponse: .init(body: .empty, statusCode: .ok))
             },
             mockDeleteUserOutputResponse: { _ in
-                let crtError = ClientRuntime.ClientError.retryError(
-                    CRTError.crtError(
-                        AWSError(errorCode: 1059)))
+                let crtError = ClientRuntime.ClientError.retryError(CommonRunTimeError.crtError(CRTError(code: 1059)))
                 throw SdkError<DeleteUserOutputError>.client(crtError)
             }
         )
@@ -121,9 +119,7 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {
                 try GlobalSignOutOutputResponse(httpResponse: .init(body: .empty, statusCode: .ok))
             },
             mockDeleteUserOutputResponse: { _ in
-                let crtError = ClientRuntime.ClientError.retryError(
-                    CRTError.crtError(
-                        AWSError(errorCode: 1059)))
+                let crtError = ClientRuntime.ClientError.retryError(CommonRunTimeError.crtError(CRTError(code: 1059)))
                 throw SdkError<DeleteUserOutputError>.client(crtError)
             }
         )
diff --git a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Auth/Provider/AmplifyAWSCredentialsProvider.swift b/AmplifyPlugins/Core/AWSPluginsCore/Auth/Provider/AmplifyAWSCredentialsProvider.swift
@@ -8,8 +8,9 @@
 import Amplify
 import AWSClientRuntime
 import AwsCommonRuntimeKit
+import Foundation
 
-public class AmplifyAWSCredentialsProvider: CredentialsProvider {
+public class AmplifyAWSCredentialsProvider: AWSClientRuntime.CredentialsProvider {
 
     public func getCredentials() async throws -> AWSClientRuntime.AWSCredentials {
         let authSession = try await Amplify.Auth.fetchAuthSession()
@@ -27,20 +28,16 @@ extension AWSCredentials {
 
     func toAWSSDKCredentials() -> AWSClientRuntime.AWSCredentials {
         if let tempCredentials = self as? AWSTemporaryCredentials {
-
-            let expirationTimeSinceNow = tempCredentials.expiration.timeIntervalSinceNow
-            let expirationTimeout = UInt64(max(0, expirationTimeSinceNow))
-
             return AWSClientRuntime.AWSCredentials(
                 accessKey: tempCredentials.accessKeyId,
                 secret: tempCredentials.secretAccessKey,
-                expirationTimeout: expirationTimeout,
+                expirationTimeout: tempCredentials.expiration,
                 sessionToken: tempCredentials.sessionToken)
         } else {
             return AWSClientRuntime.AWSCredentials(
                 accessKey: accessKeyId,
                 secret: secretAccessKey,
-                expirationTimeout: 0)
+                expirationTimeout: Date())
         }
 
     }
diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Auth/Provider/AmplifyAWSSignatureV4Signer.swift b/AmplifyPlugins/Core/AWSPluginsCore/Auth/Provider/AmplifyAWSSignatureV4Signer.swift
@@ -13,7 +13,7 @@ import AwsCommonRuntimeKit
 
 public protocol AWSSignatureV4Signer {
     func sigV4SignedRequest(requestBuilder: SdkHttpRequestBuilder,
-                            credentialsProvider: CredentialsProvider,
+                            credentialsProvider: AWSClientRuntime.CredentialsProvider,
                             signingName: Swift.String,
                             signingRegion: Swift.String,
                             date: ClientRuntime.Date) async throws -> SdkHttpRequest?
@@ -24,7 +24,7 @@ public class AmplifyAWSSignatureV4Signer: AWSSignatureV4Signer {
     }
 
     public func sigV4SignedRequest(requestBuilder: SdkHttpRequestBuilder,
-                                   credentialsProvider: CredentialsProvider,
+                                   credentialsProvider: AWSClientRuntime.CredentialsProvider,
                                    signingName: Swift.String,
                                    signingRegion: Swift.String,
                                    date: ClientRuntime.Date) async throws -> SdkHttpRequest? {
@@ -43,7 +43,8 @@ public class AmplifyAWSSignatureV4Signer: AWSSignatureV4Signer {
                                                  date: date,
                                                  service: signingName,
                                                  region: signingRegion,
-                                                 signatureType: .requestHeaders)
+                                                 signatureType: .requestHeaders,
+                                                 signingAlgorithm: .sigv4)
 
             let httpRequest = await AWSSigV4Signer.sigV4SignedRequest(requestBuilder: requestBuilder, signingConfig: signingConfig)
             return httpRequest
diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Utils/CustomHttpClientEngine/UserAgentSuffixAppender.swift b/AmplifyPlugins/Core/AWSPluginsCore/Utils/CustomHttpClientEngine/UserAgentSuffixAppender.swift
@@ -34,8 +34,4 @@ extension UserAgentSuffixAppender: HttpClientEngine {
         request.headers = headers
         return try await target.execute(request: request)
     }
-
-    public func close() async {
-        await target?.close()
-    }
 }
diff --git a/AmplifyPlugins/Core/AWSPluginsCoreTests/Utils/UserAgentSuffixAppenderTests.swift b/AmplifyPlugins/Core/AWSPluginsCoreTests/Utils/UserAgentSuffixAppenderTests.swift
@@ -69,14 +69,6 @@ class UserAgentSuffixAppenderTests: XCTestCase {
         }
     }
 
-    /// Given: A UserAgentSuffixAppender with a configured httpClientEngine
-    /// When: close is invoked
-    /// Then: The httpClientEngine's close API should be called
-    func testClose_shouldInvokeClose() async {
-        await appender.close()
-        XCTAssertEqual(httpClientEngine.closeCount, 1)
-    }
-
     private func createRequest() -> SdkHttpRequest {
         return SdkHttpRequest(
             method: .get,
@@ -94,9 +86,4 @@ private class MockHttpClientEngine: HttpClientEngine {
         executeRequest = request
         return .init(body: .empty, statusCode: .accepted)
     }
-
-    var closeCount = 0
-    func close() async {
-        closeCount += 1
-    }
 }
diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift
@@ -66,15 +66,6 @@ struct MyCustomCredentialsProvider: CredentialsProvider {
         AWSCredentials(
             accessKey: "AKIDEXAMPLE",
             secret: "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
-            expirationTimeout: 30)
-    }
-
-    func getCredentials() throws -> SdkFuture<AWSClientRuntime.AWSCredentials> {
-        let future = SdkFuture<AWSClientRuntime.AWSCredentials>()
-        future.fulfill(AWSCredentials(
-            accessKey: "AKIDEXAMPLE",
-            secret: "wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY",
-            expirationTimeout: 30))
-        return future
+            expirationTimeout: Date().addingTimeInterval(30))
     }
 }
diff --git a/AmplifyPlugins/Geo/Tests/AWSLocationGeoPluginTests/Mocks/MockAWSClientConfiguration.swift b/AmplifyPlugins/Geo/Tests/AWSLocationGeoPluginTests/Mocks/MockAWSClientConfiguration.swift
@@ -15,6 +15,20 @@ import XCTest
 @testable import AWSPluginsTestCommon
 
 class MockAWSClientConfiguration: LocationClientConfigurationProtocol {
+    var encoder: ClientRuntime.RequestEncoder?
+    
+    var decoder: ClientRuntime.ResponseDecoder?
+    
+    var httpClientEngine: ClientRuntime.HttpClientEngine
+    
+    var httpClientConfiguration: ClientRuntime.HttpClientConfiguration
+    
+    var idempotencyTokenGenerator: ClientRuntime.IdempotencyTokenGenerator
+    
+    var clientLogMode: ClientRuntime.ClientLogMode
+    
+    var partitionID: String?
+    
     var useFIPS: Bool?
 
     var useDualStack: Bool?
@@ -38,12 +52,18 @@ class MockAWSClientConfiguration: LocationClientConfigurationProtocol {
     var retryer: SDKRetryer
 
     init(config: AWSLocationGeoPluginConfiguration) throws {
+        let defaultSDKRuntimeConfig = try DefaultSDKRuntimeConfiguration("MockAWSClientConfiguration")
+        
+        self.httpClientEngine = defaultSDKRuntimeConfig.httpClientEngine
+        self.httpClientConfiguration = defaultSDKRuntimeConfig.httpClientConfiguration
+        self.idempotencyTokenGenerator = defaultSDKRuntimeConfig.idempotencyTokenGenerator
+        self.clientLogMode = defaultSDKRuntimeConfig.clientLogMode
         self.credentialsProvider = MockAWSAuthService().getCredentialsProvider()
         self.region = config.regionName
         self.signingRegion = ""
         self.endpointResolver = MockEndPointResolver()
         self.logger = MockLogAgent()
-        self.retryer = try SDKRetryer(options: RetryOptions(backOffRetryOptions: ExponentialBackOffRetryOptions()))
+        self.retryer = try SDKRetryer(options: RetryOptions(jitterMode: .default))
     }
 }
 
diff --git a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/SdkError+Pinpoint.swift b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/SdkError+Pinpoint.swift
@@ -23,12 +23,20 @@ extension SdkError {
         return clientError
     }
     
-    private var crtError: CRTError? {
-        if case .retryError(let crtError as CRTError) = clientError {
-            return crtError
+    private var commonRunTimeError: CommonRunTimeError? {
+        if case .crtError(let commonRunTimeError) = clientError {
+            return commonRunTimeError
+        }
+        
+        if case .retryError(let commonRunTimeError as CommonRunTimeError) = clientError {
+            return commonRunTimeError
         }
         
-        if case .crtError(let crtError) = clientError {
+        return nil
+    }
+    
+    private var crtError: CRTError? {
+        if case .crtError(let crtError) = commonRunTimeError {
             return crtError
         }
         
@@ -44,17 +52,9 @@ extension SdkError {
         return putEventsError
     }
 
-    private var awsError: AWSError? {
-        guard case .crtError(let awsError) = crtError else {
-            return nil
-        }
-
-        return awsError
-    }
-
     public var errorDescription: String {
         guard let putEventsOutputError = putEventsOutputError else {
-            return awsError?.errorMessage ?? localizedDescription
+            return crtError?.message ?? localizedDescription
         }
 
         switch putEventsOutputError {
@@ -75,8 +75,8 @@ extension SdkError {
             return putEventsOutputError
         }
         
-        if crtError != nil {
-            return crtError
+        if commonRunTimeError != nil {
+            return commonRunTimeError
         }
         
         guard let clientError = clientError else {
@@ -98,7 +98,7 @@ extension SdkError {
             return true
         }
 
-        guard let awsError = awsError else {
+        guard let crtError = crtError else {
             return false
         }
 
@@ -119,6 +119,6 @@ extension SdkError {
             UInt32(AWS_HTTP_STATUS_CODE_408_REQUEST_TIMEOUT.rawValue)
         ]
 
-        return connectivityErrorCodes.contains(where: { $0 == awsError.errorCode })
+        return connectivityErrorCodes.contains(where: { $0 == crtError.code })
     }
 }
diff --git a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift
@@ -75,10 +75,6 @@ private struct CustomPinpointHttpClientEngine: HttpClientEngine {
         return try await httpClientEngine.execute(request: request)
     }
 
-    func close() async {
-        await httpClientEngine.close()
-    }
-
     private func userAgent(for api: PinpointRequestsRegistry.API) async -> String? {
         let sources = await PinpointRequestsRegistry.shared.sources(for: api)
         if sources.isEmpty {
diff --git a/AmplifyPlugins/Internal/Tests/InternalAWSPinpointUnitTests/Mocks/MockEndpointClient.swift b/AmplifyPlugins/Internal/Tests/InternalAWSPinpointUnitTests/Mocks/MockEndpointClient.swift
@@ -13,6 +13,12 @@ import Foundation
 actor MockEndpointClient: EndpointClientBehaviour {
     let pinpointClient: PinpointClientProtocol = MockPinpointClient()
 
+    class MockCredentialsProvider: CredentialsProvider {
+        func getCredentials() async throws -> AWSCredentials {
+            return AWSCredentials(accessKey: "", secret: "", expirationTimeout: Date().addingTimeInterval(1000))
+        }
+    }
+
     var updateEndpointProfileCount = 0
     func updateEndpointProfile() async throws {
         updateEndpointProfileCount += 1
@@ -34,6 +40,13 @@ actor MockEndpointClient: EndpointClientBehaviour {
         updateEndpointProfileWithCount += 1
     }
 
+    func addAttributes(_ attributes: [String], forKey key: String) {}
+
+    func removeAttributes(forKey key: String) {}
+
+    func addMetric(_ metric: Double, forKey key: String) {}
+
+    func removeMetric(forKey key: String) {}
 
     nonisolated func convertToPublicEndpoint(_ endpointProfile: PinpointEndpointProfile) -> PinpointClientTypes.PublicEndpoint {
         return PinpointClientTypes.PublicEndpoint()
diff --git a/AmplifyPlugins/Internal/Tests/InternalAWSPinpointUnitTests/PinpointRequestsRegistryTests.swift b/AmplifyPlugins/Internal/Tests/InternalAWSPinpointUnitTests/PinpointRequestsRegistryTests.swift
@@ -89,14 +89,26 @@ private extension HttpClientEngine {
 }
 
 private class MockSDKRuntimeConfiguration: SDKRuntimeConfiguration {
+    var encoder: ClientRuntime.RequestEncoder?
+    var decoder: ClientRuntime.ResponseDecoder?
+    var httpClientConfiguration: ClientRuntime.HttpClientConfiguration
+    var idempotencyTokenGenerator: ClientRuntime.IdempotencyTokenGenerator
+    var clientLogMode: ClientRuntime.ClientLogMode
+    var partitionID: String?
+    
     let logger: LogAgent
     let retryer: SDKRetryer
     var endpoint: String? = nil
     private let mockedHttpClientEngine : HttpClientEngine
 
     init(httpClientEngine: HttpClientEngine) throws {
+        let defaultSDKRuntimeConfig = try DefaultSDKRuntimeConfiguration("MockSDKRuntimeConfiguration")
+        httpClientConfiguration = defaultSDKRuntimeConfig.httpClientConfiguration
+        idempotencyTokenGenerator = defaultSDKRuntimeConfig.idempotencyTokenGenerator
+        clientLogMode = defaultSDKRuntimeConfig.clientLogMode
+        
         logger = MockLogAgent()
-        retryer = try SDKRetryer(options: .init(backOffRetryOptions: .init()))
+        retryer = try SDKRetryer(options: RetryOptions(jitterMode: .default))
         mockedHttpClientEngine = httpClientEngine
     }
 
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Polly.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Polly.swift
@@ -35,7 +35,7 @@ extension AWSPredictionsService: AWSPollyServiceBehavior {
             }
 
             let textToSpeechResult = Predictions.Convert.TextToSpeech.Result(
-                audioData: speech.toBytes().toData()
+                audioData: speech.toBytes().getData()
             )
             return textToSpeechResult
         } catch let error as SynthesizeSpeechOutputError {
diff --git a/AmplifyPlugins/Predictions/Tests/AWSPredictionsPluginUnitTests/Mocks/Service/MockComprehendBehavior.swift b/AmplifyPlugins/Predictions/Tests/AWSPredictionsPluginUnitTests/Mocks/Service/MockComprehendBehavior.swift
@@ -115,4 +115,15 @@ extension MockComprehendBehavior {
     func tagResource(input: AWSComprehend.TagResourceInput) async throws -> AWSComprehend.TagResourceOutputResponse { fatalError() }
     func untagResource(input: AWSComprehend.UntagResourceInput) async throws -> AWSComprehend.UntagResourceOutputResponse { fatalError() }
     func updateEndpoint(input: AWSComprehend.UpdateEndpointInput) async throws -> AWSComprehend.UpdateEndpointOutputResponse { fatalError() }
+    func createDataset(input: AWSComprehend.CreateDatasetInput) async throws -> AWSComprehend.CreateDatasetOutputResponse { fatalError() }
+    func createFlywheel(input: AWSComprehend.CreateFlywheelInput) async throws -> AWSComprehend.CreateFlywheelOutputResponse { fatalError() }
+    func deleteFlywheel(input: AWSComprehend.DeleteFlywheelInput) async throws -> AWSComprehend.DeleteFlywheelOutputResponse { fatalError() }
+    func describeDataset(input: AWSComprehend.DescribeDatasetInput) async throws -> AWSComprehend.DescribeDatasetOutputResponse { fatalError() }
+    func describeFlywheel(input: AWSComprehend.DescribeFlywheelInput) async throws -> AWSComprehend.DescribeFlywheelOutputResponse { fatalError() }
+    func describeFlywheelIteration(input: AWSComprehend.DescribeFlywheelIterationInput) async throws -> AWSComprehend.DescribeFlywheelIterationOutputResponse { fatalError() }
+    func listDatasets(input: AWSComprehend.ListDatasetsInput) async throws -> AWSComprehend.ListDatasetsOutputResponse { fatalError() }
+    func listFlywheelIterationHistory(input: AWSComprehend.ListFlywheelIterationHistoryInput) async throws -> AWSComprehend.ListFlywheelIterationHistoryOutputResponse { fatalError() }
+    func listFlywheels(input: AWSComprehend.ListFlywheelsInput) async throws -> AWSComprehend.ListFlywheelsOutputResponse { fatalError() }
+    func startFlywheelIteration(input: AWSComprehend.StartFlywheelIterationInput) async throws -> AWSComprehend.StartFlywheelIterationOutputResponse { fatalError() }
+    func updateFlywheel(input: AWSComprehend.UpdateFlywheelInput) async throws -> AWSComprehend.UpdateFlywheelOutputResponse { fatalError() }
 }
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderAdapter.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderAdapter.swift
@@ -36,7 +36,7 @@ class AWSS3PreSignedURLBuilderAdapter: AWSS3PreSignedURLBuilderBehavior {
                          signingOperation: AWSS3SigningOperation,
                          expires: Int64? = nil) async throws -> URL {
         let expiresDate = Date(timeIntervalSinceNow: Double(expires ?? defaultExpiration))
-        let expiration = Int64(expiresDate.timeIntervalSinceNow)
+        let expiration = expiresDate.timeIntervalSinceNow
         let preSignedUrl: URL?
         switch signingOperation {
         case .getObject:
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/UploadPartInput+presignURL.swift
diff --git a/AmplifyTestCommon/Mocks/MockCredentialsProvider.swift b/AmplifyTestCommon/Mocks/MockCredentialsProvider.swift
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public extension AWSAPIPlugin {`
`38`	`38`	`configure(using: dependencies)`
`39`	`39`
`40`	`40`	`// Initialize SwiftSDK's CRT dependency for SigV4 signing functionality`
`41`		`- AwsCommonRuntimeKit.initialize()`
	`41`	`+ CommonRuntimeKit.initialize()`
`42`	`42`
`43`	`43`	`log.info("Configure finished")`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,7 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {`
`84`	`84`	`try GlobalSignOutOutputResponse(httpResponse: .init(body: .empty, statusCode: .ok))`
`85`	`85`	`},`
`86`	`86`	`mockDeleteUserOutputResponse: { _ in`
`87`		`- let crtError = ClientRuntime.ClientError.retryError(`
`88`		`- CRTError.crtError(`
`89`		`- AWSError(errorCode: 1059)))`
	`87`	`+ let crtError = ClientRuntime.ClientError.retryError(CommonRunTimeError.crtError(CRTError(code: 1059)))`
`90`	`88`	`throw SdkError<DeleteUserOutputError>.client(crtError)`
`91`	`89`	`}`
`92`	`90`	`)`
`@@ -121,9 +119,7 @@ class AuthenticationProviderDeleteUserTests: BasePluginTest {`
`121`	`119`	`try GlobalSignOutOutputResponse(httpResponse: .init(body: .empty, statusCode: .ok))`
`122`	`120`	`},`
`123`	`121`	`mockDeleteUserOutputResponse: { _ in`
`124`		`- let crtError = ClientRuntime.ClientError.retryError(`
`125`		`- CRTError.crtError(`
`126`		`- AWSError(errorCode: 1059)))`
	`122`	`+ let crtError = ClientRuntime.ClientError.retryError(CommonRunTimeError.crtError(CRTError(code: 1059)))`
`127`	`123`	`throw SdkError<DeleteUserOutputError>.client(crtError)`
`128`	`124`	`}`
`129`	`125`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,4 @@ extension UserAgentSuffixAppender: HttpClientEngine {`
`34`	`34`	`request.headers = headers`
`35`	`35`	`return try await target.execute(request: request)`
`36`	`36`	`}`
`37`		`-`
`38`		`- public func close() async {`
`39`		`- await target?.close()`
`40`		`- }`
`41`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,6 @@ class UserAgentSuffixAppenderTests: XCTestCase {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- /// Given: A UserAgentSuffixAppender with a configured httpClientEngine`
`73`		`- /// When: close is invoked`
`74`		`- /// Then: The httpClientEngine's close API should be called`
`75`		`- func testClose_shouldInvokeClose() async {`
`76`		`- await appender.close()`
`77`		`- XCTAssertEqual(httpClientEngine.closeCount, 1)`
`78`		`- }`
`79`		`-`
`80`	`72`	`private func createRequest() -> SdkHttpRequest {`
`81`	`73`	`return SdkHttpRequest(`
`82`	`74`	`method: .get,`
`@@ -94,9 +86,4 @@ private class MockHttpClientEngine: HttpClientEngine {`
`94`	`86`	`executeRequest = request`
`95`	`87`	`return .init(body: .empty, statusCode: .accepted)`
`96`	`88`	`}`
`97`		`-`
`98`		`- var closeCount = 0`
`99`		`- func close() async {`
`100`		`- closeCount += 1`
`101`		`- }`
`102`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,20 @@ extension SdkError {`
`23`	`23`	`return clientError`
`24`	`24`	`}`
`25`	`25`
`26`		`- private var crtError: CRTError? {`
`27`		`- if case .retryError(let crtError as CRTError) = clientError {`
`28`		`- return crtError`
	`26`	`+ private var commonRunTimeError: CommonRunTimeError? {`
	`27`	`+ if case .crtError(let commonRunTimeError) = clientError {`
	`28`	`+ return commonRunTimeError`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ if case .retryError(let commonRunTimeError as CommonRunTimeError) = clientError {`
	`32`	`+ return commonRunTimeError`
`29`	`33`	`}`
`30`	`34`
`31`		`- if case .crtError(let crtError) = clientError {`
	`35`	`+ return nil`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ private var crtError: CRTError? {`
	`39`	`+ if case .crtError(let crtError) = commonRunTimeError {`
`32`	`40`	`return crtError`
`33`	`41`	`}`
`34`	`42`
`@@ -44,17 +52,9 @@ extension SdkError {`
`44`	`52`	`return putEventsError`
`45`	`53`	`}`
`46`	`54`
`47`		`- private var awsError: AWSError? {`
`48`		`- guard case .crtError(let awsError) = crtError else {`
`49`		`- return nil`
`50`		`- }`
`51`		`-`
`52`		`- return awsError`
`53`		`- }`
`54`		`-`
`55`	`55`	`public var errorDescription: String {`
`56`	`56`	`guard let putEventsOutputError = putEventsOutputError else {`
`57`		`- return awsError?.errorMessage ?? localizedDescription`
	`57`	`+ return crtError?.message ?? localizedDescription`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`switch putEventsOutputError {`
`@@ -75,8 +75,8 @@ extension SdkError {`
`75`	`75`	`return putEventsOutputError`
`76`	`76`	`}`
`77`	`77`
`78`		`- if crtError != nil {`
`79`		`- return crtError`
	`78`	`+ if commonRunTimeError != nil {`
	`79`	`+ return commonRunTimeError`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`guard let clientError = clientError else {`
`@@ -98,7 +98,7 @@ extension SdkError {`
`98`	`98`	`return true`
`99`	`99`	`}`
`100`	`100`
`101`		`- guard let awsError = awsError else {`
	`101`	`+ guard let crtError = crtError else {`
`102`	`102`	`return false`
`103`	`103`	`}`
`104`	`104`
`@@ -119,6 +119,6 @@ extension SdkError {`
`119`	`119`	`UInt32(AWS_HTTP_STATUS_CODE_408_REQUEST_TIMEOUT.rawValue)`
`120`	`120`	`]`
`121`	`121`
`122`		`- return connectivityErrorCodes.contains(where: { $0 == awsError.errorCode })`
	`122`	`+ return connectivityErrorCodes.contains(where: { $0 == crtError.code })`
`123`	`123`	`}`
`124`	`124`	`}`