Unverified Commit 72d680db authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Finish the smithy-json deserializer codegen (#530) 

* Finish the smithy-json deserializer codegen

* Fix CI

* CR feedback

* Stop generating synthetic input/output bodies
parent 28af7e22

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/IntegrationTestDependencies.kt

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ class IntegrationTestDependencies( 
        LibRsSection.Body -> writable {

            if (hasTests) {

                addDependency(runtimeConfig.awsHyper().copy(scope = DependencyScope.Dev))

                addDependency(SerdeJson)

                addDependency(Tokio)

            }

            if (hasBenches) {
@@ -61,5 +62,6 @@ class IntegrationTestDependencies( 
}



val Criterion = CargoDependency("criterion", CratesIo("0.3"), scope = DependencyScope.Dev)

val SerdeJson = CargoDependency("serde_json", CratesIo("1"), features = emptyList())

val Tokio = CargoDependency("tokio", CratesIo("1"), features = listOf("macros", "test-util"), scope = DependencyScope.Dev)

fun RuntimeConfig.awsHyper() = awsRuntimeDependency("aws-hyper", features = listOf("test-util"))

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/CargoDependency.kt

+2 −18
Original line number Diff line number Diff line
@@ -88,25 +88,12 @@ class InlineDependency( 
        private fun forRustFile(name: String, vararg additionalDependencies: RustDependency) =

            forRustFile(name, "inlineable", *additionalDependencies)



        fun awsJsonErrors(runtimeConfig: RuntimeConfig) =

            forRustFile("aws_json_errors", CargoDependency.Http, CargoDependency.SmithyTypes(runtimeConfig))



        fun docJson() = forRustFile("doc_json", CargoDependency.Serde)

        fun instantEpoch() = forRustFile("instant_epoch", CargoDependency.Serde)

        fun instantHttpDate() =

            forRustFile("instant_httpdate", CargoDependency.Serde)



        fun instant8601() = forRustFile("instant_iso8601", CargoDependency.Serde)

        fun jsonErrors(runtimeConfig: RuntimeConfig) =

            forRustFile("json_errors", CargoDependency.Http, CargoDependency.SmithyTypes(runtimeConfig))



        fun idempotencyToken() =

            forRustFile("idempotency_token", CargoDependency.FastRand)



        fun blobSerde(runtimeConfig: RuntimeConfig) = forRustFile(

            "blob_serde",

            CargoDependency.Serde,

            CargoDependency.SmithyHttp(runtimeConfig)

        )



        fun ec2QueryErrors(runtimeConfig: RuntimeConfig): InlineDependency =

            forRustFile("ec2_query_errors", CargoDependency.smithyXml(runtimeConfig))
@@ -201,9 +188,6 @@ data class CargoDependency( 
        fun smithyQuery(runtimeConfig: RuntimeConfig): CargoDependency = runtimeConfig.runtimeCrate("query")

        fun smithyXml(runtimeConfig: RuntimeConfig): CargoDependency = runtimeConfig.runtimeCrate("xml")



        val SerdeJson: CargoDependency =

            CargoDependency("serde_json", CratesIo("1"), features = listOf("float_roundtrip"))

        val Serde = CargoDependency("serde", CratesIo("1"), features = listOf("derive"))

        val Bytes: RustDependency = CargoDependency("bytes", CratesIo("1"))

    }

}

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/RuntimeTypes.kt

+3 −19
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ data class RuntimeType(val name: String?, val dependency: RustDependency?, val n 
        val Debug = stdfmt.member("Debug")

        val Default: RuntimeType = RuntimeType("Default", dependency = null, namespace = "std::default")

        val From = RuntimeType("From", dependency = null, namespace = "std::convert")

        val Infallible = RuntimeType("Infallible", dependency = null, namespace = "std::convert")

        val PartialEq = std.member("cmp::PartialEq")

        val StdError = RuntimeType("Error", dependency = null, namespace = "std::error")

        val String = RuntimeType("String", dependency = null, namespace = "std::string")
@@ -160,25 +161,9 @@ data class RuntimeType(val name: String?, val dependency: RustDependency?, val n 
        val HttpRequestBuilder = Http("request::Builder")

        val HttpResponseBuilder = Http("response::Builder")



        fun Serde(path: String) = RuntimeType(

            path, dependency = CargoDependency.Serde, namespace = "serde"

        )



        val Deserialize: RuntimeType = RuntimeType("Deserialize", CargoDependency.Serde, namespace = "serde")

        val Deserializer = RuntimeType("Deserializer", CargoDependency.Serde, namespace = "serde")

        fun SerdeJson(path: String) =

            RuntimeType(path, dependency = CargoDependency.SerdeJson, namespace = "serde_json")



        val serdeJson = RuntimeType(null, dependency = CargoDependency.SerdeJson, namespace = "serde_json")



        fun awsJsonErrors(runtimeConfig: RuntimeConfig) =

            forInlineDependency(InlineDependency.awsJsonErrors(runtimeConfig))



        val DocJson by lazy { forInlineDependency(InlineDependency.docJson()) }

        fun jsonErrors(runtimeConfig: RuntimeConfig) =

            forInlineDependency(InlineDependency.jsonErrors(runtimeConfig))



        val InstantEpoch by lazy { forInlineDependency(InlineDependency.instantEpoch()) }

        val InstantHttpDate by lazy { forInlineDependency(InlineDependency.instantHttpDate()) }

        val Instant8601 by lazy { forInlineDependency(InlineDependency.instant8601()) }

        val IdempotencyToken by lazy { forInlineDependency(InlineDependency.idempotencyToken()) }



        val Config = RuntimeType("config", null, "crate")
@@ -205,7 +190,6 @@ data class RuntimeType(val name: String?, val dependency: RustDependency?, val n 
        )



        val Bytes = RuntimeType("Bytes", dependency = CargoDependency.Bytes, namespace = "bytes")

        fun BlobSerde(runtimeConfig: RuntimeConfig) = forInlineDependency(InlineDependency.blobSerde(runtimeConfig))



        fun forInlineDependency(inlineDependency: InlineDependency) =

            RuntimeType(inlineDependency.name, inlineDependency, namespace = "crate")

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/SymbolVisitor.kt

+0 −4
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import software.amazon.smithy.model.traits.ErrorTrait 
import software.amazon.smithy.model.traits.HttpLabelTrait

import software.amazon.smithy.rust.codegen.rustlang.RustType

import software.amazon.smithy.rust.codegen.rustlang.stripOuter

import software.amazon.smithy.rust.codegen.smithy.traits.InputBodyTrait

import software.amazon.smithy.rust.codegen.smithy.traits.OutputBodyTrait

import software.amazon.smithy.rust.codegen.smithy.traits.SyntheticInputTrait

import software.amazon.smithy.rust.codegen.smithy.traits.SyntheticOutputTrait

import software.amazon.smithy.rust.codegen.util.hasTrait
@@ -257,7 +255,6 @@ class SymbolVisitor( 
        val isError = shape.hasTrait<ErrorTrait>()

        val isInput = shape.hasTrait<SyntheticInputTrait>()

        val isOutput = shape.hasTrait<SyntheticOutputTrait>()

        val isBody = shape.hasTrait<InputBodyTrait>() || shape.hasTrait<OutputBodyTrait>()

        val name = StringUtils.capitalize(shape.contextName()).letIf(isError && config.codegenConfig.renameExceptions) {

            // TODO: Do we want to do this?

            // https://github.com/awslabs/smithy-rs/issues/77
@@ -268,7 +265,6 @@ class SymbolVisitor( 
            isError -> builder.locatedIn(Errors)

            isInput -> builder.locatedIn(Inputs)

            isOutput -> builder.locatedIn(Outputs)

            isBody -> builder.locatedIn(Serializers)

            else -> builder.locatedIn(Models)

        }.build()

    }

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/EnumGenerator.kt

+0 −17
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import software.amazon.smithy.rust.codegen.rustlang.docs 
import software.amazon.smithy.rust.codegen.rustlang.documentShape

import software.amazon.smithy.rust.codegen.rustlang.rust

import software.amazon.smithy.rust.codegen.rustlang.rustBlock

import software.amazon.smithy.rust.codegen.rustlang.rustTemplate

import software.amazon.smithy.rust.codegen.rustlang.withBlock

import software.amazon.smithy.rust.codegen.smithy.MaybeRenamed

import software.amazon.smithy.rust.codegen.smithy.RuntimeType
@@ -104,7 +103,6 @@ class EnumGenerator( 
        } else {

            renderUnamedEnum()

        }

        renderSerde()

    }



    private fun renderUnamedEnum() {
@@ -163,21 +161,6 @@ class EnumGenerator( 
        }

    }



    private fun renderSerde() {

        writer.rustTemplate(

            """

                impl<'de> #{deserialize}<'de> for $enumName {

                    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: #{deserializer}<'de> {

                        let data = <&str>::deserialize(deserializer)?;

                        Ok(Self::from(data))

                    }

                }

            """,

            "deserializer" to RuntimeType.Deserializer,

            "deserialize" to RuntimeType.Deserialize

        )

    }



    private fun renderFromStr() {

        writer.rustBlock("impl #T<&str> for $enumName", RuntimeType.From) {

            writer.rustBlock("fn from(s: &str) -> Self") {