Commit a804b032 authored by AWS SDK Rust Bot's avatar AWS SDK Rust Bot
Browse files

[smithy-rs] Rollup of 2 commits 



Includes commits:
  3af97de9 Ensure identity resolver is set when a credentials provider is given only at operation level (#3156)
  ccab4b69 Clean up re-exports and improve 'BuildError' conversions (#3173)

Co-authored-by: default avatarRussell Cohen <rcoh@amazon.com>
Co-authored-by: default avatarysaito1001 <awsaito@amazon.com>
parent bda9d7c0

sdk/accessanalyzer/src/config.rs

+85 −66
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ pub struct Config { 
    // Both `config` and `cloneable` are the same config, but the cloneable one

    // is kept around so that it is possible to convert back into a builder. This can be

    // optimized in the future.

    pub(crate) config: ::aws_smithy_types::config_bag::FrozenLayer,

    pub(crate) config: crate::config::FrozenLayer,

    cloneable: ::aws_smithy_types::config_bag::CloneableLayer,

    pub(crate) runtime_components: ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,

    pub(crate) runtime_plugins: ::std::vec::Vec<::aws_smithy_runtime_api::client::runtime_plugin::SharedRuntimePlugin>,

    pub(crate) runtime_components: crate::config::RuntimeComponentsBuilder,

    pub(crate) runtime_plugins: ::std::vec::Vec<crate::config::SharedRuntimePlugin>,

}

impl Config {

    /// Constructs a config builder.
@@ -41,12 +41,12 @@ impl Config { 
    }

    /// Deprecated. Don't use.

    #[deprecated(note = "HTTP connector configuration changed. See https://github.com/awslabs/smithy-rs/discussions/3022 for upgrade guidance.")]

    pub fn http_connector(&self) -> Option<::aws_smithy_runtime_api::client::http::SharedHttpClient> {

    pub fn http_connector(&self) -> Option<crate::config::SharedHttpClient> {

        self.runtime_components.http_client()

    }



    /// Return the [`SharedHttpClient`](::aws_smithy_runtime_api::client::http::SharedHttpClient) to use when making requests, if any.

    pub fn http_client(&self) -> Option<::aws_smithy_runtime_api::client::http::SharedHttpClient> {

    /// Return the [`SharedHttpClient`](crate::config::SharedHttpClient) to use when making requests, if any.

    pub fn http_client(&self) -> Option<crate::config::SharedHttpClient> {

        self.runtime_components.http_client()

    }

    /// Returns the endpoint resolver.
@@ -59,7 +59,7 @@ impl Config { 
    }



    /// Return a cloned shared async sleep implementation from this config, if any.

    pub fn sleep_impl(&self) -> ::std::option::Option<::aws_smithy_async::rt::sleep::SharedAsyncSleep> {

    pub fn sleep_impl(&self) -> ::std::option::Option<crate::config::SharedAsyncSleep> {

        self.runtime_components.sleep_impl()

    }
@@ -77,11 +77,11 @@ impl Config { 
        self.config.load::<::aws_smithy_runtime::client::retries::RetryPartition>()

    }

    /// Returns the configured identity cache for auth.

    pub fn identity_cache(&self) -> ::std::option::Option<::aws_smithy_runtime_api::client::identity::SharedIdentityCache> {

    pub fn identity_cache(&self) -> ::std::option::Option<crate::config::SharedIdentityCache> {

        self.runtime_components.identity_cache()

    }

    /// Returns interceptors currently registered by the user.

    pub fn interceptors(&self) -> impl Iterator<Item = ::aws_smithy_runtime_api::client::interceptors::SharedInterceptor> + '_ {

    pub fn interceptors(&self) -> impl Iterator<Item = crate::config::SharedInterceptor> + '_ {

        self.runtime_components.interceptors()

    }

    /// Return time source used for this service.
@@ -117,26 +117,26 @@ impl Config { 
        "access-analyzer"

    }

    /// Returns the AWS region, if it was provided.

    pub fn region(&self) -> ::std::option::Option<&::aws_types::region::Region> {

        self.config.load::<::aws_types::region::Region>()

    pub fn region(&self) -> ::std::option::Option<&crate::config::Region> {

        self.config.load::<crate::config::Region>()

    }

    /// Returns the credentials provider for this service

    pub fn credentials_provider(&self) -> Option<::aws_credential_types::provider::SharedCredentialsProvider> {

        self.config.load::<::aws_credential_types::provider::SharedCredentialsProvider>().cloned()

    pub fn credentials_provider(&self) -> Option<crate::config::SharedCredentialsProvider> {

        self.config.load::<crate::config::SharedCredentialsProvider>().cloned()

    }

}

/// Builder for creating a `Config`.

#[derive(::std::clone::Clone, ::std::fmt::Debug)]

pub struct Builder {

    pub(crate) config: ::aws_smithy_types::config_bag::CloneableLayer,

    pub(crate) runtime_components: ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,

    pub(crate) runtime_plugins: ::std::vec::Vec<::aws_smithy_runtime_api::client::runtime_plugin::SharedRuntimePlugin>,

    pub(crate) runtime_components: crate::config::RuntimeComponentsBuilder,

    pub(crate) runtime_plugins: ::std::vec::Vec<crate::config::SharedRuntimePlugin>,

}

impl ::std::default::Default for Builder {

    fn default() -> Self {

        Self {

            config: ::std::default::Default::default(),

            runtime_components: ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new("service config"),

            runtime_components: crate::config::RuntimeComponentsBuilder::new("service config"),

            runtime_plugins: ::std::default::Default::default(),

        }

    }
@@ -164,13 +164,13 @@ impl Builder { 
    }

    /// Deprecated. Don't use.

    #[deprecated(note = "HTTP connector configuration changed. See https://github.com/awslabs/smithy-rs/discussions/3022 for upgrade guidance.")]

    pub fn http_connector(self, http_client: impl ::aws_smithy_runtime_api::client::http::HttpClient + 'static) -> Self {

    pub fn http_connector(self, http_client: impl crate::config::HttpClient + 'static) -> Self {

        self.http_client(http_client)

    }



    /// Deprecated. Don't use.

    #[deprecated(note = "HTTP connector configuration changed. See https://github.com/awslabs/smithy-rs/discussions/3022 for upgrade guidance.")]

    pub fn set_http_connector(&mut self, http_client: Option<::aws_smithy_runtime_api::client::http::SharedHttpClient>) -> &mut Self {

    pub fn set_http_connector(&mut self, http_client: Option<crate::config::SharedHttpClient>) -> &mut Self {

        self.set_http_client(http_client)

    }
@@ -203,10 +203,8 @@ impl Builder { 
    /// # }

    /// # }

    /// ```

    pub fn http_client(mut self, http_client: impl ::aws_smithy_runtime_api::client::http::HttpClient + 'static) -> Self {

        self.set_http_client(::std::option::Option::Some(::aws_smithy_runtime_api::shared::IntoShared::into_shared(

            http_client,

        )));

    pub fn http_client(mut self, http_client: impl crate::config::HttpClient + 'static) -> Self {

        self.set_http_client(::std::option::Option::Some(crate::config::IntoShared::into_shared(http_client)));

        self

    }
@@ -239,7 +237,7 @@ impl Builder { 
    /// # }

    /// # }

    /// ```

    pub fn set_http_client(&mut self, http_client: Option<::aws_smithy_runtime_api::client::http::SharedHttpClient>) -> &mut Self {

    pub fn set_http_client(&mut self, http_client: Option<crate::config::SharedHttpClient>) -> &mut Self {

        self.runtime_components.set_http_client(http_client);

        self

    }
@@ -341,7 +339,7 @@ impl Builder { 
    /// let sleep_impl = SharedAsyncSleep::new(ForeverSleep);

    /// let config = Config::builder().sleep_impl(sleep_impl).build();

    /// ```

    pub fn sleep_impl(mut self, sleep_impl: impl ::aws_smithy_async::rt::sleep::AsyncSleep + 'static) -> Self {

    pub fn sleep_impl(mut self, sleep_impl: impl crate::config::AsyncSleep + 'static) -> Self {

        self.set_sleep_impl(Some(::aws_smithy_runtime_api::shared::IntoShared::into_shared(sleep_impl)));

        self

    }
@@ -371,7 +369,7 @@ impl Builder { 
    /// set_never_ending_sleep_impl(&mut builder);

    /// let config = builder.build();

    /// ```

    pub fn set_sleep_impl(&mut self, sleep_impl: ::std::option::Option<::aws_smithy_async::rt::sleep::SharedAsyncSleep>) -> &mut Self {

    pub fn set_sleep_impl(&mut self, sleep_impl: ::std::option::Option<crate::config::SharedAsyncSleep>) -> &mut Self {

        self.runtime_components.set_sleep_impl(sleep_impl);

        self

    }
@@ -445,7 +443,7 @@ impl Builder { 
    /// the next request will result in refreshing the identity.

    ///

    /// This configuration allows you to disable or change the default caching mechanism.

    /// To use a custom caching mechanism, implement the [`ResolveCachedIdentity`](::aws_smithy_runtime_api::client::identity::ResolveCachedIdentity)

    /// To use a custom caching mechanism, implement the [`ResolveCachedIdentity`](crate::config::ResolveCachedIdentity)

    /// trait and pass that implementation into this function.

    ///

    /// # Examples
@@ -478,7 +476,7 @@ impl Builder { 
    /// let client = aws_sdk_accessanalyzer::Client::from_conf(config);

    /// ```



    pub fn identity_cache(mut self, identity_cache: impl ::aws_smithy_runtime_api::client::identity::ResolveCachedIdentity + 'static) -> Self {

    pub fn identity_cache(mut self, identity_cache: impl crate::config::ResolveCachedIdentity + 'static) -> Self {

        self.set_identity_cache(identity_cache);

        self

    }
@@ -491,7 +489,7 @@ impl Builder { 
    /// the next request will result in refreshing the identity.

    ///

    /// This configuration allows you to disable or change the default caching mechanism.

    /// To use a custom caching mechanism, implement the [`ResolveCachedIdentity`](::aws_smithy_runtime_api::client::identity::ResolveCachedIdentity)

    /// To use a custom caching mechanism, implement the [`ResolveCachedIdentity`](crate::config::ResolveCachedIdentity)

    /// trait and pass that implementation into this function.

    ///

    /// # Examples
@@ -524,14 +522,11 @@ impl Builder { 
    /// let client = aws_sdk_accessanalyzer::Client::from_conf(config);

    /// ```



    pub fn set_identity_cache(

        &mut self,

        identity_cache: impl ::aws_smithy_runtime_api::client::identity::ResolveCachedIdentity + 'static,

    ) -> &mut Self {

    pub fn set_identity_cache(&mut self, identity_cache: impl crate::config::ResolveCachedIdentity + 'static) -> &mut Self {

        self.runtime_components.set_identity_cache(::std::option::Option::Some(identity_cache));

        self

    }

    /// Add an [interceptor](::aws_smithy_runtime_api::client::interceptors::Intercept) that runs at specific stages of the request execution pipeline.

    /// Add an [interceptor](crate::config::Intercept) that runs at specific stages of the request execution pipeline.

    ///

    /// Interceptors targeted at a certain stage are executed according to the pre-defined priority.

    /// The SDK provides a default set of interceptors. An interceptor configured by this method
@@ -575,12 +570,12 @@ impl Builder { 
    /// # }

    /// # }

    /// ```

    pub fn interceptor(mut self, interceptor: impl ::aws_smithy_runtime_api::client::interceptors::Intercept + 'static) -> Self {

        self.push_interceptor(::aws_smithy_runtime_api::client::interceptors::SharedInterceptor::new(interceptor));

    pub fn interceptor(mut self, interceptor: impl crate::config::Intercept + 'static) -> Self {

        self.push_interceptor(crate::config::SharedInterceptor::new(interceptor));

        self

    }



    /// Add a [`SharedInterceptor`](::aws_smithy_runtime_api::client::interceptors::SharedInterceptor) that runs at specific stages of the request execution pipeline.

    /// Add a [`SharedInterceptor`](crate::config::SharedInterceptor) that runs at specific stages of the request execution pipeline.

    ///

    /// Interceptors targeted at a certain stage are executed according to the pre-defined priority.

    /// The SDK provides a default set of interceptors. An interceptor configured by this method
@@ -627,16 +622,13 @@ impl Builder { 
    /// # }

    /// # }

    /// ```

    pub fn push_interceptor(&mut self, interceptor: ::aws_smithy_runtime_api::client::interceptors::SharedInterceptor) -> &mut Self {

    pub fn push_interceptor(&mut self, interceptor: crate::config::SharedInterceptor) -> &mut Self {

        self.runtime_components.push_interceptor(interceptor);

        self

    }



    /// Set [`SharedInterceptor`](::aws_smithy_runtime_api::client::interceptors::SharedInterceptor)s for the builder.

    pub fn set_interceptors(

        &mut self,

        interceptors: impl IntoIterator<Item = ::aws_smithy_runtime_api::client::interceptors::SharedInterceptor>,

    ) -> &mut Self {

    /// Set [`SharedInterceptor`](crate::config::SharedInterceptor)s for the builder.

    pub fn set_interceptors(&mut self, interceptors: impl IntoIterator<Item = crate::config::SharedInterceptor>) -> &mut Self {

        self.runtime_components.set_interceptors(interceptors.into_iter());

        self

    }
@@ -930,39 +922,39 @@ impl Builder { 
    ///     .region(Region::new("us-east-1"))

    ///     .build();

    /// ```

    pub fn region(mut self, region: impl ::std::convert::Into<::std::option::Option<::aws_types::region::Region>>) -> Self {

    pub fn region(mut self, region: impl ::std::convert::Into<::std::option::Option<crate::config::Region>>) -> Self {

        self.set_region(region.into());

        self

    }

    /// Sets the AWS region to use when making requests.

    pub fn set_region(&mut self, region: ::std::option::Option<::aws_types::region::Region>) -> &mut Self {

    pub fn set_region(&mut self, region: ::std::option::Option<crate::config::Region>) -> &mut Self {

        self.config.store_or_unset(region);

        self

    }

    /// Sets the credentials provider for this service

    pub fn credentials_provider(mut self, credentials_provider: impl ::aws_credential_types::provider::ProvideCredentials + 'static) -> Self {

        self.set_credentials_provider(::std::option::Option::Some(

            ::aws_credential_types::provider::SharedCredentialsProvider::new(credentials_provider),

        ));

    pub fn credentials_provider(mut self, credentials_provider: impl crate::config::ProvideCredentials + 'static) -> Self {

        self.set_credentials_provider(::std::option::Option::Some(crate::config::SharedCredentialsProvider::new(

            credentials_provider,

        )));

        self

    }

    /// Sets the credentials provider for this service

    pub fn set_credentials_provider(

        &mut self,

        credentials_provider: ::std::option::Option<::aws_credential_types::provider::SharedCredentialsProvider>,

    ) -> &mut Self {

        self.config.store_or_unset(credentials_provider);

    pub fn set_credentials_provider(&mut self, credentials_provider: ::std::option::Option<crate::config::SharedCredentialsProvider>) -> &mut Self {

        if let Some(credentials_provider) = credentials_provider {

            self.runtime_components

                .push_identity_resolver(::aws_runtime::auth::sigv4::SCHEME_ID, credentials_provider);

        }

        self

    }

    /// Adds a runtime plugin to the config.

    #[allow(unused)]

    pub(crate) fn runtime_plugin(mut self, plugin: impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin + 'static) -> Self {

        self.push_runtime_plugin(::aws_smithy_runtime_api::client::runtime_plugin::SharedRuntimePlugin::new(plugin));

    pub(crate) fn runtime_plugin(mut self, plugin: impl crate::config::RuntimePlugin + 'static) -> Self {

        self.push_runtime_plugin(crate::config::SharedRuntimePlugin::new(plugin));

        self

    }

    /// Adds a runtime plugin to the config.

    #[allow(unused)]

    pub(crate) fn push_runtime_plugin(&mut self, plugin: ::aws_smithy_runtime_api::client::runtime_plugin::SharedRuntimePlugin) -> &mut Self {

    pub(crate) fn push_runtime_plugin(&mut self, plugin: crate::config::SharedRuntimePlugin) -> &mut Self {

        self.runtime_plugins.push(plugin);

        self

    }
@@ -975,7 +967,7 @@ impl Builder { 
            ::aws_smithy_async::time::StaticTimeSource::new(::std::time::UNIX_EPOCH + ::std::time::Duration::from_secs(1234567890)),

        )));

        self.config.store_put(::aws_http::user_agent::AwsUserAgent::for_tests());

        self.set_credentials_provider(Some(::aws_credential_types::provider::SharedCredentialsProvider::new(

        self.set_credentials_provider(Some(crate::config::SharedCredentialsProvider::new(

            ::aws_credential_types::Credentials::for_tests(),

        )));

        self
@@ -1002,7 +994,7 @@ impl Builder { 
            .cloned()

            .map(|r| layer.store_put(::aws_types::region::SigningRegion::from(r)));

        Config {

            config: ::aws_smithy_types::config_bag::Layer::from(layer.clone())

            config: crate::config::Layer::from(layer.clone())

                .with_name("aws_sdk_accessanalyzer::config::Config")

                .freeze(),

            cloneable: layer,
@@ -1039,9 +1031,6 @@ impl ServiceRuntimePlugin { 
        runtime_components.push_auth_scheme(::aws_smithy_runtime_api::client::auth::SharedAuthScheme::new(

            ::aws_runtime::auth::sigv4::SigV4AuthScheme::new(),

        ));

        if let Some(creds_provider) = _service_config.credentials_provider() {

            runtime_components.push_identity_resolver(::aws_runtime::auth::sigv4::SCHEME_ID, creds_provider);

        }

        Self { config, runtime_components }

    }

}
@@ -1118,15 +1107,11 @@ impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for ConfigO 
}



pub use ::aws_smithy_runtime::client::identity::IdentityCache;

pub use ::aws_smithy_runtime_api::client::interceptors::Intercept;

pub use ::aws_smithy_runtime_api::client::interceptors::SharedInterceptor;

pub use ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;

pub use ::aws_smithy_types::config_bag::ConfigBag;



pub use ::aws_credential_types::Credentials;



pub use ::aws_types::region::Region;



impl From<&::aws_types::sdk_config::SdkConfig> for Builder {

    fn from(input: &::aws_types::sdk_config::SdkConfig) -> Self {

        let mut builder = Builder::default();
@@ -1160,7 +1145,7 @@ impl From<&::aws_types::sdk_config::SdkConfig> for Config { 


pub use ::aws_types::app_name::AppName;



pub use ::aws_smithy_async::rt::sleep::{AsyncSleep, SharedAsyncSleep, Sleep};

pub use ::aws_smithy_async::rt::sleep::Sleep;



pub(crate) fn base_client_runtime_plugins(mut config: crate::Config) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {

    let mut configured_plugins = ::std::vec::Vec::new();
@@ -1186,6 +1171,40 @@ pub(crate) fn base_client_runtime_plugins(mut config: crate::Config) -> ::aws_sm 
    plugins

}



pub use ::aws_smithy_types::config_bag::FrozenLayer;



pub use ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder;



pub use ::aws_smithy_runtime_api::client::runtime_plugin::SharedRuntimePlugin;



pub use ::aws_smithy_runtime_api::client::http::SharedHttpClient;



pub use ::aws_smithy_async::rt::sleep::SharedAsyncSleep;



pub use ::aws_smithy_runtime_api::client::identity::SharedIdentityCache;



pub use ::aws_smithy_runtime_api::client::interceptors::SharedInterceptor;



pub use ::aws_types::region::Region;



pub use ::aws_credential_types::provider::SharedCredentialsProvider;



pub use ::aws_smithy_runtime_api::client::http::HttpClient;



pub use ::aws_smithy_runtime_api::shared::IntoShared;



pub use ::aws_smithy_async::rt::sleep::AsyncSleep;



pub use ::aws_smithy_runtime_api::client::identity::ResolveCachedIdentity;



pub use ::aws_smithy_runtime_api::client::interceptors::Intercept;



pub use ::aws_credential_types::provider::ProvideCredentials;



pub use ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin;



pub use ::aws_smithy_types::config_bag::Layer;



/// Types needed to configure endpoint resolution.

pub mod endpoint;

sdk/accessanalyzer/src/error.rs

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ pub use ::aws_smithy_runtime_api::box_error::BoxError; 


/// Error type returned by the client.

pub type SdkError<E, R = ::aws_smithy_runtime_api::client::orchestrator::HttpResponse> = ::aws_smithy_runtime_api::client::result::SdkError<E, R>;

pub use ::aws_smithy_runtime_api::client::result::ConnectorError;

pub use ::aws_smithy_types::error::operation::BuildError;



pub use ::aws_smithy_types::error::display::DisplayErrorContext;

pub use ::aws_smithy_types::error::metadata::ProvideErrorMetadata;

sdk/accessanalyzer/src/error_meta.rs

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ impl ::std::fmt::Display for Error { 
        }

    }

}

impl From<::aws_smithy_types::error::operation::BuildError> for Error {

    fn from(value: ::aws_smithy_types::error::operation::BuildError) -> Self {

        Error::Unhandled(::aws_smithy_types::error::Unhandled::builder().source(value).build())

    }

}

impl<R> From<::aws_smithy_runtime_api::client::result::SdkError<crate::operation::apply_archive_rule::ApplyArchiveRuleError, R>> for Error

where

    R: Send + Sync + std::fmt::Debug + 'static,

sdk/account/src/config.rs

+85 −66

File changed.

Preview size limit exceeded, changes collapsed.

sdk/account/src/error.rs

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ pub use ::aws_smithy_runtime_api::box_error::BoxError; 


/// Error type returned by the client.

pub type SdkError<E, R = ::aws_smithy_runtime_api::client::orchestrator::HttpResponse> = ::aws_smithy_runtime_api::client::result::SdkError<E, R>;

pub use ::aws_smithy_runtime_api::client::result::ConnectorError;

pub use ::aws_smithy_types::error::operation::BuildError;



pub use ::aws_smithy_types::error::display::DisplayErrorContext;

pub use ::aws_smithy_types::error::metadata::ProvideErrorMetadata;