Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into kn-main

Author: lauzadis

CHANGELOG.md

@@ -84,7 +84,7 @@ of your request may disagree and ask that you add one anyway.
   "type": "feature",
   "description": "Add multiplatform support for URL parsing",
   "issues": [
-    "awslabs/smithy-kotlin#12345"
+    "smithy-lang/smithy-kotlin#12345"
   ]
 }
 ```

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# <img alt="Smithy" src="https://github.com/smithy-lang/smithy/blob/main/docs/_static/favicon.png?raw=true" width="28"> Smithy Kotlin
+# <img alt="Smithy" src="https://github.com/smithy-lang/smithy/blob/main/docs/_static/smithy-anvil.svg?raw=true" width="32"> Smithy Kotlin
 
 [Smithy](https://smithy.io/2.0/index.html) code generators for [Kotlin](https://kotlinlang.org/).
 

README.md

@@ -69,8 +69,7 @@ fun DependencyConstraintHandler.api(constraintNotation: Any) =
 
 createBomConstraintsAndVersionCatalog()
 
-configurePublishing("smithy-kotlin")
-
+configurePublishing("smithy-kotlin", "smithy-lang")
 publishing {
     publications {
         create("bom", MavenPublication::class) {

bom/build.gradle.kts

@@ -107,4 +107,4 @@ publishing {
     }
 }
 
-configurePublishing("smithy-kotlin")
+configurePublishing("smithy-kotlin", "smithy-lang")

codegen/smithy-aws-kotlin-codegen/build.gradle.kts

@@ -46,7 +46,7 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
 
         // restjson1 has some different semantics and expectations around empty structures bound via @httpPayload trait
         //   * empty structures get serialized to `{}`
-        // see: https://github.com/awslabs/smithy/pull/924
+        // see: https://github.com/smithy-lang/smithy/pull/924
         val requestBindings = resolver.requestBindings(op)
         val httpPayload = requestBindings.firstOrNull { it.location == HttpBinding.Location.PAYLOAD }
         if (httpPayload != null) {
@@ -58,7 +58,7 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
                     write("builder.body = #T.fromBytes(#S.encodeToByteArray())", RuntimeTypes.Http.HttpBody, "{}")
                 }
                 // Content-Type still needs to be set for non-structured payloads
-                // https://github.com/awslabs/smithy/blob/main/smithy-aws-protocol-tests/model/restJson1/http-content-type.smithy#L174
+                // https://github.com/smithy-lang/smithy/blob/main/smithy-aws-protocol-tests/model/restJson1/http-content-type.smithy#L174
                 write("builder.headers.setMissing(\"Content-Type\", #S)", resolver.determineRequestContentType(op))
             }
         }

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

@@ -139,7 +139,12 @@ class RpcV2Cbor : AwsHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
         resolver: HttpBindingResolver,
     ) {
-        writer.write("builder.headers.setMissing(\"Content-Type\", #S)", resolver.determineRequestContentType(op))
+        val contentTypeHeader = when {
+            op.isInputEventStream(ctx.model) -> "application/vnd.amazon.eventstream"
+            else -> "application/cbor"
+        }
+
+        writer.write("builder.headers.setMissing(\"Content-Type\", #S)", contentTypeHeader)
     }
 
     class RpcV2CborHttpBindingResolver(
@@ -152,17 +157,13 @@ class RpcV2Cbor : AwsHttpBindingProtocolGenerator() {
         "application/cbor",
         TimestampFormatTrait.Format.UNKNOWN,
     ) {
-
         override fun httpTrait(operationShape: OperationShape): HttpTrait = HttpTrait
             .builder()
             .code(200)
             .method("POST")
             .uri(UriPattern.parse("/service/${serviceShape.id.name}/operation/${operationShape.id.name}"))
             .build()
 
-        override fun determineRequestContentType(operationShape: OperationShape): String = when {
-            operationShape.isInputEventStream(model) -> "application/vnd.amazon.eventstream"
-            else -> "application/cbor"
-        }
+        override fun determineRequestContentType(operationShape: OperationShape): String = "application/cbor"
     }
 }

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

@@ -28,6 +28,7 @@ val RPC_BOUND_PROTOCOLS = setOf(
     "awsJson1_1",
     "awsQuery",
     "ec2Query",
+    "rpcv2Cbor",
 )
 
 /**

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/eventstream/EventStreamParserGenerator.kt

@@ -34,7 +34,7 @@ class RestXmlSerdeDescriptorGenerator(
             val serialName = getSerialName(member, nameSuffix)
             if (serialName.equals("message", ignoreCase = true)) {
                 // Need to be able to read error messages from "Message" or "message"
-                // https://github.com/awslabs/smithy-kotlin/issues/352
+                // https://github.com/smithy-lang/smithy-kotlin/issues/352
                 traitList.add(RuntimeTypes.Serde.SerdeXml.XmlAliasName, serialName.toggleFirstCharacterCase().dq())
             }
         }

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/xml/RestXmlSerdeDescriptorGenerator.kt

@@ -20,7 +20,7 @@ class RpcV2CborTest {
         @service(sdkId: "CborExample")
         service CborExample {
             version: "1.0.0",
-            operations: [GetFoo, GetFooStreaming]
+            operations: [GetFoo, GetFooStreaming, PutFooStreaming]
         }
 
         @http(method: "POST", uri: "/foo")
@@ -34,7 +34,29 @@ class RpcV2CborTest {
             }
         }
         
+        @http(method: "POST", uri: "/put-foo-streaming")
+        operation PutFooStreaming {
+            input: PutFooStreamingInput
+        }
+        
+        structure PutFooStreamingInput {
+            room: String
+            messages: PublishEvents
+        }
+        
         // Model taken from https://smithy.io/2.0/spec/streaming.html#event-streams
+        @streaming
+        union PublishEvents {
+            message: Message
+            leave: LeaveEvent
+        }
+        
+        structure Message {
+            message: String
+        }
+        
+        structure LeaveEvent {}
+        
         @streaming
         union FooEvents {
             up: Movement
@@ -98,4 +120,29 @@ class RpcV2CborTest {
         """.replaceIndent("        ")
         getFooMethod.shouldContainOnlyOnceWithDiff(expectedHeaderMutation)
     }
+
+    @Test
+    fun testEventStreamContentTypeHeaders() {
+        val ctx = model.newTestContext("CborExample")
+
+        val generator = RpcV2Cbor()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val serializer = ctx.manifest.expectFileString("/src/main/kotlin/com/test/serde/PutFooStreamingOperationSerializer.kt")
+
+        // Event stream messages should have `:content-type: application/cbor`
+        val encodeMessage = serializer.lines("private fun encodePutFooStreamingPublishEventsEventMessage(input: PublishEvents): Message = buildMessage {", "}")
+        encodeMessage.shouldContainOnlyOnceWithDiff(
+            """
+            addHeader(":content-type", HeaderValue.String("application/cbor"))
+            """.trimIndent(),
+        )
+
+        // Event stream requests should have Content-Type=application/vnd.amazon.eventstream
+        val serializeBody = serializer.lines("    override suspend fun serialize(context: ExecutionContext, input: PutFooStreamingRequest): HttpRequestBuilder {", "}")
+        serializeBody.shouldContainOnlyOnceWithDiff("""builder.headers.setMissing("Content-Type", "application/vnd.amazon.eventstream")""")
+    }
 }