diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt index 4356800488f..e603672d5d1 100644 --- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt +++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/glacier/GlacierAccountIdDefault.kt @@ -47,7 +47,7 @@ private class GlacierAccountIdMiddleware : ProtocolMiddleware { val accountId = ctx.model.expectShape(op.input.get()).members().first { it.memberName.lowercase() == "accountid" } writer.addImport(RuntimeTypes.Http.Operation.OperationRequest) - writer.withBlock("execution.initialize.intercept { req, next -> ", "}") { + writer.withBlock("op.execution.initialize.intercept { req, next -> ", "}") { openBlock("if (req.subject.#L.isNullOrEmpty()) {", accountId.defaultName()) .write("val updated = req.subject.copy { #L = #S }", accountId.defaultName(), "-") .write("next.call(#T(req.context, updated))", RuntimeTypes.Http.Operation.OperationRequest) diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt index a14955fb41d..5bffdb8bc58 100644 --- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt +++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/RestXml.kt @@ -174,7 +174,7 @@ open class RestXml : AwsHttpBindingProtocolGenerator() { // in two different contexts val boundMemberName = boundMember.capitalizedDefaultName() val deserializeLambdaIdent = "deserialize$boundMemberName" - writer.withBlock("val $deserializeLambdaIdent = suspend {", "}") { + writer.withBlock("val $deserializeLambdaIdent = {", "}") { write("val builder = #T.builder()", memberSymbol) renderDeserializerBody(ctx, copyWithMemberTraits, targetShape.members().toList(), writer) write("builder.build()") diff --git a/gradle.properties b/gradle.properties index dbca0cbdb09..21fae87c24e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ sdkVersion=0.9.3-SNAPSHOT smithyVersion=1.13.1 smithyGradleVersion=0.5.3 # smithy-kotlin codegen and runtime are versioned together -smithyKotlinVersion=0.7.1-alpha +smithyKotlinVersion=0.7.2-SNAPSHOT # kotlin kotlinVersion=1.5.31 diff --git a/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt b/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt index 0513f4ec64a..9e75b7a55a2 100644 --- a/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt +++ b/services/s3/common/src/aws/sdk/kotlin/services/s3/internal/GetBucketLocationOperationDeserializer.kt @@ -28,7 +28,7 @@ internal class GetBucketLocationOperationDeserializer : HttpDeserialize Sender @@ -31,7 +30,7 @@ class S3ErrorDeserializerTest { } @Test - fun `it partially deserializes s3 errors`() = runSuspendTest { + fun `it partially deserializes s3 errors`() { val tests = listOf( """