From 2e99dbf39429a3af649b3bacd31b39ba9c73f9ee Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Mon, 25 Sep 2023 17:47:02 -0400
Subject: [PATCH 1/7] add ability to configure timeout in
 AWSClientConfiguration

---
 Package.swift                                 |  2 +-
 .../AWSClientConfiguration.swift              | 27 ++++++++++++++-----
 .../AWSClientConfigurationTests.swift         |  9 +++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Package.swift b/Package.swift
index f9f5e768b40..51b8921d4bd 100644
--- a/Package.swift
+++ b/Package.swift
@@ -68,7 +68,7 @@ func addClientRuntimeDependency(_ version: Version) {
         ]
     case (false, true):
         package.dependencies += [
-            .package(url: smithySwiftURL, .branch("main"))
+            .package(url: smithySwiftURL, .branch("day/expose-timeout"))
         ]
     case (false, false):
         package.dependencies += [
diff --git a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
index d92d6964f0a..aedeb005d5e 100644
--- a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
+++ b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
@@ -102,6 +102,11 @@ public class AWSClientConfiguration<ServiceSpecificConfiguration: AWSServiceSpec
     /// This structure is custom code-generated for each AWS service.
     public var serviceSpecific: ServiceSpecificConfiguration
 
+    /// The timeout for a request in milliseconds
+    ///
+    /// If none is provided the client with use default values based on the operation system.
+    public var connectTimeoutMs: UInt32?
+
     /// Internal designated init
     /// All convenience inits should call this.
     private init(
@@ -115,7 +120,8 @@ public class AWSClientConfiguration<ServiceSpecificConfiguration: AWSServiceSpec
         _ useFIPS: Swift.Bool?,
         _ retryStrategyOptions: RetryStrategyOptions?,
         _ appID: String?,
-        _ awsRetryMode: AWSRetryMode
+        _ awsRetryMode: AWSRetryMode,
+        _ connectTimeoutMs: UInt32? = nil
     ) throws {
         typealias RuntimeConfigType =
             DefaultSDKRuntimeConfiguration<DefaultRetryStrategy, DefaultRetryErrorInfoProvider>
@@ -128,8 +134,13 @@ public class AWSClientConfiguration<ServiceSpecificConfiguration: AWSServiceSpec
         self.useDualStack = useDualStack
         self.useFIPS = useFIPS
         self.clientLogMode = RuntimeConfigType.defaultClientLogMode
+        self.connectTimeoutMs = connectTimeoutMs
         self.httpClientConfiguration = RuntimeConfigType.defaultHttpClientConfiguration
-        self.httpClientEngine = RuntimeConfigType.defaultHttpClientEngine
+        if let connectTimeoutMs = self.connectTimeoutMs {
+            self.httpClientEngine = RuntimeConfigType.httpClientEngineWithTimeout(timeoutMs: connectTimeoutMs)
+        } else {
+            self.httpClientEngine = RuntimeConfigType.defaultHttpClientEngine
+        }
         self.idempotencyTokenGenerator = RuntimeConfigType.defaultIdempotencyTokenGenerator
         self.logger = RuntimeConfigType.defaultLogger(clientName: self.serviceSpecific.clientName)
         self.retryStrategyOptions = retryStrategyOptions ?? RuntimeConfigType.defaultRetryStrategyOptions
@@ -162,7 +173,8 @@ extension AWSClientConfiguration {
         useFIPS: Swift.Bool? = nil,
         retryMode: AWSRetryMode? = nil,
         maxAttempts: Int? = nil,
-        appID: String? = nil
+        appID: String? = nil,
+        connectTimeoutMs: UInt32? = nil
     ) async throws {
         let fileBasedConfig = try await CRTFileBasedConfiguration.makeAsync()
         let resolvedRegionResolver = try regionResolver ?? DefaultRegionResolver { _, _ in fileBasedConfig }
@@ -200,7 +212,8 @@ extension AWSClientConfiguration {
             useFIPS,
             retryStrategyOptions,
             resolvedAppID,
-            resolvedAWSRetryMode
+            resolvedAWSRetryMode,
+            connectTimeoutMs
         )
     }
 
@@ -214,7 +227,8 @@ extension AWSClientConfiguration {
         useFIPS: Swift.Bool? = nil,
         retryMode: AWSRetryMode? = nil,
         maxAttempts: Int? = nil,
-        appID: String? = nil
+        appID: String? = nil,
+        connectTimeoutMs: UInt32? = nil
     ) throws {
         let fileBasedConfig = try CRTFileBasedConfiguration.make()
         let resolvedCredentialsProvider: CredentialsProviding
@@ -245,7 +259,8 @@ extension AWSClientConfiguration {
             useFIPS,
             retryStrategyOptions,
             resolvedAppID,
-            resolvedAWSRetryMode
+            resolvedAWSRetryMode,
+            connectTimeoutMs
         )
     }
 
diff --git a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
index 04e9aca4451..0adf15530a5 100644
--- a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
+++ b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
@@ -63,6 +63,14 @@ class AWSClientConfigurationTests: XCTestCase {
         let subject = try await Subject(region: region, appID: appID)
         XCTAssertEqual(subject.appID, appID)
     }
+
+    // MARK: - Timeout
+
+    func test_async_configureTimeoutOptionsFromParams() throws {
+        let customTimeout = 10_000
+        let subject = try Subject(region: region, connectTimeoutMs: customTimeout)
+        XCTAssertEqual(subject.connectTimeoutMs, customTimeout)
+    }
 }
 
 struct TestAWSServiceSpecificConfiguration: AWSServiceSpecificConfiguration {
@@ -78,4 +86,5 @@ struct TestAWSServiceSpecificConfiguration: AWSServiceSpecificConfiguration {
 
     var serviceName: String { "TestAWSService" }
     var clientName: String { "TestAWSServiceClient" }
+    var connectTimeoutMs: UInt32 { 10_000 }
 }

From 887b095e14d8a2bc2d62173f23313d7b3e71703f Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Mon, 25 Sep 2023 17:59:39 -0400
Subject: [PATCH 2/7] configure smithy-swift branch for testing

---
 Package.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 51b8921d4bd..6e0a6d5e995 100644
--- a/Package.swift
+++ b/Package.swift
@@ -68,11 +68,11 @@ func addClientRuntimeDependency(_ version: Version) {
         ]
     case (false, true):
         package.dependencies += [
-            .package(url: smithySwiftURL, .branch("day/expose-timeout"))
+            .package(url: smithySwiftURL, .branch("main"))
         ]
     case (false, false):
         package.dependencies += [
-            .package(url: smithySwiftURL, .exact(version))
+            .package(url: smithySwiftURL, .branch("day/expose-timeout"))
         ]
     }
 }

From b8d4c57e50953a816dce0ba9bec94cdff5f8ae67 Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Mon, 25 Sep 2023 18:31:12 -0400
Subject: [PATCH 3/7] revert package.swift change

---
 Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index 6e0a6d5e995..f9f5e768b40 100644
--- a/Package.swift
+++ b/Package.swift
@@ -72,7 +72,7 @@ func addClientRuntimeDependency(_ version: Version) {
         ]
     case (false, false):
         package.dependencies += [
-            .package(url: smithySwiftURL, .branch("day/expose-timeout"))
+            .package(url: smithySwiftURL, .exact(version))
         ]
     }
 }

From 9c58361870dcee072bc840cf97d1de3bb6ea010c Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Mon, 25 Sep 2023 18:58:59 -0400
Subject: [PATCH 4/7] update type of customTimeout in test

---
 .../AWSClientRuntimeTests/AWSClientConfigurationTests.swift     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
index 0adf15530a5..a630bb12d16 100644
--- a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
+++ b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
@@ -67,7 +67,7 @@ class AWSClientConfigurationTests: XCTestCase {
     // MARK: - Timeout
 
     func test_async_configureTimeoutOptionsFromParams() throws {
-        let customTimeout = 10_000
+        let customTimeout: UInt32 = 10_000
         let subject = try Subject(region: region, connectTimeoutMs: customTimeout)
         XCTAssertEqual(subject.connectTimeoutMs, customTimeout)
     }

From 7806078f0fc2c9f4941f118fedc12fa525395837 Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Tue, 26 Sep 2023 10:16:35 -0400
Subject: [PATCH 5/7] fix typo

---
 Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
index aedeb005d5e..5454e8661b4 100644
--- a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
+++ b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
@@ -104,7 +104,7 @@ public class AWSClientConfiguration<ServiceSpecificConfiguration: AWSServiceSpec
 
     /// The timeout for a request in milliseconds
     ///
-    /// If none is provided the client with use default values based on the operation system.
+    /// If none is provided the client will use default values based on the operation system.
     public var connectTimeoutMs: UInt32?
 
     /// Internal designated init

From 54a6b1c9fa628d384f70cc93d2c63637b781c6bc Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Tue, 26 Sep 2023 15:02:22 -0400
Subject: [PATCH 6/7] fix nit and add test for default values

---
 .../AWSClientRuntime/AWSClientConfiguration.swift  |  2 +-
 .../AWSClientConfigurationTests.swift              | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
index 5454e8661b4..2ec22d16b17 100644
--- a/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
+++ b/Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
@@ -104,7 +104,7 @@ public class AWSClientConfiguration<ServiceSpecificConfiguration: AWSServiceSpec
 
     /// The timeout for a request in milliseconds
     ///
-    /// If none is provided the client will use default values based on the operation system.
+    /// If none is provided the client will use default values based on the platform.
     public var connectTimeoutMs: UInt32?
 
     /// Internal designated init
diff --git a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
index a630bb12d16..bea1b7653be 100644
--- a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
+++ b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
@@ -66,7 +66,19 @@ class AWSClientConfigurationTests: XCTestCase {
 
     // MARK: - Timeout
 
-    func test_async_configureTimeoutOptionsFromParams() throws {
+    func test_sync_defaultTimeout() throws {
+        let subject = try Subject(region: region)
+
+#if os(iOS) || os(watchOS)
+        // default in smithy-swift Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift#L57
+        XCTAssertEqual(subject.connectTimeoutMs, 30_000)
+#else
+        // default in SocketOptions class
+        XCTAssertEqual(subject.connectTimeoutMs, 3_000)
+#endif
+    }
+
+    func test_sync_configureTimeoutOptionsFromParams() throws {
         let customTimeout: UInt32 = 10_000
         let subject = try Subject(region: region, connectTimeoutMs: customTimeout)
         XCTAssertEqual(subject.connectTimeoutMs, customTimeout)

From 2ef372976d9479d9b8a864e6834e41678f1b8af0 Mon Sep 17 00:00:00 2001
From: David Yaffe <dayaffe@amazon.com>
Date: Tue, 26 Sep 2023 16:18:31 -0400
Subject: [PATCH 7/7] remove default test, info is not available outside of CRT

---
 .../AWSClientConfigurationTests.swift                | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
index bea1b7653be..1a6769ab5fb 100644
--- a/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
+++ b/Tests/Core/AWSClientRuntimeTests/AWSClientConfigurationTests.swift
@@ -66,18 +66,6 @@ class AWSClientConfigurationTests: XCTestCase {
 
     // MARK: - Timeout
 
-    func test_sync_defaultTimeout() throws {
-        let subject = try Subject(region: region)
-
-#if os(iOS) || os(watchOS)
-        // default in smithy-swift Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift#L57
-        XCTAssertEqual(subject.connectTimeoutMs, 30_000)
-#else
-        // default in SocketOptions class
-        XCTAssertEqual(subject.connectTimeoutMs, 3_000)
-#endif
-    }
-
     func test_sync_configureTimeoutOptionsFromParams() throws {
         let customTimeout: UInt32 = 10_000
         let subject = try Subject(region: region, connectTimeoutMs: customTimeout)