kn: merge from main

.github/workflows/api-compat-verification.yml

@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:

.github/workflows/artifact-size-metrics.yml

@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 
@@ -53,9 +55,9 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
       - name: Generate Artifact Size Metrics
-        run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
+        run: ./gradlew artifactSizeMetrics
       - name: Analyze Artifact Size Metrics
-        run: ./gradlew -Paws.kotlin.native=false analyzeArtifactSizeMetrics
+        run: ./gradlew analyzeArtifactSizeMetrics
       - name: Show Results
         uses: actions/github-script@v7
         with:

.github/workflows/changelog-verification.yml

@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:

.github/workflows/continuous-integration.yml

@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 

.github/workflows/dependabot.yml

@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write

.github/workflows/kat-transform.yml

@@ -3,7 +3,9 @@ name: Kat Transform
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:

.github/workflows/lint.yml

@@ -5,8 +5,11 @@ on:
     branches:
       - '**'
       - '!main'
+      - '!*-main'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   workflow_dispatch:
 
 env:

.gitignore

@@ -8,6 +8,7 @@ out/
 # Compiled class file
 *.class
 *.klib
+.kotlin/
 
 # Log file
 *.log

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.3.32] - 01/06/2025
+
+### Fixes
+* Fix serialization of CBOR blobs
+
 ## [1.3.31] - 12/18/2024
 
 ### Features

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt

@@ -145,7 +145,7 @@ abstract class AbstractQueryFormUrlSerializerGenerator(
         return shape.documentSerializer(ctx.settings, symbol, members) { writer ->
             writer.openBlock("internal fun #identifier.name:L(serializer: #T, input: #T) {", RuntimeTypes.Serde.Serializer, symbol)
                 .call {
-                    renderSerializerBody(ctx, shape, shape.members().toList(), writer)
+                    renderSerializerBody(ctx, shape, members.toList(), writer)
                 }
                 .closeBlock("}")
         }

codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt

@@ -4,6 +4,7 @@
  */
 package software.amazon.smithy.kotlin.codegen.aws.protocols
 
+import io.kotest.matchers.string.shouldNotContain
 import software.amazon.smithy.kotlin.codegen.test.*
 import kotlin.test.Test
 
@@ -145,4 +146,20 @@ class RpcV2CborTest {
         val serializeBody = serializer.lines("    override suspend fun serialize(context: ExecutionContext, input: PutFooStreamingRequest): HttpRequestBuilder {", "}")
         serializeBody.shouldContainOnlyOnceWithDiff("""builder.headers.setMissing("Content-Type", "application/vnd.amazon.eventstream")""")
     }
+
+    @Test
+    fun testEventStreamInitialRequestDoesNotSerializeStreamMember() {
+        val ctx = model.newTestContext("CborExample")
+
+        val generator = RpcV2Cbor()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val documentSerializer = ctx.manifest.expectFileString("/src/main/kotlin/com/test/serde/PutFooStreamingRequestDocumentSerializer.kt")
+
+        val serializeBody = documentSerializer.lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "}")
+        serializeBody.shouldNotContain("input.messages") // `messages` is the stream member and should not be serialized in the initial request
+    }
 }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/CborSerializerGenerator.kt

@@ -108,7 +108,7 @@ class CborSerializerGenerator(
         val symbol = ctx.symbolProvider.toSymbol(shape)
         return shape.documentSerializer(ctx.settings, symbol, members) { writer ->
             writer.withBlock("internal fun #identifier.name:L(serializer: #T, input: #T) {", "}", RuntimeTypes.Serde.Serializer, symbol) {
-                call { renderSerializerBody(ctx, shape, shape.members().toList(), writer) }
+                call { renderSerializerBody(ctx, shape, members.toList(), writer) }
             }
         }
     }

gradle.properties

@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.32-SNAPSHOT
+sdkVersion=1.3.33-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.32-SNAPSHOT
+codegenVersion=0.33.33-SNAPSHOT