AWS SDK

AWS SDK

rev. ee474c7509d7728618c23068f3741e8e5b339ef9 (ignoring whitespace)

Files changed:

tmp-codegen-diff/aws-sdk/sdk/iam/src/serialization_settings.rs

@@ -1,1 +78,83 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2      2   
/*
    3      3   
 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
    4      4   
 * SPDX-License-Identifier: Apache-2.0
    5      5   
 */
    6      6   
    7      7   
#![allow(dead_code)]
    8      8   
    9      9   
use aws_smithy_http::header::set_request_header_if_absent;
   10     10   
use aws_smithy_types::config_bag::{Storable, StoreReplace};
   11         -
use http::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
          11  +
use http_1x::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
   12     12   
   13     13   
/// Configuration for how default protocol headers are serialized
   14     14   
#[derive(Clone, Debug, Default)]
   15     15   
pub(crate) struct HeaderSerializationSettings {
   16     16   
    omit_default_content_length: bool,
   17     17   
    omit_default_content_type: bool,
   18     18   
}
   19     19   
   20     20   
impl HeaderSerializationSettings {
   21     21   
    /// Creates new [`HeaderSerializationSettings`]
   22     22   
    pub(crate) fn new() -> Self {
   23     23   
        Default::default()
   24     24   
    }
   25     25   
   26     26   
    /// Omit the default `Content-Length` header during serialization
   27     27   
    pub(crate) fn omit_default_content_length(self) -> Self {
   28     28   
        Self {
   29     29   
            omit_default_content_length: true,
   30     30   
            ..self
   31     31   
        }
   32     32   
    }
   33     33   
   34     34   
    /// Omit the default `Content-Type` header during serialization
   35     35   
    pub(crate) fn omit_default_content_type(self) -> Self {
   36     36   
        Self {
   37     37   
            omit_default_content_type: true,
   38     38   
            ..self
   39     39   
        }
   40     40   
    }
   41     41   
   42     42   
    /// Returns true if the given default header name should be serialized
   43     43   
    fn include_header(&self, header: &HeaderName) -> bool {
   44     44   
        (!self.omit_default_content_length || header != CONTENT_LENGTH) && (!self.omit_default_content_type || header != CONTENT_TYPE)
   45     45   
    }
   46     46   
   47     47   
    /// Sets a default header on the given request builder if it should be serialized
   48         -
    pub(crate) fn set_default_header(&self, mut request: http::request::Builder, header_name: HeaderName, value: &str) -> http::request::Builder {
          48  +
    pub(crate) fn set_default_header(
          49  +
        &self,
          50  +
        mut request: http_1x::request::Builder,
          51  +
        header_name: HeaderName,
          52  +
        value: &str,
          53  +
    ) -> http_1x::request::Builder {
   49     54   
        if self.include_header(&header_name) {
   50     55   
            request = set_request_header_if_absent(request, header_name, value);
   51     56   
        }
   52     57   
        request
   53     58   
    }
   54     59   
}
   55     60   
   56     61   
impl Storable for HeaderSerializationSettings {
   57     62   
    type Storer = StoreReplace<Self>;
   58     63   
}

tmp-codegen-diff/aws-sdk/sdk/kms/Cargo.toml

@@ -1,1 +147,148 @@
   14     14   
protocol = "aws.protocols#awsJson1_1"
   15     15   
[package.metadata.docs.rs]
   16     16   
all-features = true
   17     17   
targets = ["x86_64-unknown-linux-gnu"]
   18     18   
[dependencies.aws-credential-types]
   19     19   
path = "../aws-credential-types"
   20     20   
version = "1.2.11"
   21     21   
   22     22   
[dependencies.aws-runtime]
   23     23   
path = "../aws-runtime"
   24         -
version = "1.5.18"
          24  +
version = "1.6.0"
   25     25   
   26     26   
[dependencies.aws-smithy-async]
   27     27   
path = "../aws-smithy-async"
   28         -
version = "1.2.7"
          28  +
version = "1.2.8"
   29     29   
   30     30   
[dependencies.aws-smithy-http]
   31     31   
path = "../aws-smithy-http"
   32         -
version = "0.62.6"
          32  +
version = "0.63.0"
   33     33   
   34     34   
[dependencies.aws-smithy-json]
   35     35   
path = "../aws-smithy-json"
   36         -
version = "0.61.9"
          36  +
version = "0.62.0"
   37     37   
   38     38   
[dependencies.aws-smithy-observability]
   39     39   
path = "../aws-smithy-observability"
   40         -
version = "0.2.0"
          40  +
version = "0.2.1"
   41     41   
   42     42   
[dependencies.aws-smithy-runtime]
   43     43   
path = "../aws-smithy-runtime"
   44     44   
features = ["client"]
   45         -
version = "1.9.8"
          45  +
version = "1.10.0"
   46     46   
   47     47   
[dependencies.aws-smithy-runtime-api]
   48     48   
path = "../aws-smithy-runtime-api"
   49         -
features = ["client", "http-02x"]
   50         -
version = "1.10.0"
          49  +
features = ["client", "http-1x"]
          50  +
version = "1.11.0"
   51     51   
   52     52   
[dependencies.aws-smithy-types]
   53     53   
path = "../aws-smithy-types"
   54         -
version = "1.3.6"
          54  +
features = ["http-body-1-x"]
          55  +
version = "1.4.0"
   55     56   
   56     57   
[dependencies.aws-types]
   57     58   
path = "../aws-types"
   58     59   
version = "1.3.11"
   59     60   
   60     61   
[dependencies.bytes]
   61     62   
version = "1.4.0"
   62     63   
   63     64   
[dependencies.fastrand]
   64     65   
version = "2.0.0"
   65     66   
   66     67   
[dependencies.http]
   67     68   
version = "0.2.9"
   68     69   
          70  +
[dependencies.http-1x]
          71  +
version = "1"
          72  +
package = "http"
          73  +
   69     74   
[dependencies.regex-lite]
   70     75   
version = "0.1.5"
   71     76   
   72     77   
[dependencies.tracing]
   73     78   
version = "0.1"
   74     79   
[dev-dependencies.aws-config]
   75     80   
path = "../aws-config"
   76     81   
version = "1.8.12"
   77     82   
   78     83   
[dev-dependencies.aws-credential-types]
   79     84   
path = "../aws-credential-types"
   80     85   
features = ["test-util"]
   81     86   
version = "1.2.11"
   82     87   
   83     88   
[dev-dependencies.aws-runtime]
   84     89   
path = "../aws-runtime"
   85     90   
features = ["test-util"]
   86         -
version = "1.5.18"
          91  +
version = "1.6.0"
   87     92   
   88     93   
[dev-dependencies.aws-smithy-async]
   89     94   
path = "../aws-smithy-async"
   90     95   
features = ["test-util"]
   91         -
version = "1.2.7"
          96  +
version = "1.2.8"
   92     97   
   93     98   
[dev-dependencies.aws-smithy-http-client]
   94     99   
path = "../aws-smithy-http-client"
   95    100   
features = ["test-util", "wire-mock"]
   96         -
version = "1.1.5"
         101  +
version = "1.1.6"
   97    102   
   98    103   
[dev-dependencies.aws-smithy-protocol-test]
   99    104   
path = "../aws-smithy-protocol-test"
  100         -
version = "0.63.7"
         105  +
version = "0.63.8"
  101    106   
  102    107   
[dev-dependencies.aws-smithy-runtime]
  103    108   
path = "../aws-smithy-runtime"
  104    109   
features = ["test-util"]
  105         -
version = "1.9.8"
         110  +
version = "1.10.0"
  106    111   
  107    112   
[dev-dependencies.aws-smithy-runtime-api]
  108    113   
path = "../aws-smithy-runtime-api"
  109    114   
features = ["test-util"]
  110         -
version = "1.10.0"
         115  +
version = "1.11.0"
  111    116   
  112    117   
[dev-dependencies.aws-smithy-types]
  113    118   
path = "../aws-smithy-types"
  114         -
features = ["test-util"]
  115         -
version = "1.3.6"
         119  +
features = ["http-body-1-x", "test-util"]
         120  +
version = "1.4.0"
  116    121   
  117    122   
[dev-dependencies.futures-util]
  118    123   
version = "0.3.25"
  119    124   
features = ["alloc"]
  120    125   
default-features = false
  121    126   
  122         -
[dev-dependencies.http-1x]
  123         -
version = "1"
  124         -
package = "http"
  125         -
  126    127   
[dev-dependencies.proptest]
  127    128   
version = "1"
  128    129   
  129    130   
[dev-dependencies.serde_json]
  130    131   
version = "1.0.0"
  131    132   
  132    133   
[dev-dependencies.tokio]
  133    134   
version = "1.23.1"
  134    135   
features = ["macros", "test-util", "rt-multi-thread"]
  135    136

tmp-codegen-diff/aws-sdk/sdk/kms/src/json_errors.rs

@@ -1,1 +45,45 @@
    5      5   
 */
    6      6   
    7      7   
use aws_smithy_json::deserialize::token::skip_value;
    8      8   
use aws_smithy_json::deserialize::{error::DeserializeError, json_token_iter, Token};
    9      9   
use aws_smithy_runtime_api::http::Headers;
   10     10   
use aws_smithy_types::error::metadata::{Builder as ErrorMetadataBuilder, ErrorMetadata};
   11     11   
use std::borrow::Cow;
   12     12   
   13     13   
// currently only used by AwsJson
   14     14   
#[allow(unused)]
   15         -
pub fn is_error<B>(response: &http::Response<B>) -> bool {
          15  +
pub fn is_error<B>(response: &http_1x::Response<B>) -> bool {
   16     16   
    !response.status().is_success()
   17     17   
}
   18     18   
   19     19   
fn sanitize_error_code(error_code: &str) -> &str {
   20     20   
    // Trim a trailing URL from the error code, which is done by removing the longest suffix
   21     21   
    // beginning with a `:`
   22     22   
    let error_code = match error_code.find(':') {
   23     23   
        Some(idx) => &error_code[..idx],
   24     24   
        None => error_code,
   25     25   
    };
@@ -60,60 +120,120 @@
   80     80   
#[cfg(test)]
   81     81   
mod test {
   82     82   
    use crate::json_errors::{parse_error_body, parse_error_metadata, sanitize_error_code};
   83     83   
    use aws_smithy_runtime_api::client::orchestrator::HttpResponse;
   84     84   
    use aws_smithy_types::{body::SdkBody, error::ErrorMetadata};
   85     85   
    use std::borrow::Cow;
   86     86   
   87     87   
    #[test]
   88     88   
    fn error_metadata() {
   89     89   
        let response = HttpResponse::try_from(
   90         -
            http::Response::builder()
          90  +
            http_1x::Response::builder()
   91     91   
                .body(SdkBody::from(r#"{ "__type": "FooError", "message": "Go to foo" }"#))
   92     92   
                .unwrap(),
   93     93   
        )
   94     94   
        .unwrap();
   95     95   
        assert_eq!(
   96     96   
            parse_error_metadata(response.body().bytes().unwrap(), response.headers())
   97     97   
                .unwrap()
   98     98   
                .build(),
   99     99   
            ErrorMetadata::builder().code("FooError").message("Go to foo").build()
  100    100   
        )
@@ -129,129 +180,180 @@
  149    149   
  150    150   
    #[test]
  151    151   
    fn sanitize_namespace() {
  152    152   
        assert_eq!(sanitize_error_code("aws.protocoltests.restjson#FooError"), "FooError");
  153    153   
    }
  154    154   
  155    155   
    // services like lambda use an alternate `Message` instead of `message`
  156    156   
    #[test]
  157    157   
    fn alternative_error_message_names() {
  158    158   
        let response = HttpResponse::try_from(
  159         -
            http::Response::builder()
         159  +
            http_1x::Response::builder()
  160    160   
                .header("x-amzn-errortype", "ResourceNotFoundException")
  161    161   
                .body(SdkBody::from(
  162    162   
                    r#"{
  163    163   
                    "Type": "User",
  164    164   
                    "Message": "Functions from 'us-west-2' are not reachable from us-east-1"
  165    165   
                }"#,
  166    166   
                ))
  167    167   
                .unwrap(),
  168    168   
        )
  169    169   
        .unwrap();

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/cancel_key_deletion.rs

@@ -162,162 +240,240 @@
  182    182   
                _input: &crate::operation::cancel_key_deletion::CancelKeyDeletionInput,
  183    183   
                output: &mut ::std::string::String,
  184    184   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  185    185   
                use ::std::fmt::Write as _;
  186    186   
                ::std::write!(output, "/").expect("formatting should succeed");
  187    187   
                ::std::result::Result::Ok(())
  188    188   
            }
  189    189   
            #[allow(clippy::unnecessary_wraps)]
  190    190   
            fn update_http_builder(
  191    191   
                input: &crate::operation::cancel_key_deletion::CancelKeyDeletionInput,
  192         -
                builder: ::http::request::Builder,
  193         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         192  +
                builder: ::http_1x::request::Builder,
         193  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  194    194   
                let mut uri = ::std::string::String::new();
  195    195   
                uri_base(input, &mut uri)?;
  196    196   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  197    197   
            }
  198         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  199         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         198  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         199  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  200    200   
            builder = _header_serialization_settings.set_default_header(
  201    201   
                builder,
  202         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         202  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  203    203   
                "TrentService.CancelKeyDeletion",
  204    204   
            );
  205    205   
            builder
  206    206   
        };
  207    207   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_cancel_key_deletion::ser_cancel_key_deletion_input(&input)?);
  208    208   
        if let Some(content_length) = body.content_length() {
  209    209   
            let content_length = content_length.to_string();
  210         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         210  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  211    211   
        }
  212    212   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  213    213   
    }
  214    214   
}
  215    215   
#[derive(Debug)]
  216    216   
struct CancelKeyDeletionEndpointParamsInterceptor;
  217    217   
  218    218   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CancelKeyDeletionEndpointParamsInterceptor {
  219    219   
    fn name(&self) -> &'static str {
  220    220   
        "CancelKeyDeletionEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/connect_custom_key_store.rs

@@ -165,165 +245,245 @@
  185    185   
                _input: &crate::operation::connect_custom_key_store::ConnectCustomKeyStoreInput,
  186    186   
                output: &mut ::std::string::String,
  187    187   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  188    188   
                use ::std::fmt::Write as _;
  189    189   
                ::std::write!(output, "/").expect("formatting should succeed");
  190    190   
                ::std::result::Result::Ok(())
  191    191   
            }
  192    192   
            #[allow(clippy::unnecessary_wraps)]
  193    193   
            fn update_http_builder(
  194    194   
                input: &crate::operation::connect_custom_key_store::ConnectCustomKeyStoreInput,
  195         -
                builder: ::http::request::Builder,
  196         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         195  +
                builder: ::http_1x::request::Builder,
         196  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  197    197   
                let mut uri = ::std::string::String::new();
  198    198   
                uri_base(input, &mut uri)?;
  199    199   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  200    200   
            }
  201         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  202         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         201  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         202  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  203    203   
            builder = _header_serialization_settings.set_default_header(
  204    204   
                builder,
  205         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         205  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  206    206   
                "TrentService.ConnectCustomKeyStore",
  207    207   
            );
  208    208   
            builder
  209    209   
        };
  210    210   
        let body = ::aws_smithy_types::body::SdkBody::from(
  211    211   
            crate::protocol_serde::shape_connect_custom_key_store::ser_connect_custom_key_store_input(&input)?,
  212    212   
        );
  213    213   
        if let Some(content_length) = body.content_length() {
  214    214   
            let content_length = content_length.to_string();
  215         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         215  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  216    216   
        }
  217    217   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  218    218   
    }
  219    219   
}
  220    220   
#[derive(Debug)]
  221    221   
struct ConnectCustomKeyStoreEndpointParamsInterceptor;
  222    222   
  223    223   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for ConnectCustomKeyStoreEndpointParamsInterceptor {
  224    224   
    fn name(&self) -> &'static str {
  225    225   
        "ConnectCustomKeyStoreEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/create_alias.rs

@@ -162,162 +240,240 @@
  182    182   
                _input: &crate::operation::create_alias::CreateAliasInput,
  183    183   
                output: &mut ::std::string::String,
  184    184   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  185    185   
                use ::std::fmt::Write as _;
  186    186   
                ::std::write!(output, "/").expect("formatting should succeed");
  187    187   
                ::std::result::Result::Ok(())
  188    188   
            }
  189    189   
            #[allow(clippy::unnecessary_wraps)]
  190    190   
            fn update_http_builder(
  191    191   
                input: &crate::operation::create_alias::CreateAliasInput,
  192         -
                builder: ::http::request::Builder,
  193         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         192  +
                builder: ::http_1x::request::Builder,
         193  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  194    194   
                let mut uri = ::std::string::String::new();
  195    195   
                uri_base(input, &mut uri)?;
  196    196   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  197    197   
            }
  198         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  199         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         198  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         199  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  200    200   
            builder = _header_serialization_settings.set_default_header(
  201    201   
                builder,
  202         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         202  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  203    203   
                "TrentService.CreateAlias",
  204    204   
            );
  205    205   
            builder
  206    206   
        };
  207    207   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_create_alias::ser_create_alias_input(&input)?);
  208    208   
        if let Some(content_length) = body.content_length() {
  209    209   
            let content_length = content_length.to_string();
  210         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         210  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  211    211   
        }
  212    212   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  213    213   
    }
  214    214   
}
  215    215   
#[derive(Debug)]
  216    216   
struct CreateAliasEndpointParamsInterceptor;
  217    217   
  218    218   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateAliasEndpointParamsInterceptor {
  219    219   
    fn name(&self) -> &'static str {
  220    220   
        "CreateAliasEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/create_custom_key_store.rs

@@ -165,165 +245,245 @@
  185    185   
                _input: &crate::operation::create_custom_key_store::CreateCustomKeyStoreInput,
  186    186   
                output: &mut ::std::string::String,
  187    187   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  188    188   
                use ::std::fmt::Write as _;
  189    189   
                ::std::write!(output, "/").expect("formatting should succeed");
  190    190   
                ::std::result::Result::Ok(())
  191    191   
            }
  192    192   
            #[allow(clippy::unnecessary_wraps)]
  193    193   
            fn update_http_builder(
  194    194   
                input: &crate::operation::create_custom_key_store::CreateCustomKeyStoreInput,
  195         -
                builder: ::http::request::Builder,
  196         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         195  +
                builder: ::http_1x::request::Builder,
         196  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  197    197   
                let mut uri = ::std::string::String::new();
  198    198   
                uri_base(input, &mut uri)?;
  199    199   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  200    200   
            }
  201         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  202         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         201  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         202  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  203    203   
            builder = _header_serialization_settings.set_default_header(
  204    204   
                builder,
  205         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         205  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  206    206   
                "TrentService.CreateCustomKeyStore",
  207    207   
            );
  208    208   
            builder
  209    209   
        };
  210    210   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_create_custom_key_store::ser_create_custom_key_store_input(
  211    211   
            &input,
  212    212   
        )?);
  213    213   
        if let Some(content_length) = body.content_length() {
  214    214   
            let content_length = content_length.to_string();
  215         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         215  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  216    216   
        }
  217    217   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  218    218   
    }
  219    219   
}
  220    220   
#[derive(Debug)]
  221    221   
struct CreateCustomKeyStoreEndpointParamsInterceptor;
  222    222   
  223    223   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateCustomKeyStoreEndpointParamsInterceptor {
  224    224   
    fn name(&self) -> &'static str {
  225    225   
        "CreateCustomKeyStoreEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/create_grant.rs

@@ -162,162 +240,240 @@
  182    182   
                _input: &crate::operation::create_grant::CreateGrantInput,
  183    183   
                output: &mut ::std::string::String,
  184    184   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  185    185   
                use ::std::fmt::Write as _;
  186    186   
                ::std::write!(output, "/").expect("formatting should succeed");
  187    187   
                ::std::result::Result::Ok(())
  188    188   
            }
  189    189   
            #[allow(clippy::unnecessary_wraps)]
  190    190   
            fn update_http_builder(
  191    191   
                input: &crate::operation::create_grant::CreateGrantInput,
  192         -
                builder: ::http::request::Builder,
  193         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         192  +
                builder: ::http_1x::request::Builder,
         193  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  194    194   
                let mut uri = ::std::string::String::new();
  195    195   
                uri_base(input, &mut uri)?;
  196    196   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  197    197   
            }
  198         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  199         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         198  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         199  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  200    200   
            builder = _header_serialization_settings.set_default_header(
  201    201   
                builder,
  202         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         202  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  203    203   
                "TrentService.CreateGrant",
  204    204   
            );
  205    205   
            builder
  206    206   
        };
  207    207   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_create_grant::ser_create_grant_input(&input)?);
  208    208   
        if let Some(content_length) = body.content_length() {
  209    209   
            let content_length = content_length.to_string();
  210         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         210  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  211    211   
        }
  212    212   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  213    213   
    }
  214    214   
}
  215    215   
#[derive(Debug)]
  216    216   
struct CreateGrantEndpointParamsInterceptor;
  217    217   
  218    218   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateGrantEndpointParamsInterceptor {
  219    219   
    fn name(&self) -> &'static str {
  220    220   
        "CreateGrantEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/create_key.rs

@@ -160,160 +238,238 @@
  180    180   
                _input: &crate::operation::create_key::CreateKeyInput,
  181    181   
                output: &mut ::std::string::String,
  182    182   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  183    183   
                use ::std::fmt::Write as _;
  184    184   
                ::std::write!(output, "/").expect("formatting should succeed");
  185    185   
                ::std::result::Result::Ok(())
  186    186   
            }
  187    187   
            #[allow(clippy::unnecessary_wraps)]
  188    188   
            fn update_http_builder(
  189    189   
                input: &crate::operation::create_key::CreateKeyInput,
  190         -
                builder: ::http::request::Builder,
  191         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         190  +
                builder: ::http_1x::request::Builder,
         191  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  192    192   
                let mut uri = ::std::string::String::new();
  193    193   
                uri_base(input, &mut uri)?;
  194    194   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  195    195   
            }
  196         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  197         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         196  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         197  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  198    198   
            builder = _header_serialization_settings.set_default_header(
  199    199   
                builder,
  200         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         200  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  201    201   
                "TrentService.CreateKey",
  202    202   
            );
  203    203   
            builder
  204    204   
        };
  205    205   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_create_key::ser_create_key_input(&input)?);
  206    206   
        if let Some(content_length) = body.content_length() {
  207    207   
            let content_length = content_length.to_string();
  208         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         208  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  209    209   
        }
  210    210   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  211    211   
    }
  212    212   
}
  213    213   
#[derive(Debug)]
  214    214   
struct CreateKeyEndpointParamsInterceptor;
  215    215   
  216    216   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateKeyEndpointParamsInterceptor {
  217    217   
    fn name(&self) -> &'static str {
  218    218   
        "CreateKeyEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/decrypt.rs

@@ -157,157 +235,235 @@
  177    177   
                _input: &crate::operation::decrypt::DecryptInput,
  178    178   
                output: &mut ::std::string::String,
  179    179   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  180    180   
                use ::std::fmt::Write as _;
  181    181   
                ::std::write!(output, "/").expect("formatting should succeed");
  182    182   
                ::std::result::Result::Ok(())
  183    183   
            }
  184    184   
            #[allow(clippy::unnecessary_wraps)]
  185    185   
            fn update_http_builder(
  186    186   
                input: &crate::operation::decrypt::DecryptInput,
  187         -
                builder: ::http::request::Builder,
  188         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         187  +
                builder: ::http_1x::request::Builder,
         188  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                let mut uri = ::std::string::String::new();
  190    190   
                uri_base(input, &mut uri)?;
  191    191   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  192    192   
            }
  193         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  194         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         193  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         194  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  195    195   
            builder = _header_serialization_settings.set_default_header(
  196    196   
                builder,
  197         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         197  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  198    198   
                "TrentService.Decrypt",
  199    199   
            );
  200    200   
            builder
  201    201   
        };
  202    202   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_decrypt::ser_decrypt_input(&input)?);
  203    203   
        if let Some(content_length) = body.content_length() {
  204    204   
            let content_length = content_length.to_string();
  205         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         205  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  206    206   
        }
  207    207   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  208    208   
    }
  209    209   
}
  210    210   
#[derive(Debug)]
  211    211   
struct DecryptEndpointParamsInterceptor;
  212    212   
  213    213   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DecryptEndpointParamsInterceptor {
  214    214   
    fn name(&self) -> &'static str {
  215    215   
        "DecryptEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/delete_alias.rs

@@ -162,162 +240,240 @@
  182    182   
                _input: &crate::operation::delete_alias::DeleteAliasInput,
  183    183   
                output: &mut ::std::string::String,
  184    184   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  185    185   
                use ::std::fmt::Write as _;
  186    186   
                ::std::write!(output, "/").expect("formatting should succeed");
  187    187   
                ::std::result::Result::Ok(())
  188    188   
            }
  189    189   
            #[allow(clippy::unnecessary_wraps)]
  190    190   
            fn update_http_builder(
  191    191   
                input: &crate::operation::delete_alias::DeleteAliasInput,
  192         -
                builder: ::http::request::Builder,
  193         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         192  +
                builder: ::http_1x::request::Builder,
         193  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  194    194   
                let mut uri = ::std::string::String::new();
  195    195   
                uri_base(input, &mut uri)?;
  196    196   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  197    197   
            }
  198         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  199         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         198  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         199  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  200    200   
            builder = _header_serialization_settings.set_default_header(
  201    201   
                builder,
  202         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         202  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  203    203   
                "TrentService.DeleteAlias",
  204    204   
            );
  205    205   
            builder
  206    206   
        };
  207    207   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_delete_alias::ser_delete_alias_input(&input)?);
  208    208   
        if let Some(content_length) = body.content_length() {
  209    209   
            let content_length = content_length.to_string();
  210         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         210  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  211    211   
        }
  212    212   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  213    213   
    }
  214    214   
}
  215    215   
#[derive(Debug)]
  216    216   
struct DeleteAliasEndpointParamsInterceptor;
  217    217   
  218    218   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DeleteAliasEndpointParamsInterceptor {
  219    219   
    fn name(&self) -> &'static str {
  220    220   
        "DeleteAliasEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/delete_custom_key_store.rs

@@ -165,165 +245,245 @@
  185    185   
                _input: &crate::operation::delete_custom_key_store::DeleteCustomKeyStoreInput,
  186    186   
                output: &mut ::std::string::String,
  187    187   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  188    188   
                use ::std::fmt::Write as _;
  189    189   
                ::std::write!(output, "/").expect("formatting should succeed");
  190    190   
                ::std::result::Result::Ok(())
  191    191   
            }
  192    192   
            #[allow(clippy::unnecessary_wraps)]
  193    193   
            fn update_http_builder(
  194    194   
                input: &crate::operation::delete_custom_key_store::DeleteCustomKeyStoreInput,
  195         -
                builder: ::http::request::Builder,
  196         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         195  +
                builder: ::http_1x::request::Builder,
         196  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  197    197   
                let mut uri = ::std::string::String::new();
  198    198   
                uri_base(input, &mut uri)?;
  199    199   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  200    200   
            }
  201         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  202         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         201  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         202  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  203    203   
            builder = _header_serialization_settings.set_default_header(
  204    204   
                builder,
  205         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         205  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  206    206   
                "TrentService.DeleteCustomKeyStore",
  207    207   
            );
  208    208   
            builder
  209    209   
        };
  210    210   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_delete_custom_key_store::ser_delete_custom_key_store_input(
  211    211   
            &input,
  212    212   
        )?);
  213    213   
        if let Some(content_length) = body.content_length() {
  214    214   
            let content_length = content_length.to_string();
  215         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         215  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  216    216   
        }
  217    217   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  218    218   
    }
  219    219   
}
  220    220   
#[derive(Debug)]
  221    221   
struct DeleteCustomKeyStoreEndpointParamsInterceptor;
  222    222   
  223    223   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DeleteCustomKeyStoreEndpointParamsInterceptor {
  224    224   
    fn name(&self) -> &'static str {
  225    225   
        "DeleteCustomKeyStoreEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/delete_imported_key_material.rs

@@ -165,165 +245,245 @@
  185    185   
                _input: &crate::operation::delete_imported_key_material::DeleteImportedKeyMaterialInput,
  186    186   
                output: &mut ::std::string::String,
  187    187   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  188    188   
                use ::std::fmt::Write as _;
  189    189   
                ::std::write!(output, "/").expect("formatting should succeed");
  190    190   
                ::std::result::Result::Ok(())
  191    191   
            }
  192    192   
            #[allow(clippy::unnecessary_wraps)]
  193    193   
            fn update_http_builder(
  194    194   
                input: &crate::operation::delete_imported_key_material::DeleteImportedKeyMaterialInput,
  195         -
                builder: ::http::request::Builder,
  196         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         195  +
                builder: ::http_1x::request::Builder,
         196  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  197    197   
                let mut uri = ::std::string::String::new();
  198    198   
                uri_base(input, &mut uri)?;
  199    199   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  200    200   
            }
  201         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  202         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         201  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         202  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  203    203   
            builder = _header_serialization_settings.set_default_header(
  204    204   
                builder,
  205         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         205  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  206    206   
                "TrentService.DeleteImportedKeyMaterial",
  207    207   
            );
  208    208   
            builder
  209    209   
        };
  210    210   
        let body = ::aws_smithy_types::body::SdkBody::from(
  211    211   
            crate::protocol_serde::shape_delete_imported_key_material::ser_delete_imported_key_material_input(&input)?,
  212    212   
        );
  213    213   
        if let Some(content_length) = body.content_length() {
  214    214   
            let content_length = content_length.to_string();
  215         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         215  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  216    216   
        }
  217    217   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  218    218   
    }
  219    219   
}
  220    220   
#[derive(Debug)]
  221    221   
struct DeleteImportedKeyMaterialEndpointParamsInterceptor;
  222    222   
  223    223   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DeleteImportedKeyMaterialEndpointParamsInterceptor {
  224    224   
    fn name(&self) -> &'static str {
  225    225   
        "DeleteImportedKeyMaterialEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/derive_shared_secret.rs

@@ -163,163 +242,242 @@
  183    183   
                _input: &crate::operation::derive_shared_secret::DeriveSharedSecretInput,
  184    184   
                output: &mut ::std::string::String,
  185    185   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  186    186   
                use ::std::fmt::Write as _;
  187    187   
                ::std::write!(output, "/").expect("formatting should succeed");
  188    188   
                ::std::result::Result::Ok(())
  189    189   
            }
  190    190   
            #[allow(clippy::unnecessary_wraps)]
  191    191   
            fn update_http_builder(
  192    192   
                input: &crate::operation::derive_shared_secret::DeriveSharedSecretInput,
  193         -
                builder: ::http::request::Builder,
  194         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         193  +
                builder: ::http_1x::request::Builder,
         194  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  195    195   
                let mut uri = ::std::string::String::new();
  196    196   
                uri_base(input, &mut uri)?;
  197    197   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  198    198   
            }
  199         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  200         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         199  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         200  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  201    201   
            builder = _header_serialization_settings.set_default_header(
  202    202   
                builder,
  203         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         203  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  204    204   
                "TrentService.DeriveSharedSecret",
  205    205   
            );
  206    206   
            builder
  207    207   
        };
  208    208   
        let body =
  209    209   
            ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_derive_shared_secret::ser_derive_shared_secret_input(&input)?);
  210    210   
        if let Some(content_length) = body.content_length() {
  211    211   
            let content_length = content_length.to_string();
  212         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         212  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  213    213   
        }
  214    214   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  215    215   
    }
  216    216   
}
  217    217   
#[derive(Debug)]
  218    218   
struct DeriveSharedSecretEndpointParamsInterceptor;
  219    219   
  220    220   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DeriveSharedSecretEndpointParamsInterceptor {
  221    221   
    fn name(&self) -> &'static str {
  222    222   
        "DeriveSharedSecretEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/describe_custom_key_stores.rs

@@ -166,166 +246,246 @@
  186    186   
                _input: &crate::operation::describe_custom_key_stores::DescribeCustomKeyStoresInput,
  187    187   
                output: &mut ::std::string::String,
  188    188   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  189    189   
                use ::std::fmt::Write as _;
  190    190   
                ::std::write!(output, "/").expect("formatting should succeed");
  191    191   
                ::std::result::Result::Ok(())
  192    192   
            }
  193    193   
            #[allow(clippy::unnecessary_wraps)]
  194    194   
            fn update_http_builder(
  195    195   
                input: &crate::operation::describe_custom_key_stores::DescribeCustomKeyStoresInput,
  196         -
                builder: ::http::request::Builder,
  197         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         196  +
                builder: ::http_1x::request::Builder,
         197  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  198    198   
                let mut uri = ::std::string::String::new();
  199    199   
                uri_base(input, &mut uri)?;
  200    200   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  201    201   
            }
  202         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  203         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         202  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         203  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  204    204   
            builder = _header_serialization_settings.set_default_header(
  205    205   
                builder,
  206         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         206  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  207    207   
                "TrentService.DescribeCustomKeyStores",
  208    208   
            );
  209    209   
            builder
  210    210   
        };
  211    211   
        let body = ::aws_smithy_types::body::SdkBody::from(
  212    212   
            crate::protocol_serde::shape_describe_custom_key_stores::ser_describe_custom_key_stores_input(&input)?,
  213    213   
        );
  214    214   
        if let Some(content_length) = body.content_length() {
  215    215   
            let content_length = content_length.to_string();
  216         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         216  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  217    217   
        }
  218    218   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  219    219   
    }
  220    220   
}
  221    221   
#[derive(Debug)]
  222    222   
struct DescribeCustomKeyStoresEndpointParamsInterceptor;
  223    223   
  224    224   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DescribeCustomKeyStoresEndpointParamsInterceptor {
  225    225   
    fn name(&self) -> &'static str {
  226    226   
        "DescribeCustomKeyStoresEndpointParamsInterceptor"

tmp-codegen-diff/aws-sdk/sdk/kms/src/operation/describe_key.rs

@@ -162,162 +240,240 @@
  182    182   
                _input: &crate::operation::describe_key::DescribeKeyInput,
  183    183   
                output: &mut ::std::string::String,
  184    184   
            ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
  185    185   
                use ::std::fmt::Write as _;
  186    186   
                ::std::write!(output, "/").expect("formatting should succeed");
  187    187   
                ::std::result::Result::Ok(())
  188    188   
            }
  189    189   
            #[allow(clippy::unnecessary_wraps)]
  190    190   
            fn update_http_builder(
  191    191   
                input: &crate::operation::describe_key::DescribeKeyInput,
  192         -
                builder: ::http::request::Builder,
  193         -
            ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         192  +
                builder: ::http_1x::request::Builder,
         193  +
            ) -> ::std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
  194    194   
                let mut uri = ::std::string::String::new();
  195    195   
                uri_base(input, &mut uri)?;
  196    196   
                ::std::result::Result::Ok(builder.method("POST").uri(uri))
  197    197   
            }
  198         -
            let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
  199         -
            builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/x-amz-json-1.1");
         198  +
            let mut builder = update_http_builder(&input, ::http_1x::request::Builder::new())?;
         199  +
            builder = _header_serialization_settings.set_default_header(builder, ::http_1x::header::CONTENT_TYPE, "application/x-amz-json-1.1");
  200    200   
            builder = _header_serialization_settings.set_default_header(
  201    201   
                builder,
  202         -
                ::http::header::HeaderName::from_static("x-amz-target"),
         202  +
                ::http_1x::header::HeaderName::from_static("x-amz-target"),
  203    203   
                "TrentService.DescribeKey",
  204    204   
            );
  205    205   
            builder
  206    206   
        };
  207    207   
        let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_describe_key::ser_describe_key_input(&input)?);
  208    208   
        if let Some(content_length) = body.content_length() {
  209    209   
            let content_length = content_length.to_string();
  210         -
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
         210  +
            request_builder = _header_serialization_settings.set_default_header(request_builder, ::http_1x::header::CONTENT_LENGTH, &content_length);
  211    211   
        }
  212    212   
        ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
  213    213   
    }
  214    214   
}
  215    215   
#[derive(Debug)]
  216    216   
struct DescribeKeyEndpointParamsInterceptor;
  217    217   
  218    218   
impl ::aws_smithy_runtime_api::client::interceptors::Intercept for DescribeKeyEndpointParamsInterceptor {
  219    219   
    fn name(&self) -> &'static str {
  220    220   
        "DescribeKeyEndpointParamsInterceptor"