Unverified Commit 7b6d2d4b authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Revamp errors in `aws-smithy-json` (#1888)

parent fba88df3

aws/rust-runtime/aws-config/src/json_credentials.rs

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ impl From<EscapeError> for InvalidJsonCredentials { 
    }

}



impl From<aws_smithy_json::deserialize::Error> for InvalidJsonCredentials {

    fn from(err: aws_smithy_json::deserialize::Error) -> Self {

impl From<aws_smithy_json::deserialize::error::DeserializeError> for InvalidJsonCredentials {

    fn from(err: aws_smithy_json::deserialize::error::DeserializeError) -> Self {

        InvalidJsonCredentials::JsonError(err.into())

    }

}

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/AwsJson.kt

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ open class AwsJson( 
        "Bytes" to RuntimeType.Bytes,

        "Error" to RuntimeType.GenericError(runtimeConfig),

        "HeaderMap" to RuntimeType.http.member("HeaderMap"),

        "JsonError" to CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize::Error"),

        "JsonError" to CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize::error::DeserializeError"),

        "Response" to RuntimeType.http.member("Response"),

        "json_errors" to RuntimeType.jsonErrors(runtimeConfig),

    )

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/RestJson.kt

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ open class RestJson(val codegenContext: CodegenContext) : Protocol { 
        "Bytes" to RuntimeType.Bytes,

        "Error" to RuntimeType.GenericError(runtimeConfig),

        "HeaderMap" to RuntimeType.http.member("HeaderMap"),

        "JsonError" to CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize::Error"),

        "JsonError" to CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize::error::DeserializeError"),

        "Response" to RuntimeType.http.member("Response"),

        "json_errors" to RuntimeType.jsonErrors(runtimeConfig),

    )

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt

+3 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import software.amazon.smithy.model.traits.TimestampFormatTrait 
import software.amazon.smithy.rust.codegen.core.rustlang.Attribute

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

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

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

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

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

import software.amazon.smithy.rust.codegen.core.rustlang.asType
@@ -100,8 +101,7 @@ class JsonParserGenerator( 
    private val jsonDeserModule = RustModule.private("json_deser")

    private val typeConversionGenerator = TypeConversionGenerator(model, symbolProvider, runtimeConfig)

    private val codegenScope = arrayOf(

        "Error" to smithyJson.member("deserialize::Error"),

        "ErrorReason" to smithyJson.member("deserialize::ErrorReason"),

        "Error" to smithyJson.member("deserialize::error::DeserializeError"),

        "expect_blob_or_null" to smithyJson.member("deserialize::token::expect_blob_or_null"),

        "expect_bool_or_null" to smithyJson.member("deserialize::token::expect_bool_or_null"),

        "expect_document" to smithyJson.member("deserialize::token::expect_document"),
@@ -422,7 +422,7 @@ class JsonParserGenerator( 
                *codegenScope,

            ) {

                startObjectOrNull {

                    rust("let mut map = #T::new();", software.amazon.smithy.rust.codegen.core.rustlang.RustType.HashMap.RuntimeType)

                    rust("let mut map = #T::new();", RustType.HashMap.RuntimeType)

                    objectKeyLoop(hasMembers = true) {

                        withBlock("let key =", "?;") {

                            deserializeStringInner(keyTarget, "key")

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/protocols/ServerHttpBoundProtocolGenerator.kt

+3 −3
Original line number Diff line number Diff line
@@ -1246,12 +1246,12 @@ private class ServerHttpBoundProtocolTraitImplGenerator( 
        if (model.expectShape(binding.member.target) is StringShape) {

            return ServerRuntimeType.RequestRejection(runtimeConfig)

        }

        when (codegenContext.protocol) {

        return when (codegenContext.protocol) {

            RestJson1Trait.ID, AwsJson1_0Trait.ID, AwsJson1_1Trait.ID -> {

                return CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize").member("Error")

                CargoDependency.smithyJson(runtimeConfig).asType().member("deserialize::error::DeserializeError")

            }

            RestXmlTrait.ID -> {

                return CargoDependency.smithyXml(runtimeConfig).asType().member("decode").member("XmlError")

                CargoDependency.smithyXml(runtimeConfig).asType().member("decode").member("XmlError")

            }

            else -> {

                TODO("Protocol ${codegenContext.protocol} not supported yet")