From 776617bfd565328442d2c5102a90f18490b0bc9b Mon Sep 17 00:00:00 2001 From: 0marperez Date: Tue, 14 Oct 2025 16:28:51 -0400 Subject: [PATCH 1/2] misc: enum and int enum as event header tests --- .../eventstream/HttpEventStreamTests.kt | 4 ++++ .../event-stream-model-template.smithy | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/tests/codegen/event-stream/src/test/kotlin/aws/sdk/kotlin/tests/codegen/eventstream/HttpEventStreamTests.kt b/tests/codegen/event-stream/src/test/kotlin/aws/sdk/kotlin/tests/codegen/eventstream/HttpEventStreamTests.kt index 43f2b80339d..161f404322b 100644 --- a/tests/codegen/event-stream/src/test/kotlin/aws/sdk/kotlin/tests/codegen/eventstream/HttpEventStreamTests.kt +++ b/tests/codegen/event-stream/src/test/kotlin/aws/sdk/kotlin/tests/codegen/eventstream/HttpEventStreamTests.kt @@ -188,6 +188,8 @@ class HttpEventStreamTests { long = 9_000_000_000L string = "a tay is a hammer" timestamp = Instant.fromEpochSeconds(5) + enum = aws.sdk.kotlin.test.restjson1.model.Enum.fromValue("DIAMOND") + intEnum = IntEnum.fromValue(1) }, ) @@ -204,6 +206,8 @@ class HttpEventStreamTests { assertEquals(9_000_000_000L, headers["long"]?.expectInt64()) assertEquals("a tay is a hammer", headers["string"]?.expectString()) assertEquals(Instant.fromEpochSeconds(5), headers["timestamp"]?.expectTimestamp()) + assertEquals(aws.sdk.kotlin.test.restjson1.model.Enum.fromValue("DIAMOND").value, headers["enum"]?.expectString()) + assertEquals(IntEnum.fromValue(1).value, headers["intEnum"]?.expectInt32()) val deserialized = deserializedEvent(message) assertIs(deserialized) diff --git a/tests/codegen/event-stream/src/test/resources/event-stream-model-template.smithy b/tests/codegen/event-stream/src/test/resources/event-stream-model-template.smithy index dd32f77d8d7..699f084913a 100644 --- a/tests/codegen/event-stream/src/test/resources/event-stream-model-template.smithy +++ b/tests/codegen/event-stream/src/test/resources/event-stream-model-template.smithy @@ -1,3 +1,5 @@ +$version: "2" + namespace aws.sdk.kotlin.test use aws.protocols#restJson1 @@ -54,6 +56,8 @@ structure MessageWithHeaders { @eventHeader short: Short, @eventHeader string: String, @eventHeader timestamp: Timestamp, + @eventHeader enum: Enum, + @eventHeader intEnum: IntEnum, } structure MessageWithHeaderAndPayload { @eventHeader header: String, @@ -81,3 +85,18 @@ union TestStream { MessageWithUnboundPayloadTraits: MessageWithUnboundPayloadTraits, SomeError: SomeError, } + +enum Enum { + DIAMOND + CLUB + HEART + SPADE +} + +intEnum IntEnum { + JACK = 1 + QUEEN = 2 + KING = 3 + ACE = 4 + JOKER = 5 +} From b75ebe08b5efec062cd0e163dfdb888daf4fc0c0 Mon Sep 17 00:00:00 2001 From: 0marperez <60363173+0marperez@users.noreply.github.com> Date: Wed, 22 Oct 2025 15:30:04 -0400 Subject: [PATCH 2/2] Update libs.versions.toml --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 277af76e376..25cf3b2e928 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,8 +12,8 @@ atomicfu-version = "0.29.0" binary-compatibility-validator-version = "0.18.0" # smithy-kotlin codegen and runtime are versioned separately -smithy-kotlin-runtime-version = "1.5.12" -smithy-kotlin-codegen-version = "0.35.12" +smithy-kotlin-runtime-version = "1.5.16" +smithy-kotlin-codegen-version = "0.35.16" # codegen smithy-version = "1.62.0"