Revamp errors in aws-smithy-xml

smithy-lang · Nov 1, 2022 · a156037 · a156037
1 parent 719c028
commit a156037
Show file tree

Hide file tree

Showing 19 changed files with 171 additions and 142 deletions.
diff --git a/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/s3/S3Decorator.kt b/aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/customize/s3/S3Decorator.kt
@@ -96,15 +96,15 @@ class S3(codegenContext: CodegenContext) : RestXml(codegenContext) {
  "Error" to RuntimeType.GenericError(runtimeConfig),
  "HeaderMap" to RuntimeType.http.member("HeaderMap"),
  "Response" to RuntimeType.http.member("Response"),
- "XmlError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlError"),
+ "XmlDecodeError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlDecodeError"),
  "base_errors" to restXmlErrors,
  "s3_errors" to AwsRuntimeType.S3Errors,
  )
 
  override fun parseHttpGenericError(operationShape: OperationShape): RuntimeType {
  return RuntimeType.forInlineFun("parse_http_generic_error", RustModule.private("xml_deser")) {
  rustBlockTemplate(
- "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rustTemplate(

diff --git a/...ore/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/AwsQuery.kt b/...ore/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/AwsQuery.kt
@@ -47,7 +47,7 @@ class AwsQueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  "Error" to RuntimeType.GenericError(runtimeConfig),
  "HeaderMap" to RuntimeType.http.member("HeaderMap"),
  "Response" to RuntimeType.http.member("Response"),
- "XmlError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlError"),
+ "XmlDecodeError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlDecodeError"),
  )
  private val xmlDeserModule = RustModule.private("xml_deser")
 
@@ -64,7 +64,7 @@ class AwsQueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  override fun parseHttpGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_http_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(response.body().as_ref())", awsQueryErrors)
@@ -74,7 +74,7 @@ class AwsQueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  override fun parseEventStreamGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_event_stream_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(payload.as_ref())", awsQueryErrors)

diff --git a/...ore/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/Ec2Query.kt b/...ore/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/Ec2Query.kt
@@ -29,7 +29,7 @@ class Ec2QueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  "Error" to RuntimeType.GenericError(runtimeConfig),
  "HeaderMap" to RuntimeType.http.member("HeaderMap"),
  "Response" to RuntimeType.http.member("Response"),
- "XmlError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlError"),
+ "XmlDecodeError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlDecodeError"),
  )
  private val xmlDeserModule = RustModule.private("xml_deser")
 
@@ -55,7 +55,7 @@ class Ec2QueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  override fun parseHttpGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_http_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(response.body().as_ref())", ec2QueryErrors)
@@ -65,7 +65,7 @@ class Ec2QueryProtocol(private val codegenContext: CodegenContext) : Protocol {
  override fun parseEventStreamGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_event_stream_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(payload.as_ref())", ec2QueryErrors)

diff --git a/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/RestXml.kt b/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/RestXml.kt
@@ -29,7 +29,7 @@ open class RestXml(val codegenContext: CodegenContext) : Protocol {
  "Error" to RuntimeType.GenericError(runtimeConfig),
  "HeaderMap" to RuntimeType.http.member("HeaderMap"),
  "Response" to RuntimeType.http.member("Response"),
- "XmlError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlError"),
+ "XmlDecodeError" to CargoDependency.smithyXml(runtimeConfig).asType().member("decode::XmlDecodeError"),
  )
  private val xmlDeserModule = RustModule.private("xml_deser")
 
@@ -55,7 +55,7 @@ open class RestXml(val codegenContext: CodegenContext) : Protocol {
  override fun parseHttpGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_http_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_http_generic_error(response: &#{Response}<#{Bytes}>) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(response.body().as_ref())", restXmlErrors)
@@ -65,7 +65,7 @@ open class RestXml(val codegenContext: CodegenContext) : Protocol {
  override fun parseEventStreamGenericError(operationShape: OperationShape): RuntimeType =
  RuntimeType.forInlineFun("parse_event_stream_generic_error", xmlDeserModule) {
  rustBlockTemplate(
- "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlError}>",
+ "pub fn parse_event_stream_generic_error(payload: &#{Bytes}) -> Result<#{Error}, #{XmlDecodeError}>",
  *errorScope,
  ) {
  rust("#T::parse_generic_error(payload.as_ref())", restXmlErrors)

diff --git a/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/AwsQueryParserGenerator.kt b/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/AwsQueryParserGenerator.kt
@@ -38,24 +38,24 @@ class AwsQueryParserGenerator(
  rustTemplate(
  """
  if !(${XmlBindingTraitParserGenerator.XmlName(responseWrapperName).matchExpression("start_el")}) {
- return Err(#{XmlError}::custom(format!("invalid root, expected $responseWrapperName got {:?}", start_el)))
+ return Err(#{XmlDecodeError}::custom(format!("invalid root, expected $responseWrapperName got {:?}", start_el)))
  }
  if let Some(mut result_tag) = decoder.next_tag() {
  let start_el = result_tag.start_el();
  if !(${XmlBindingTraitParserGenerator.XmlName(resultWrapperName).matchExpression("start_el")}) {
- return Err(#{XmlError}::custom(format!("invalid result, expected $resultWrapperName got {:?}", start_el)))
+ return Err(#{XmlDecodeError}::custom(format!("invalid result, expected $resultWrapperName got {:?}", start_el)))
  }
  """,
- "XmlError" to context.xmlErrorType,
+ "XmlDecodeError" to context.xmlDecodeErrorType,
  )
  inner("result_tag")
  rustTemplate(
  """
  } else {
- return Err(#{XmlError}::custom("expected $resultWrapperName tag"))
+ return Err(#{XmlDecodeError}::custom("expected $resultWrapperName tag"))
  };
  """,
- "XmlError" to context.xmlErrorType,
+ "XmlDecodeError" to context.xmlDecodeErrorType,
  )
  },
 ) : StructuredDataParserGenerator by xmlBindingTraitParserGenerator
diff --git a/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/Ec2QueryParserGenerator.kt b/...oftware/amazon/smithy/rust/codegen/core/smithy/protocols/parse/Ec2QueryParserGenerator.kt
@@ -35,10 +35,10 @@ class Ec2QueryParserGenerator(
  rustTemplate(
  """
  if !(${XmlBindingTraitParserGenerator.XmlName(responseWrapperName).matchExpression("start_el")}) {
- return Err(#{XmlError}::custom(format!("invalid root, expected $responseWrapperName got {:?}", start_el)))
+ return Err(#{XmlDecodeError}::custom(format!("invalid root, expected $responseWrapperName got {:?}", start_el)))
  }
  """,
- "XmlError" to context.xmlErrorType,
+ "XmlDecodeError" to context.xmlDecodeErrorType,
  )
  inner("decoder")
  },

diff --git a/...software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/RestXmlParserGenerator.kt b/...software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/RestXmlParserGenerator.kt
@@ -36,13 +36,13 @@ class RestXmlParserGenerator(
  """
  if !${XmlBindingTraitParserGenerator.XmlName(shapeName).matchExpression("start_el")} {
  return Err(
- #{XmlError}::custom(
+ #{XmlDecodeError}::custom(
  format!("encountered invalid XML root: expected $shapeName but got {:?}. This is likely a bug in the SDK.", start_el)
  )
  )
  }
  """,
- "XmlError" to context.xmlErrorType,
+ "XmlDecodeError" to context.xmlDecodeErrorType,
  )
  }
 

diff --git a/...e/amazon/smithy/rust/codegen/core/smithy/protocols/parse/StructuredDataParserGenerator.kt b/...e/amazon/smithy/rust/codegen/core/smithy/protocols/parse/StructuredDataParserGenerator.kt
@@ -16,7 +16,7 @@ interface StructuredDataParserGenerator {
  * Entry point for payload-based parsing.
  * Roughly:
  * ```rust
- * fn parse_my_struct(input: &[u8]) -> Result<MyStruct, XmlError> {
+ * fn parse_my_struct(input: &[u8]) -> Result<MyStruct, XmlDecodeError> {
  * ...
  * }
  * ```
@@ -29,7 +29,7 @@ interface StructuredDataParserGenerator {
  * through:
  *
  * ```rust
- * fn parse_some_operation(inp: &[u8], builder: my_operation::Builder) -> Result<my_operation::Builder, XmlError> {
+ * fn parse_some_operation(inp: &[u8], builder: my_operation::Builder) -> Result<my_operation::Builder, XmlDecodeError> {
  * ...
  * }
  * ```
@@ -41,7 +41,7 @@ interface StructuredDataParserGenerator {
  * through:
  *
  * ```rust
- * fn parse_some_error(inp: &[u8], builder: my_operation::Builder) -> Result<my_operation::Builder, XmlError> {
+ * fn parse_some_error(inp: &[u8], builder: my_operation::Builder) -> Result<my_operation::Builder, XmlDecodeError> {
  * ...
  * }
  */