Skip to content

Commit d7077cb

Browse files
sichanyooSichan Yoojbelkins
authored
fix: Make default HTTP client provider use the customer-provided config if present (#1904)
Co-authored-by: Sichan Yoo <[email protected]> Co-authored-by: Josh Elkins <[email protected]>
1 parent acceb63 commit d7077cb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Diff for: codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpProtocolServiceClient.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class AWSHttpProtocolServiceClient(
9595
ConfigProperty(
9696
"httpClientEngine",
9797
SmithyHTTPAPITypes.HttpClient,
98-
{ it.format("AWSClientConfigDefaultsProvider.httpClientEngine()") },
98+
{ it.format("AWSClientConfigDefaultsProvider.httpClientEngine(httpClientConfiguration)") },
9999
)
100100
}
101101
"httpClientConfiguration" -> {
@@ -154,6 +154,9 @@ class AWSHttpProtocolServiceClient(
154154
"responseChecksumValidation" -> {
155155
writer.write("try AWSClientConfigDefaultsProvider.responseChecksumValidation(),")
156156
}
157+
"httpClientEngine" -> {
158+
writer.write("AWSClientConfigDefaultsProvider.httpClientEngine(),")
159+
}
157160
else -> {
158161
writer.write("\$L,", property.default?.render(writer) ?: "nil")
159162
}

Diff for: codegen/smithy-aws-swift-codegen/src/test/kotlin/software/amazon/smithy/aws/swift/codegen/awsrestjson/AWSRestJson1ProtocolGeneratorTests.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ extension ExampleClient {
207207
clientLogMode ?? AWSClientConfigDefaultsProvider.clientLogMode(),
208208
endpoint,
209209
idempotencyTokenGenerator ?? AWSClientConfigDefaultsProvider.idempotencyTokenGenerator(),
210-
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(),
210+
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(httpClientConfiguration),
211211
httpClientConfiguration ?? AWSClientConfigDefaultsProvider.httpClientConfiguration(),
212212
authSchemes ?? [AWSSDKHTTPAuth.SigV4AuthScheme()],
213213
authSchemeResolver ?? DefaultExampleAuthSchemeResolver(),
@@ -261,7 +261,7 @@ extension ExampleClient {
261261
clientLogMode ?? AWSClientConfigDefaultsProvider.clientLogMode(),
262262
endpoint,
263263
idempotencyTokenGenerator ?? AWSClientConfigDefaultsProvider.idempotencyTokenGenerator(),
264-
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(),
264+
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(httpClientConfiguration),
265265
httpClientConfiguration ?? AWSClientConfigDefaultsProvider.httpClientConfiguration(),
266266
authSchemes ?? [AWSSDKHTTPAuth.SigV4AuthScheme()],
267267
authSchemeResolver ?? DefaultExampleAuthSchemeResolver(),

0 commit comments

Comments
 (0)