Empty payload structure in tests (#2328)

* Empty payload structure in tests Signed-off-by: Daniele Ahmed <[email protected]> * Update ServerProtocolTestGenerator Signed-off-by: Daniele Ahmed <[email protected]> * Update ServerProtocolTestGenerator Signed-off-by: Daniele Ahmed <[email protected]> --------- Signed-off-by: Daniele Ahmed <[email protected]> Co-authored-by: Zelda Hessler <[email protected]>
smithy-lang · Mar 29, 2023 · 9a77a8c · 9a77a8c
1 parent 48bd719
commit 9a77a8c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...rc/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/Instantiator.kt b/...rc/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/Instantiator.kt
@@ -30,6 +30,7 @@ import software.amazon.smithy.model.shapes.TimestampShape
 import software.amazon.smithy.model.shapes.UnionShape
 import software.amazon.smithy.model.traits.EnumTrait
 import software.amazon.smithy.model.traits.HttpHeaderTrait
+import software.amazon.smithy.model.traits.HttpPayloadTrait
 import software.amazon.smithy.model.traits.HttpPrefixHeadersTrait
 import software.amazon.smithy.model.traits.StreamingTrait
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
@@ -361,6 +362,16 @@ open class Instantiator(
             renderMemberHelper(memberShape, value)
         }
 
+        shape.allMembers.entries
+            .firstOrNull {
+                it.value.hasTrait<HttpPayloadTrait>() &&
+                    !data.members.containsKey(Node.from(it.key)) &&
+                    model.expectShape(it.value.target) is StructureShape
+            }
+            ?.let {
+                renderMemberHelper(it.value, fillDefaultValue(model.expectShape(it.value.target)))
+            }
+
         writer.rust(".build()")
         if (builderKindBehavior.hasFallibleBuilder(shape)) {
             writer.rust(".unwrap()")

diff --git a/...azon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt b/...azon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt
@@ -762,11 +762,6 @@ class ServerProtocolTestGenerator(
         private const val RestJson = "aws.protocoltests.restjson#RestJson"
         private const val RestJsonValidation = "aws.protocoltests.restjson.validation#RestJsonValidation"
         private val ExpectFail: Set<FailingTest> = setOf(
-            // Pending resolution from the Smithy team, see https://github.com/awslabs/smithy/issues/1068.
-            FailingTest(RestJson, "RestJsonHttpWithHeadersButNoPayload", TestType.Request),
-
-            FailingTest(RestJson, "RestJsonHttpWithEmptyStructurePayload", TestType.Request),
-
             // Endpoint trait is not implemented yet, see https://github.com/awslabs/smithy-rs/issues/950.
             FailingTest(RestJson, "RestJsonEndpointTrait", TestType.Request),
             FailingTest(RestJson, "RestJsonEndpointTraitWithHostLabel", TestType.Request),