Merge branch 'server-sdk-main' of github.com:smithy-lang/smithy-kotlin into service-sdk-sigv4

Author: luigi

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

@@ -7,6 +7,7 @@ package software.amazon.smithy.kotlin.codegen.aws.protocols
 
 import software.amazon.smithy.aws.traits.protocols.AwsQueryErrorTrait
 import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait
+import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFormUrlSerializerGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
@@ -86,6 +87,14 @@ private class AwsQuerySerializerGenerator(
         members: List<MemberShape>,
         writer: KotlinWriter,
     ): FormUrlSerdeDescriptorGenerator = AwsQuerySerdeFormUrlDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)
+
+    override fun errorSerializer(
+        ctx: ProtocolGenerator.GenerationContext,
+        errorShape: StructureShape,
+        members: List<MemberShape>,
+    ): Symbol {
+        TODO("Used for service-codegen. Not yet implemented")
+    }
 }
 
 private class AwsQueryXmlParserGenerator(

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

@@ -98,6 +98,14 @@ private class Ec2QuerySerializerGenerator(
         members: List<MemberShape>,
         writer: KotlinWriter,
     ): FormUrlSerdeDescriptorGenerator = Ec2QuerySerdeFormUrlDescriptorGenerator(ctx.toRenderingContext(protocolGenerator, shape, writer), members)
+
+    override fun errorSerializer(
+        ctx: ProtocolGenerator.GenerationContext,
+        errorShape: StructureShape,
+        members: List<MemberShape>,
+    ): Symbol {
+        TODO("Used for service-codegen. Not yet implemented")
+    }
 }
 
 private class Ec2QueryParserGenerator(

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

@@ -40,9 +40,11 @@ class RestJson1 : JsonHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         super.renderSerializeHttpBody(ctx, op, writer)
+        if (ctx.settings.build.generateServiceProject) return
 
         val resolver = getProtocolHttpBindingResolver(ctx.model, ctx.service)
-        if (!resolver.hasHttpBody(op)) return
+
+        if (!resolver.hasHttpRequestBody(op)) return
 
         // restjson1 has some different semantics and expectations around empty structures bound via @httpPayload trait
         //   * empty structures get serialized to `{}`

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

@@ -123,6 +123,14 @@ class AwsHttpBindingProtocolGeneratorTest {
                 ): Symbol {
                     error("Unneeded for test")
                 }
+
+                override fun errorSerializer(
+                    ctx: ProtocolGenerator.GenerationContext,
+                    errorShape: StructureShape,
+                    members: List<MemberShape>,
+                ): Symbol {
+                    error("Unneeded for test")
+                }
             }
 
         override val protocol: ShapeId

codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/CodegenTestUtils.kt

@@ -214,6 +214,14 @@ class MockHttpProtocolGenerator(model: Model) : HttpBindingProtocolGenerator() {
                 val symbol = ctx.symbolProvider.toSymbol(shape)
                 name = "serialize" + StringUtils.capitalize(symbol.name) + "Payload"
             }
+
+            override fun errorSerializer(
+                ctx: ProtocolGenerator.GenerationContext,
+                errorShape: StructureShape,
+                members: List<MemberShape>,
+            ): Symbol {
+                error("Unneeded for test")
+            }
         }
 
     override fun operationErrorHandler(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Symbol = buildSymbol {

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt

@@ -143,6 +143,7 @@ data class KotlinDependency(
         // Ktor server dependencies
         // FIXME: version numbers should not be hardcoded, they should be setting dynamically based on the Gradle library versions
         val KTOR_SERVER_CORE = KotlinDependency(GradleConfiguration.Implementation, "io.ktor.server", "io.ktor", "ktor-server-core", KTOR_VERSION)
+        val KTOR_SERVER_UTILS = KotlinDependency(GradleConfiguration.Implementation, "io.ktor", "io.ktor", "ktor-server-core", KTOR_VERSION)
         val KTOR_SERVER_NETTY = KotlinDependency(GradleConfiguration.Implementation, "io.ktor.server.netty", "io.ktor", "ktor-server-netty", KTOR_VERSION)
         val KTOR_SERVER_CIO = KotlinDependency(GradleConfiguration.Implementation, "io.ktor.server.cio", "io.ktor", "ktor-server-cio", KTOR_VERSION)
         val KTOR_SERVER_JETTY_JAKARTA = KotlinDependency(GradleConfiguration.Implementation, "io.ktor.server.jetty.jakarta", "io.ktor", "ktor-server-jetty-jakarta", KTOR_VERSION)

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt

@@ -515,6 +515,10 @@ object RuntimeTypes {
         val BadRequestException = symbol("BadRequestException", "plugins")
     }
 
+    object KtorServerUtils : RuntimeTypePackage(KotlinDependency.KTOR_SERVER_UTILS) {
+        val AttributeKey = symbol("AttributeKey", "util")
+    }
+
     object KtorServerRouting : RuntimeTypePackage(KotlinDependency.KTOR_SERVER_CORE) {
         val routing = symbol("routing", "routing")
         val route = symbol("route", "routing")
@@ -565,6 +569,9 @@ object RuntimeTypes {
         val Parameters = symbol("Parameters")
         val Cbor = symbol("Cbor", "ContentType.Application")
         val Json = symbol("Json", "ContentType.Application")
+        val Any = symbol("Any", "ContentType.Application")
+        val OctetStream = symbol("OctetStream", "ContentType.Application")
+        val PlainText = symbol("Plain", "ContentType.Text")
     }
 
     object KtorServerLogging : RuntimeTypePackage(KotlinDependency.KTOR_SERVER_LOGGING) {