Skip to content

Commit 16e97a3

Browse files
committed
use from: 1.22 and put back defaults
1 parent e912d69 commit 16e97a3

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

Package.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ let package = Package(
6262
.package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.54.2"),
6363
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
6464
.package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"),
65-
.package(url: "https://github.com/swift-server/async-http-client.git", exact: "1.22.0"),
65+
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.22.0"),
6666
]
6767

6868
let isDocCEnabled = ProcessInfo.processInfo.environment["AWS_SWIFT_SDK_ENABLE_DOCC"] != nil
@@ -117,7 +117,6 @@ let package = Package(
117117
"SmithyChecksumsAPI",
118118
"SmithyChecksums",
119119
"SmithyCBOR",
120-
"SmithySwiftNIO",
121120
.product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
122121
// Only include these on macOS, iOS, tvOS, watchOS, and macCatalyst (visionOS and Linux are excluded)
123122
.product(

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import SmithyTelemetryAPI
1717
import protocol SmithyRetriesAPI.RetryErrorInfoProvider
1818
import protocol SmithyRetriesAPI.RetryStrategy
1919
import struct SmithyRetriesAPI.RetryStrategyOptions
20-
import class SmithySwiftNIO.SwiftNIOHTTPClient
2120

2221
public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: RetryStrategy,
2322
DefaultSDKRuntimeRetryErrorInfoProvider: RetryErrorInfoProvider> {
@@ -93,21 +92,20 @@ public extension DefaultSDKRuntimeConfiguration {
9392
static func makeClient(
9493
httpClientConfiguration: HttpClientConfiguration = defaultHttpClientConfiguration
9594
) -> HTTPClient {
96-
return SmithySwiftNIO.SwiftNIOHTTPClient(httpClientConfiguration: httpClientConfiguration)
97-
// #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS) || os(macOS)
98-
// return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
99-
// #else
100-
// let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1000) }
101-
// let socketTimeout = UInt32(httpClientConfiguration.socketTimeout)
102-
// let config = CRTClientEngineConfig(
103-
// maxConnectionsPerEndpoint: httpClientConfiguration.maxConnections,
104-
// telemetry: httpClientConfiguration.telemetry ?? CRTClientEngine.noOpCrtClientEngineTelemetry,
105-
// connectTimeoutMs: connectTimeoutMs,
106-
// crtTlsOptions: httpClientConfiguration.tlsConfiguration as? CRTClientTLSOptions,
107-
// socketTimeout: socketTimeout
108-
// )
109-
// return CRTClientEngine(config: config)
110-
// #endif
95+
#if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS) || os(macOS)
96+
return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
97+
#else
98+
let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1000) }
99+
let socketTimeout = UInt32(httpClientConfiguration.socketTimeout)
100+
let config = CRTClientEngineConfig(
101+
maxConnectionsPerEndpoint: httpClientConfiguration.maxConnections,
102+
telemetry: httpClientConfiguration.telemetry ?? CRTClientEngine.noOpCrtClientEngineTelemetry,
103+
connectTimeoutMs: connectTimeoutMs,
104+
crtTlsOptions: httpClientConfiguration.tlsConfiguration as? CRTClientTLSOptions,
105+
socketTimeout: socketTimeout
106+
)
107+
return CRTClientEngine(config: config)
108+
#endif
111109
}
112110

113111
/// The default HTTP client configuration to use.

0 commit comments

Comments
 (0)