fix: Correct serde for errors in event streams #585
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dayaffe
approved these changes
Sep 12, 2023
sichanyoo
reviewed
Sep 12, 2023
| @@ -232,9 +233,10 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator { | |||
| val httpBodyMembers = members.filter { it.isInHttpBody() } | |||
| generateCodingKeysForMembers(ctx, writer, httpBodyMembers) | |||
| writer.write("") | |||
| renderStructEncode(ctx, shape, mapOf(), httpBodyMembers, writer, defaultTimestampFormat) | |||
| val path = "properties.".takeIf { shape.hasTrait<ErrorTrait>() } ?: "" | |||
There was a problem hiding this comment.
This would make every error struct's members to be name-spaced under "properties" and not just errors embedded in event streams, right?
There was a problem hiding this comment.
Yes, the properties namespace will be used for both.
| @@ -154,7 +155,7 @@ abstract class MemberShapeDecodeGenerator( | |||
| */ | |||
| open fun renderAssigningDecodedMember(topLevelMember: MemberShape, decodedMemberName: String) { | |||
| val topLevelMemberName = ctx.symbolProvider.toMemberName(topLevelMember) | |||
| writer.write("\$L = \$L", topLevelMemberName, decodedMemberName) | |||
| writer.write("\$L\$L = \$L", path, topLevelMemberName, decodedMemberName) | |||
There was a problem hiding this comment.
Related to other comment I left - should there be some condition that checks that error is embedded in event streams?
There was a problem hiding this comment.
Not needed here, this code is not called and this decoder is not generated unless the error is a member of an event stream.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #
awslabs/aws-sdk-swift#1100
Description of changes
Fixes serializers / deserializers for errors that are embedded in event streams, by accounting for the custom error properties being namespaced under
properties.Scope
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.