Skip to content

Commit a1176d5

Browse files
authored
refactor: track upstream HTTP serde changes (#1263)
1 parent 076a62e commit a1176d5

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3OperationErrorHandler.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ class S3OperationErrorHandler : KotlinIntegration {
6363
namespace = "${ctx.settings.pkg.name}.internal"
6464
}
6565

66-
writer.write("val payload = call.response.body.#T()", RuntimeTypes.Http.readAll)
67-
.write("val wrappedResponse = call.response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
66+
writer.write("val wrappedResponse = call.response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
6867
.write("val wrappedCall = call.copy(response = wrappedResponse)")
6968
.write("")
7069
.write("val errorDetails = try {")
@@ -97,7 +96,7 @@ class S3OperationErrorHandler : KotlinIntegration {
9796
name = "${errSymbol.name}Deserializer"
9897
namespace = ctx.settings.pkg.serde
9998
}
100-
writer.write("#S -> #T().deserialize(context, wrappedCall)", err.name, errDeserializerSymbol)
99+
writer.write("#S -> #T().deserialize(context, wrappedCall, payload)", err.name, errDeserializerSymbol)
101100
}
102101
write("else -> #T(errorDetails.message)", exceptionBaseSymbol)
103102
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ coroutines-version = "1.7.3"
99
atomicfu-version = "0.23.1"
1010

1111
# smithy-kotlin codegen and runtime are versioned separately
12-
smithy-kotlin-runtime-version = "1.1.1"
13-
smithy-kotlin-codegen-version = "0.31.1"
12+
smithy-kotlin-runtime-version = "1.1.3"
13+
smithy-kotlin-codegen-version = "0.31.3"
1414

1515
# codegen
1616
smithy-version = "1.45.0"

services/route53/common/test/aws/sdk/kotlin/services/route53/internal/ChangeResourceRecordSetsUnmarshallingTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ChangeResourceRecordSetsUnmarshallingTest {
4141

4242
val exception = assertFailsWith<InvalidChangeBatch> {
4343
runBlocking {
44-
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
44+
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call, bodyText.encodeToByteArray())
4545
}
4646
}
4747
assertEquals(listOf<String>("InvalidChangeBatch message"), exception.messages)
@@ -70,7 +70,7 @@ class ChangeResourceRecordSetsUnmarshallingTest {
7070

7171
val exception = assertFailsWith<InvalidChangeBatch> {
7272
runBlocking {
73-
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
73+
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call, bodyText.encodeToByteArray())
7474
}
7575
}
7676
assertEquals(listOf<String>("InvalidChangeBatch message 1", "InvalidChangeBatch message 2"), exception.messages)
@@ -100,7 +100,7 @@ class ChangeResourceRecordSetsUnmarshallingTest {
100100

101101
val exception = assertFailsWith<InvalidChangeBatch> {
102102
runBlocking {
103-
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
103+
ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call, bodyText.encodeToByteArray())
104104
}
105105
}
106106
assertEquals(listOf<String>("InvalidChangeBatch message 1", "InvalidChangeBatch message 2"), exception.messages)

services/s3/common/test/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class GetBucketLocationOperationDeserializerTest {
3838
val call = HttpCall(HttpRequestBuilder().build(), response, Instant.now(), Instant.now())
3939

4040
val actual = runBlocking {
41-
GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call)
41+
GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call, responseXML.encodeToByteArray())
4242
}
4343

4444
assertEquals(BucketLocationConstraint.UsWest2, actual.locationConstraint)
@@ -63,7 +63,7 @@ class GetBucketLocationOperationDeserializerTest {
6363
val call = HttpCall(HttpRequestBuilder().build(), response, Instant.now(), Instant.now())
6464
val exception = assertFailsWith<S3Exception> {
6565
runBlocking {
66-
GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call)
66+
GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call, responseXML.encodeToByteArray())
6767
}
6868
}
6969

0 commit comments

Comments
 (0)