Client Test

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/json_errors.rs

@@ -1,1 +45,45 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0

  */
-6
 use aws_smithy_json::deserialize::token::skip_value;
 use aws_smithy_json::deserialize::{error::DeserializeError, json_token_iter, Token};
 use aws_smithy_runtime_api::http::Headers;
 use aws_smithy_types::error::metadata::{Builder as ErrorMetadataBuilder, ErrorMetadata};
 use std::borrow::Cow;
-12
 // currently only used by AwsJson
 #[allow(unused)]
 pub fn is_error<B>(response: &http::Response<B>) -> bool {
 pub fn is_error<B>(response: &http_1x::Response<B>) -> bool {
     !response.status().is_success()
-17
+}
-18
 fn sanitize_error_code(error_code: &str) -> &str {
     // Trim a trailing URL from the error code, which is done by removing the longest suffix
     // beginning with a `:`
     let error_code = match error_code.find(':') {
         Some(idx) => &error_code[..idx],
         None => error_code,
     };

↧ Expand context

-26
     // Trim a prefixing namespace from the error code, beginning with a `#`
     match error_code.find('#') {
         Some(idx) => &error_code[idx + 1..],
         None => error_code,
-31
+    }
-32
+}
-33
 struct ErrorBody<'a> {
     code: Option<Cow<'a, str>>,
     message: Option<Cow<'a, str>>,
-37
+}
-38
 fn parse_error_body(bytes: &[u8]) -> Result<ErrorBody<'_>, DeserializeError> {
     let mut tokens = json_token_iter(bytes).peekable();
     let (mut typ, mut code, mut message) = (None, None, None);
     if let Some(Token::StartObject { .. }) = tokens.next().transpose()? {
         loop {
             match tokens.next().transpose()? {
                 Some(Token::EndObject { .. }) => break,

@@ -60,60 +120,120 @@

↥ Expand context

         if tokens.next().is_some() {
             return Err(DeserializeError::custom("found more JSON tokens after completing parsing"));
-62
+        }
-63
+    }
     Ok(ErrorBody { code: code.or(typ), message })
-65
+}
-66
 pub fn parse_error_metadata(payload: &[u8], headers: &Headers) -> Result<ErrorMetadataBuilder, DeserializeError> {
     let ErrorBody { code, message } = parse_error_body(payload)?;
-69
     let mut err_builder = ErrorMetadata::builder();
     if let Some(code) = headers.get("x-amzn-errortype").or(code.as_deref()).map(sanitize_error_code) {
         err_builder = err_builder.code(code);
-73
+    }
     if let Some(message) = message {
         err_builder = err_builder.message(message);
-76
+    }
     Ok(err_builder)
-78
+}
-79

 #[cfg(test)]
 mod test {
     use crate::json_errors::{parse_error_body, parse_error_metadata, sanitize_error_code};
     use aws_smithy_runtime_api::client::orchestrator::HttpResponse;
     use aws_smithy_types::{body::SdkBody, error::ErrorMetadata};
     use std::borrow::Cow;
-86
     #[test]
     fn error_metadata() {
         let response = HttpResponse::try_from(
             http::Response::builder()
             http_1x::Response::builder()
                 .body(SdkBody::from(r#"{ "__type": "FooError", "message": "Go to foo" }"#))
                 .unwrap(),
-93
+        )
         .unwrap();
         assert_eq!(
             parse_error_metadata(response.body().bytes().unwrap(), response.headers())
                 .unwrap()
                 .build(),
             ErrorMetadata::builder().code("FooError").message("Go to foo").build()
-100
+        )

↧ Expand context

-101
+    }
-102
     #[test]
     fn error_type() {
         assert_eq!(
             Some(Cow::Borrowed("FooError")),
             parse_error_body(br#"{ "__type": "FooError" }"#).unwrap().code
         );
-109
+    }
-110
     #[test]
     fn code_takes_priority() {
         assert_eq!(
             Some(Cow::Borrowed("BarError")),
             parse_error_body(br#"{ "code": "BarError", "__type": "FooError" }"#).unwrap().code
         );
-117
+    }
-118
     #[test]
     fn ignore_unrecognized_fields() {

@@ -129,129 +180,180 @@

↥ Expand context

     #[test]
     fn sanitize_namespace_and_url() {
         assert_eq!(
             sanitize_error_code("aws.protocoltests.restjson#FooError:http://internal.amazon.com/coral/com.amazon.coral.validate/"),
             "FooError"
         );
-135
+    }
-136
     #[test]
     fn sanitize_noop() {
         assert_eq!(sanitize_error_code("FooError"), "FooError");
-140
+    }
-141
     #[test]
     fn sanitize_url() {
         assert_eq!(
             sanitize_error_code("FooError:http://internal.amazon.com/coral/com.amazon.coral.validate/"),
             "FooError"
         );
-148
+    }

-149
     #[test]
     fn sanitize_namespace() {
         assert_eq!(sanitize_error_code("aws.protocoltests.restjson#FooError"), "FooError");
-153
+    }
-154
     // services like lambda use an alternate `Message` instead of `message`
     #[test]
     fn alternative_error_message_names() {
         let response = HttpResponse::try_from(
             http::Response::builder()
             http_1x::Response::builder()
                 .header("x-amzn-errortype", "ResourceNotFoundException")
                 .body(SdkBody::from(
                     r#"{
                     "Type": "User",
                     "Message": "Functions from 'us-west-2' are not reachable from us-east-1"
                 }"#,
                 ))
                 .unwrap(),
-168
+        )
         .unwrap();

↧ Expand context

         assert_eq!(
             parse_error_metadata(response.body().bytes().unwrap(), response.headers())
                 .unwrap()
                 .build(),
             ErrorMetadata::builder()
                 .code("ResourceNotFoundException")
                 .message("Functions from 'us-west-2' are not reachable from us-east-1")
                 .build()
         );
-179
+    }
-180
+}

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/operation/operation.rs

@@ -146,146 +219,219 @@

↥ Expand context

         crate::protocol_serde::type_erase_result(parse_result)
-147
+    }
-148
+}
 #[derive(Debug)]
 struct OperationRequestSerializer;
 impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for OperationRequestSerializer {
     #[allow(unused_mut, clippy::let_and_return, clippy::needless_borrow, clippy::useless_conversion)]
     fn serialize_input(
         &self,
         input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
         _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<::aws_smithy_runtime_api::client::orchestrator::HttpRequest, ::aws_smithy_runtime_api::box_error::BoxError> {
         let input = input.downcast::<crate::operation::operation::OperationInput>().expect("correct type");
         let _header_serialization_settings = _cfg
             .load::<crate::serialization_settings::HeaderSerializationSettings>()
             .cloned()
             .unwrap_or_default();
         let mut request_builder = {
             #[allow(clippy::uninlined_format_args)]
             fn uri_base(

                 _input: &crate::operation::operation::OperationInput,
                 output: &mut ::std::string::String,
             ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
                 use ::std::fmt::Write as _;
                 ::std::write!(output, "/operation").expect("formatting should succeed");
                 ::std::result::Result::Ok(())
-172
+            }
             #[allow(clippy::unnecessary_wraps)]
             fn update_http_builder(
                 input: &crate::operation::operation::OperationInput,
                 builder: ::http::request::Builder,
             ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 builder: ::http_1x::request::Builder,
             ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 let mut uri = ::std::string::String::new();
                 uri_base(input, &mut uri)?;
                 ::std::result::Result::Ok(builder.method("POST").uri(uri))
-181
+            }
             let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/json");
             let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/json");
             builder
         };
         let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_operation::ser_operation_input(&input)?);
         if let Some(content_length) = body.content_length() {
             let content_length = content_length.to_string();
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
-190
+        }
         ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
-192
+    }
-193
+}
 #[derive(Debug)]
 struct OperationEndpointParamsInterceptor;
-196
 impl ::aws_smithy_runtime_api::client::interceptors::Intercept for OperationEndpointParamsInterceptor {
     fn name(&self) -> &'static str {
         "OperationEndpointParamsInterceptor"

↧ Expand context

-200
+    }
-201
     fn read_before_execution(
         &self,
         context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
             '_,
             ::aws_smithy_runtime_api::client::interceptors::context::Input,
             ::aws_smithy_runtime_api::client::interceptors::context::Output,
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
         >,
         cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
         let _input = context
             .input()
             .downcast_ref::<OperationInput>()
             .ok_or("failed to downcast to OperationInput")?;
-216
         let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
             ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new("endpoint params could not be built", err)
         })?;

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/serialization_settings.rs

@@ -1,1 +78,83 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-6
 #![allow(dead_code)]
-8
 use aws_smithy_http::header::set_request_header_if_absent;
 use aws_smithy_types::config_bag::{Storable, StoreReplace};
 use http::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
 use http_1x::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
-12
 /// Configuration for how default protocol headers are serialized
 #[derive(Clone, Debug, Default)]
 pub(crate) struct HeaderSerializationSettings {
     omit_default_content_length: bool,
     omit_default_content_type: bool,
-18
+}
-19
 impl HeaderSerializationSettings {
     /// Creates new [`HeaderSerializationSettings`]
     pub(crate) fn new() -> Self {
         Default::default()
-24
+    }
-25
     /// Omit the default `Content-Length` header during serialization
     pub(crate) fn omit_default_content_length(self) -> Self {
         Self {
             omit_default_content_length: true,
             ..self
-31
+        }
-32
+    }
-33
     /// Omit the default `Content-Type` header during serialization
     pub(crate) fn omit_default_content_type(self) -> Self {
         Self {
             omit_default_content_type: true,
             ..self
-39
+        }
-40
+    }
-41
     /// Returns true if the given default header name should be serialized
     fn include_header(&self, header: &HeaderName) -> bool {
         (!self.omit_default_content_length || header != CONTENT_LENGTH) && (!self.omit_default_content_type || header != CONTENT_TYPE)
-45
+    }
-46
     /// Sets a default header on the given request builder if it should be serialized
     pub(crate) fn set_default_header(&self, mut request: http::request::Builder, header_name: HeaderName, value: &str) -> http::request::Builder {
     pub(crate) fn set_default_header(
         &self,
         mut request: http_1x::request::Builder,
         header_name: HeaderName,
         value: &str,
     ) -> http_1x::request::Builder {
         if self.include_header(&header_name) {
             request = set_request_header_if_absent(request, header_name, value);
-56
+        }
         request
-58
+    }
-59
+}
-60
 impl Storable for HeaderSerializationSettings {
     type Storer = StoreReplace<Self>;
-63
+}

↧ Expand context

-64
 #[cfg(test)]
 mod tests {
     use super::*;
-68
     #[test]
     fn test_include_header() {
         let settings = HeaderSerializationSettings::default();
         assert!(settings.include_header(&CONTENT_LENGTH));
         assert!(settings.include_header(&CONTENT_TYPE));
-74
         let settings = HeaderSerializationSettings::default().omit_default_content_length();
         assert!(!settings.include_header(&CONTENT_LENGTH));
         assert!(settings.include_header(&CONTENT_TYPE));
-78
         let settings = HeaderSerializationSettings::default().omit_default_content_type();
         assert!(settings.include_header(&CONTENT_LENGTH));
         assert!(!settings.include_header(&CONTENT_TYPE));
-82
         let settings = HeaderSerializationSettings::default()

Client Test

Files changed:

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/json_errors.rs

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/operation/operation.rs

tmp-codegen-diff/codegen-client-test/simple/rust-client-codegen/src/serialization_settings.rs