refactor: track upstream HttpDeserialize changes (#1034)

aajtodd · web-flow · commit 223d38b63335 · 2023-08-29T12:11:37.000-04:00
diff --git a/.changes/55fc25d8-eb87-49fd-adfa-8b5a47b7713b.json b/.changes/55fc25d8-eb87-49fd-adfa-8b5a47b7713b.json
@@ -0,0 +1,5 @@
+{
+    "id": "55fc25d8-eb87-49fd-adfa-8b5a47b7713b",
+    "type": "misc",
+    "description": "**BREAKING**: Refactor HttpCall and HttpResponse types"
+}
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt
@@ -15,6 +15,7 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProviderExceptio
 import aws.smithy.kotlin.runtime.client.endpoints.Endpoint
 import aws.smithy.kotlin.runtime.config.resolve
 import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.engine.DefaultHttpEngine
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
 import aws.smithy.kotlin.runtime.http.operation.*
@@ -156,7 +157,8 @@ public class EcsCredentialsProvider internal constructor(
 }
 
 private class EcsCredentialsDeserializer : HttpDeserialize<Credentials> {
-    override suspend fun deserialize(context: ExecutionContext, response: HttpResponse): Credentials {
+    override suspend fun deserialize(context: ExecutionContext, call: HttpCall): Credentials {
+        val response = call.response
         if (!response.status.isSuccess()) {
             throwCredentialsResponseException(response)
         }
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt
@@ -13,10 +13,10 @@ import aws.smithy.kotlin.runtime.client.LogMode
 import aws.smithy.kotlin.runtime.client.SdkClientOption
 import aws.smithy.kotlin.runtime.client.endpoints.Endpoint
 import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.engine.DefaultHttpEngine
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
 import aws.smithy.kotlin.runtime.http.operation.*
-import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.io.closeIfCloseable
 import aws.smithy.kotlin.runtime.io.middleware.Phase
@@ -108,7 +108,8 @@ public class ImdsClient private constructor(builder: Builder) : InstanceMetadata
         val op = SdkHttpOperation.build<Unit, String> {
             serializer = UnitSerializer
             deserializer = object : HttpDeserialize<String> {
-                override suspend fun deserialize(context: ExecutionContext, response: HttpResponse): String {
+                override suspend fun deserialize(context: ExecutionContext, call: HttpCall): String {
+                    val response = call.response
                     if (response.status.isSuccess()) {
                         val payload = response.body.readAll() ?: throw EC2MetadataError(response.status.value, "no metadata payload")
                         return payload.decodeToString()
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/TokenMiddleware.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/TokenMiddleware.kt
@@ -6,13 +6,13 @@
 package aws.sdk.kotlin.runtime.config.imds
 
 import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.complete
 import aws.smithy.kotlin.runtime.http.operation.ModifyRequestMiddleware
 import aws.smithy.kotlin.runtime.http.operation.SdkHttpOperation
 import aws.smithy.kotlin.runtime.http.operation.SdkHttpRequest
 import aws.smithy.kotlin.runtime.http.operation.setResolvedEndpoint
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.url
-import aws.smithy.kotlin.runtime.http.response.complete
 import aws.smithy.kotlin.runtime.telemetry.logging.trace
 import aws.smithy.kotlin.runtime.time.Clock
 import aws.smithy.kotlin.runtime.util.CachedValue
diff --git a/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt b/aws-runtime/aws-config/common/test/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProviderTest.kt
@@ -11,13 +11,13 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProviderException
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
 import aws.smithy.kotlin.runtime.http.content.ByteArrayContent
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineConfig
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.httptest.TestEngine
 import aws.smithy.kotlin.runtime.httptest.buildTestConnection
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3Generator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/S3Generator.kt
@@ -60,14 +60,15 @@ class S3Generator : RestXml() {
             namespace = "${ctx.settings.pkg.name}.internal"
         }
 
-        writer.write("val payload = response.body.#T()", RuntimeTypes.Http.readAll)
-            .write("val wrappedResponse = response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
+        writer.write("val payload = call.response.body.#T()", RuntimeTypes.Http.readAll)
+            .write("val wrappedResponse = call.response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
+            .write("val wrappedCall = call.copy(response = wrappedResponse)")
             .write("")
             .write("val errorDetails = try {")
             .indent()
             .call {
                 // customize error matching to handle HeadObject/HeadBucket error responses which have no payload
-                writer.write("if (payload == null && response.status == #T.NotFound) {", RuntimeTypes.Http.StatusCode)
+                writer.write("if (payload == null && call.response.status == #T.NotFound) {", RuntimeTypes.Http.StatusCode)
                     .indent()
                     .write("#T(code = #S)", s3ErrorDetails, "NotFound")
                     .dedent()
@@ -93,7 +94,7 @@ class S3Generator : RestXml() {
                     name = "${errSymbol.name}Deserializer"
                     namespace = "${ctx.settings.pkg.name}.transform"
                 }
-                writer.write("#S -> #T().deserialize(context, wrappedResponse)", getErrorCode(ctx, err), errDeserializerSymbol)
+                writer.write("#S -> #T().deserialize(context, wrappedCall)", getErrorCode(ctx, err), errDeserializerSymbol)
             }
             write("else -> #T(errorDetails.message)", exceptionBaseSymbol)
         }
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/AwsHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -92,10 +92,10 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
     override fun operationErrorHandler(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Symbol =
         op.errorHandler(ctx.settings) { writer ->
             writer.withBlock(
-                "private suspend fun ${op.errorHandlerName()}(context: #T, response: #T): #Q {",
+                "private suspend fun ${op.errorHandlerName()}(context: #T, call: #T): #Q {",
                 "}",
                 RuntimeTypes.Core.ExecutionContext,
-                RuntimeTypes.Http.Response.HttpResponse,
+                RuntimeTypes.Http.HttpCall,
                 KotlinTypes.Nothing,
             ) {
                 renderThrowOperationError(ctx, op, writer)
@@ -110,8 +110,9 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         writer: KotlinWriter,
     ) {
         val exceptionBaseSymbol = ExceptionBaseClassGenerator.baseExceptionSymbol(ctx.settings)
-        writer.write("val payload = response.body.#T()", RuntimeTypes.Http.readAll)
-            .write("val wrappedResponse = response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
+        writer.write("val payload = call.response.body.#T()", RuntimeTypes.Http.readAll)
+            .write("val wrappedResponse = call.response.#T(payload)", RuntimeTypes.AwsProtocolCore.withPayload)
+            .write("val wrappedCall = call.copy(response = wrappedResponse)")
             .write("")
             .declareSection(ProtocolErrorDeserialization)
             .write("val errorDetails = try {")
@@ -129,7 +130,7 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
 
         if (ctx.service.hasTrait<AwsQueryCompatibleTrait>()) {
             writer.write("var queryErrorDetails: #T? = null", RuntimeTypes.AwsProtocolCore.AwsQueryCompatibleErrorDetails)
-            writer.withBlock("response.headers[#T]?.let {", "}", RuntimeTypes.AwsProtocolCore.XAmznQueryErrorHeader) {
+            writer.withBlock("call.response.headers[#T]?.let {", "}", RuntimeTypes.AwsProtocolCore.XAmznQueryErrorHeader) {
                 openBlock("queryErrorDetails = try {")
                 write("#T.parse(it)", RuntimeTypes.AwsProtocolCore.AwsQueryCompatibleErrorDetails)
                 closeAndOpenBlock("} catch (ex: Exception) {")
@@ -148,7 +149,7 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
                     name = "${errSymbol.name}Deserializer"
                     namespace = "${ctx.settings.pkg.name}.transform"
                 }
-                writer.write("#S -> #T().deserialize(context, wrappedResponse)", getErrorCode(ctx, err), errDeserializerSymbol)
+                writer.write("#S -> #T().deserialize(context, wrappedCall)", getErrorCode(ctx, err), errDeserializerSymbol)
             }
             write("else -> #T(errorDetails.message)", exceptionBaseSymbol)
         }
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/json/JsonHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/json/JsonHttpBindingProtocolGenerator.kt
@@ -37,6 +37,6 @@ abstract class JsonHttpBindingProtocolGenerator : AwsHttpBindingProtocolGenerato
         op: OperationShape,
         writer: KotlinWriter,
     ) {
-        writer.write("#T.deserialize(response.headers, payload)", RuntimeTypes.AwsJsonProtocols.RestJsonErrorDeserializer)
+        writer.write("#T.deserialize(call.response.headers, payload)", RuntimeTypes.AwsJsonProtocols.RestJsonErrorDeserializer)
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -6,13 +6,13 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=2G
 
 # sdk
-sdkVersion=0.31.1-SNAPSHOT
+sdkVersion=0.32.0-SNAPSHOT
 
 # codegen
 smithyVersion=1.29.0
 smithyGradleVersion=0.6.0
 # smithy-kotlin codegen and runtime are versioned together
-smithyKotlinVersion=0.26.0
+smithyKotlinVersion=0.27.0-SNAPSHOT
 
 # kotlin
 kotlinVersion=1.8.22
@@ -37,4 +37,4 @@ mockkVersion=1.13.3
 slf4jVersion=2.0.6
 
 # dokka config (values specified at build-time as needed)
-smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$smithyKotlinVersion/
+smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$smithyKotlinVersion/
diff --git a/services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt b/services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt
@@ -9,11 +9,11 @@ import aws.sdk.kotlin.services.polly.model.OutputFormat
 import aws.sdk.kotlin.services.polly.model.SynthesizeSpeechRequest
 import aws.sdk.kotlin.services.polly.model.VoiceId
 import aws.sdk.kotlin.services.polly.presigners.presignSynthesizeSpeech
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineConfig
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
diff --git a/services/polly/e2eTest/src/PollyPresignerTest.kt b/services/polly/e2eTest/src/PollyPresignerTest.kt
@@ -10,7 +10,7 @@ import aws.sdk.kotlin.services.polly.model.VoiceId
 import aws.sdk.kotlin.services.polly.presigners.presignSynthesizeSpeech
 import aws.sdk.kotlin.testing.withAllEngines
 import aws.smithy.kotlin.runtime.http.SdkHttpClient
-import aws.smithy.kotlin.runtime.http.response.complete
+import aws.smithy.kotlin.runtime.http.complete
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.Test
diff --git a/services/route53/common/test/aws/sdk/kotlin/services/route53/internal/ChangeResourceRecordSetsUnmarshallingTest.kt b/services/route53/common/test/aws/sdk/kotlin/services/route53/internal/ChangeResourceRecordSetsUnmarshallingTest.kt
@@ -9,7 +9,9 @@ import aws.sdk.kotlin.services.route53.model.Route53Exception
 import aws.sdk.kotlin.services.route53.transform.ChangeResourceRecordSetsOperationDeserializer
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
+import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import kotlinx.coroutines.runBlocking
@@ -36,9 +38,11 @@ class ChangeResourceRecordSetsUnmarshallingTest {
             HttpBody.fromBytes(bodyText.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response)
+
         val exception = assertThrows<InvalidChangeBatch> {
             runBlocking {
-                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), response)
+                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
             }
         }
         assertEquals(listOf<String>("InvalidChangeBatch message"), exception.messages)
@@ -63,9 +67,11 @@ class ChangeResourceRecordSetsUnmarshallingTest {
             HttpBody.fromBytes(bodyText.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response)
+
         val exception = assertThrows<InvalidChangeBatch> {
             runBlocking {
-                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), response)
+                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
             }
         }
         assertEquals(listOf<String>("InvalidChangeBatch message 1", "InvalidChangeBatch message 2"), exception.messages)
@@ -91,9 +97,11 @@ class ChangeResourceRecordSetsUnmarshallingTest {
             HttpBody.fromBytes(bodyText.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response)
+
         val exception = assertThrows<InvalidChangeBatch> {
             runBlocking {
-                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), response)
+                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
             }
         }
         assertEquals(listOf<String>("InvalidChangeBatch message 1", "InvalidChangeBatch message 2"), exception.messages)
@@ -120,9 +128,11 @@ class ChangeResourceRecordSetsUnmarshallingTest {
             HttpBody.fromBytes(bodyText.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response)
+
         val exception = assertThrows<Route53Exception> {
             runBlocking {
-                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), response)
+                ChangeResourceRecordSetsOperationDeserializer().deserialize(ExecutionContext(), call)
             }
         }
         assertEquals("ChangeResourceRecordSets error message", exception.message)
diff --git a/services/s3/common/test/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializerTest.kt b/services/s3/common/test/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializerTest.kt
@@ -10,9 +10,12 @@ import aws.sdk.kotlin.services.s3.model.S3Exception
 import aws.sdk.kotlin.services.s3.transform.GetBucketLocationOperationDeserializer
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
+import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
+import aws.smithy.kotlin.runtime.time.Instant
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
@@ -32,8 +35,10 @@ class GetBucketLocationOperationDeserializerTest {
             HttpBody.fromBytes(responseXML.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response, Instant.now(), Instant.now())
+
         val actual = runBlocking {
-            GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), response)
+            GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call)
         }
 
         assertEquals(BucketLocationConstraint.UsWest2, actual.locationConstraint)
@@ -55,9 +60,10 @@ class GetBucketLocationOperationDeserializerTest {
             HttpBody.fromBytes(responseXML.encodeToByteArray()),
         )
 
+        val call = HttpCall(HttpRequestBuilder().build(), response, Instant.now(), Instant.now())
         val exception = assertThrows<S3Exception> {
             runBlocking {
-                GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), response)
+                GetBucketLocationOperationDeserializer().deserialize(ExecutionContext(), call)
             }
         }
 
diff --git a/services/s3/common/test/aws/sdk/kotlin/services/s3/presigners/PresignersTest.kt b/services/s3/common/test/aws/sdk/kotlin/services/s3/presigners/PresignersTest.kt
@@ -9,10 +9,10 @@ import aws.sdk.kotlin.services.s3.S3Client
 import aws.sdk.kotlin.services.s3.model.ObjectCannedAcl
 import aws.sdk.kotlin.services.s3.model.PutObjectRequest
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineConfig
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.util.text.urlDecodeComponent
 import kotlinx.coroutines.test.runTest
diff --git a/services/s3/e2eTest/src/S3PresignerTest.kt b/services/s3/e2eTest/src/S3PresignerTest.kt
@@ -13,7 +13,7 @@ import aws.sdk.kotlin.testing.PRINTABLE_CHARS
 import aws.sdk.kotlin.testing.withAllEngines
 import aws.smithy.kotlin.runtime.content.decodeToString
 import aws.smithy.kotlin.runtime.http.SdkHttpClient
-import aws.smithy.kotlin.runtime.http.response.complete
+import aws.smithy.kotlin.runtime.http.complete
 import aws.smithy.kotlin.runtime.http.toByteStream
 import kotlinx.coroutines.*
 import org.junit.jupiter.api.AfterAll
diff --git a/services/sts/common/test/aws/sdk/kotlin/services/sts/StsAuthTests.kt b/services/sts/common/test/aws/sdk/kotlin/services/sts/StsAuthTests.kt
@@ -9,12 +9,12 @@ import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineConfig
 import aws.smithy.kotlin.runtime.http.engine.callContext
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.time.Instant
diff --git a/services/sts/e2eTest/src/STSPresignerTest.kt b/services/sts/e2eTest/src/STSPresignerTest.kt
@@ -9,7 +9,7 @@ import aws.sdk.kotlin.services.sts.presigners.presignGetCallerIdentity
 import aws.sdk.kotlin.testing.withAllEngines
 import aws.smithy.kotlin.runtime.content.decodeToString
 import aws.smithy.kotlin.runtime.http.SdkHttpClient
-import aws.smithy.kotlin.runtime.http.response.complete
+import aws.smithy.kotlin.runtime.http.complete
 import aws.smithy.kotlin.runtime.http.toByteStream
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.TestInstance

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ abstract class JsonHttpBindingProtocolGenerator : AwsHttpBindingProtocolGenerato`
`37`	`37`	`op: OperationShape,`
`38`	`38`	`writer: KotlinWriter,`
`39`	`39`	`) {`
`40`		`- writer.write("#T.deserialize(response.headers, payload)", RuntimeTypes.AwsJsonProtocols.RestJsonErrorDeserializer)`
	`40`	`+ writer.write("#T.deserialize(call.response.headers, payload)", RuntimeTypes.AwsJsonProtocols.RestJsonErrorDeserializer)`
`41`	`41`	`}`
`42`	`42`	`}`