Skip to content

fix: Allow Smithy enum & intEnum to bind to event headers #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
Merged

fix: Allow Smithy enum & intEnum to bind to event headers #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afa7ec5
fix: Allow Smithy enum & intEnum to bind to event headers
jbelkins Oct 8, 2025
f69d3e0
Fix ktlint, code cleanup
jbelkins Oct 8, 2025
ca248fa
Merge branch 'main' into jbe/enums_in_event_headers
jbelkins Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 16 additions & 29 deletions ...c/main/kotlin/software/amazon/smithy/swift/codegen/events/MessageMarshallableGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,33 +155,6 @@ class MessageMarshallableGenerator(
}
}

/**
*
* if let headerValue = value.blob {
* headers.append(.init(name: "blob", value: .byteArray(headerValue)))
* }
* if let headerValue = value.boolean {
* headers.append(.init(name: "boolean", value: .bool(headerValue)))
* }
* if let headerValue = value.byte {
* headers.append(.init(name: "byte", value: .byte(headerValue)))
* }
* if let headerValue = value.int {
* headers.append(.init(name: "int", value: .int32(Int32(headerValue))))
* }
* if let headerValue = value.long {
* headers.append(.init(name: "long", value: .int64(Int64(headerValue))))
* }
* if let headerValue = value.short {
* headers.append(.init(name: "short", value: .int16(headerValue)))
* }
* if let headerValue = value.string {
* headers.append(.init(name: "string", value: .string(headerValue)))
* }
* if let headerValue = value.timestamp {
* headers.append(.init(name: "timestamp", value: .timestamp(headerValue)))
* }
*/
private fun renderSerializeEventHeader(
ctx: ProtocolGenerator.GenerationContext,
member: MemberShape,
Expand All @@ -193,10 +166,10 @@ class MessageMarshallableGenerator(
ShapeType.BOOLEAN -> "bool"
ShapeType.BYTE -> "byte"
ShapeType.SHORT -> "int16"
ShapeType.INTEGER -> "int32"
ShapeType.INTEGER, ShapeType.INT_ENUM -> "int32"
ShapeType.LONG -> "int64"
ShapeType.BLOB -> "byteArray"
ShapeType.STRING -> "string"
ShapeType.STRING, ShapeType.ENUM -> "string"
ShapeType.TIMESTAMP -> "timestamp"
else -> throw CodegenException("unsupported shape type `${target.type}` for eventHeader member `$member`; target: $target")
}
Expand All @@ -207,9 +180,23 @@ class MessageMarshallableGenerator(
ShapeType.INTEGER -> {
writer.write("headers.append(.init(name: \"${member.memberName}\", value: .\$L(Int32(headerValue))))", headerValue)
}
ShapeType.INT_ENUM -> {
writer.write(
"headers.append(.init(name: \$S, value: .\$L(Int32(headerValue.rawValue))))",
member.memberName,
headerValue,
)
}
ShapeType.LONG -> {
writer.write("headers.append(.init(name: \"${member.memberName}\", value: .\$L(Int64(headerValue))))", headerValue)
}
ShapeType.ENUM -> {
writer.write(
"headers.append(.init(name: \$S, value: .\$L(headerValue.rawValue)))",
member.memberName,
headerValue,
)
}
else -> {
writer.write("headers.append(.init(name: \"${member.memberName}\", value: .\$L(headerValue)))", headerValue)
}
Expand Down
10 changes: 8 additions & 2 deletions ...main/kotlin/software/amazon/smithy/swift/codegen/events/MessageUnmarshallableGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ class MessageUnmarshallableGenerator(
ShapeType.BOOLEAN -> "bool"
ShapeType.BYTE -> "byte"
ShapeType.SHORT -> "int16"
ShapeType.INTEGER -> "int32"
ShapeType.INTEGER, ShapeType.INT_ENUM -> "int32"
ShapeType.LONG -> "int64"
ShapeType.BLOB -> "byteArray"
ShapeType.STRING -> "string"
ShapeType.STRING, ShapeType.ENUM -> "string"
ShapeType.TIMESTAMP -> "timestamp"
else -> throw CodegenException("unsupported eventHeader shape: member=$hdrBinding; targetShape=$target")
}
Expand All @@ -170,6 +170,12 @@ class MessageUnmarshallableGenerator(
ShapeType.INTEGER, ShapeType.LONG -> {
writer.write("event.\$L = Int(value)", memberName)
}
ShapeType.INT_ENUM -> {
writer.write("event.\$L = .init(rawValue: Int(value))", memberName)
}
ShapeType.ENUM -> {
writer.write("event.\$L = .init(rawValue: value)", memberName)
}
else -> {
writer.write("event.\$L = value", memberName)
}
Expand Down