fix: Correct serde for restJson1 event streams that contain errors (#…

…1160)
awslabs · Oct 2, 2023 · c0fa0e4 · c0fa0e4
1 parent 56298ea
commit c0fa0e4
Show file tree

Hide file tree

Showing 7 changed files with 4,465 additions and 6 deletions.
diff --git a/codegen/sdk-codegen/aws-models/bedrock-runtime.2023-09-30.json b/codegen/sdk-codegen/aws-models/bedrock-runtime.2023-09-30.json
diff --git a/codegen/sdk-codegen/aws-models/bedrock.2023-04-20.json b/codegen/sdk-codegen/aws-models/bedrock.2023-04-20.json
diff --git a/...c/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpBindingProtocolGenerator.kt b/...c/main/kotlin/software/amazon/smithy/aws/swift/codegen/AWSHttpBindingProtocolGenerator.kt
@@ -98,9 +98,9 @@ abstract class AWSHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         members: List<MemberShape>,
         writer: SwiftWriter,
         defaultTimestampFormat: TimestampFormatTrait.Format,
-        path: String
+        path: String?
     ) {
-        val encodeGenerator = StructEncodeGenerator(ctx, members, writer, defaultTimestampFormat)
+        val encodeGenerator = StructEncodeGenerator(ctx, members, writer, defaultTimestampFormat, path)
         encodeGenerator.render()
     }
 

diff --git a/...rc/main/kotlin/software/amazon/smithy/aws/swift/codegen/MessageUnmarshallableGenerator.kt b/...rc/main/kotlin/software/amazon/smithy/aws/swift/codegen/MessageUnmarshallableGenerator.kt
@@ -75,7 +75,9 @@ class MessageUnmarshallableGenerator(val ctx: ProtocolGenerator.GenerationContex
                             streamShape.eventStreamErrors(ctx.model).forEach { member ->
                                 writer.write("case \"${member.memberName}\":")
                                 writer.indent {
-                                    writer.write("return try decoder.decode(responseBody: message.payload) as ${member.memberName}")
+                                    val targetShape = ctx.model.expectShape(member.target)
+                                    val symbol = ctx.symbolProvider.toSymbol(targetShape)
+                                    writer.write("return try decoder.decode(responseBody: message.payload) as \$N", symbol)
                                 }
                             }
                             writer.write("default:")

diff --git a/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/awsquery/AwsQueryProtocolGenerator.kt b/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/awsquery/AwsQueryProtocolGenerator.kt
@@ -65,7 +65,7 @@ open class AwsQueryProtocolGenerator : AWSHttpBindingProtocolGenerator() {
         members: List<MemberShape>,
         writer: SwiftWriter,
         defaultTimestampFormat: TimestampFormatTrait.Format,
-        path: String
+        path: String?
     ) {
         val customizations = AwsQueryFormURLEncodeCustomizations()
         val encoder = StructEncodeFormURLGenerator(ctx, customizations, shapeContainingMembers, shapeMetadata, members, writer, defaultTimestampFormat)

diff --git a/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/ec2query/Ec2QueryProtocolGenerator.kt b/...ain/kotlin/software/amazon/smithy/aws/swift/codegen/ec2query/Ec2QueryProtocolGenerator.kt
@@ -61,7 +61,7 @@ class Ec2QueryProtocolGenerator : AWSHttpBindingProtocolGenerator() {
         members: List<MemberShape>,
         writer: SwiftWriter,
         defaultTimestampFormat: TimestampFormatTrait.Format,
-        path: String
+        path: String?
     ) {
         val customizations = Ec2QueryFormURLEncodeCustomizations()
         val encoder = StructEncodeFormURLGenerator(ctx, customizations, shapeContainingMembers, shapeMetadata, members, writer, defaultTimestampFormat)

diff --git a/.../main/kotlin/software/amazon/smithy/aws/swift/codegen/restxml/RestXmlProtocolGenerator.kt b/.../main/kotlin/software/amazon/smithy/aws/swift/codegen/restxml/RestXmlProtocolGenerator.kt
@@ -56,7 +56,7 @@ class RestXmlProtocolGenerator : AWSHttpBindingProtocolGenerator() {
         members: List<MemberShape>,
         writer: SwiftWriter,
         defaultTimestampFormat: TimestampFormatTrait.Format,
-        path: String
+        path: String?
     ) {
         val encoder = StructEncodeXMLGenerator(ctx, shapeContainingMembers, members, writer, defaultTimestampFormat)
         encoder.render()