httplabel and httpquery

Author: luigi

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGenerator.kt

@@ -191,6 +191,12 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
                     "awsRestjson1" -> KotlinTypes.String
                     else -> KotlinTypes.ByteArray
                 }
+
+                val defaultResponse = when (protocolName) {
+                    "smithyRpcv2cbor" -> "ByteArray(0)"
+                    "awsRestjson1" -> "\"\""
+                    else -> "ByteArray(0)"
+                }
                 writer
                     .openBlock("internal class #T {", serializerSymbol)
                     .call {
@@ -200,7 +206,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
                             serializationSymbol,
                             serializerResultSymbol,
                         )
-                            .write("var response: Any")
+                            .write("var response: #T = $defaultResponse", serializerResultSymbol)
                             .call {
                                 renderSerializeHttpBody(ctx, op, writer)
                             }

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/KtorStubGenerator.kt

@@ -13,6 +13,8 @@ import software.amazon.smithy.kotlin.codegen.model.getTrait
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.traits.AuthTrait
 import software.amazon.smithy.model.traits.HttpBearerAuthTrait
+import software.amazon.smithy.model.traits.HttpLabelTrait
+import software.amazon.smithy.model.traits.HttpQueryTrait
 import software.amazon.smithy.model.traits.HttpTrait
 import software.amazon.smithy.utils.AbstractCodeWriter
 
@@ -261,7 +263,7 @@ internal class KtorStubGenerator(
                                             )
                                             write("val deserializer = ${shape.id.name}OperationDeserializer()")
                                             withBlock(
-                                                "val requestObj = try { deserializer.deserialize(#T(), request) } catch (ex: Exception) {",
+                                                "var requestObj = try { deserializer.deserialize(#T(), request) } catch (ex: Exception) {",
                                                 "}",
                                                 RuntimeTypes.Core.ExecutionContext,
                                             ) {
@@ -271,6 +273,10 @@ internal class KtorStubGenerator(
                                                     "Malformed CBOR input",
                                                 )
                                             }
+                                            withBlock("requestObj = requestObj.copy {", "}") {
+                                                call { readHttpLabel(shape, writer) }
+                                                call { readHttpQuery(shape, writer) }
+                                            }
                                             write("val responseObj = handle${shape.id.name}Request(requestObj)")
                                             write("val serializer = ${shape.id.name}OperationSerializer()")
                                             withBlock(
@@ -298,6 +304,25 @@ internal class KtorStubGenerator(
         }
     }
 
+    private fun readHttpLabel(shape: OperationShape, writer: KotlinWriter) {
+        val inputShape = ctx.model.expectShape(shape.input.get())
+        inputShape.allMembers.forEach { member ->
+            val memberName = member.key
+            if (!member.value.hasTrait(HttpLabelTrait.ID)) return@forEach
+            writer.write("$memberName = call.parameters[#S]", memberName)
+        }
+    }
+
+    private fun readHttpQuery(shape: OperationShape, writer: KotlinWriter) {
+        val inputShape = ctx.model.expectShape(shape.input.get())
+        inputShape.allMembers.forEach { member ->
+            val memberName = member.key
+            if (!member.value.hasTrait(HttpQueryTrait.ID)) return@forEach
+            val httpQueryTrait = member.value.getTrait<HttpQueryTrait>()!!
+            writer.write("$memberName = call.request.queryParameters[#S]", httpQueryTrait.value)
+        }
+    }
+
     private fun renderRoutingAuth(w: KotlinWriter, shape: OperationShape) {
         val hasServiceHttpBearerAuthTrait = serviceShape.hasTrait(HttpBearerAuthTrait.ID)
         val authTrait = shape.getTrait<AuthTrait>()