Unverified Commit 9a77a8c1 authored by 82marbag's avatar 82marbag Committed by GitHub
Browse files

Empty payload structure in tests (#2328) 



* Empty payload structure in tests

Signed-off-by: default avatarDaniele Ahmed <ahmeddan@amazon.de>

* Update ServerProtocolTestGenerator

Signed-off-by: default avatarDaniele Ahmed <ahmeddan@amazon.de>

* Update ServerProtocolTestGenerator

Signed-off-by: default avatarDaniele Ahmed <ahmeddan@amazon.de>

---------

Signed-off-by: default avatarDaniele Ahmed <ahmeddan@amazon.de>
Co-authored-by: default avatarZelda Hessler <zhessler@amazon.com>
parent 48bd7197

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/Instantiator.kt

+11 −0
Original line number Diff line number Diff line
@@ -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()")

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocolTestGenerator.kt

+0 −5
Original line number Diff line number Diff line
@@ -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),