Improve timeout config ergonomics and add SDK default timeouts

aws/rust-runtime/aws-config/src/default_provider/timeout_config.rs

@@ -4,7 +4,7 @@
  */
 
 use crate::provider_config::ProviderConfig;
-use aws_sdk_sso::config::TimeoutConfig;
+use aws_sdk_sso::config::timeout::TimeoutConfig;
 use std::time::Duration;
 
 const SDK_DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_millis(3100);

aws/rust-runtime/aws-config/src/imds/client.rs

@@ -40,7 +40,7 @@ use crate::imds::client::token::TokenMiddleware;
 use crate::profile::ProfileParseError;
 use crate::provider_config::ProviderConfig;
 use crate::{profile, PKG_VERSION};
-use aws_sdk_sso::config::TimeoutConfig;
+use aws_sdk_sso::config::timeout::TimeoutConfig;
 use aws_smithy_client::http_connector::HttpSettings;
 
 mod token;

aws/rust-runtime/aws-config/src/imds/client/token.rs

@@ -38,7 +38,7 @@ use http::{HeaderValue, Uri};
 
 use crate::cache::ExpiringCache;
 use crate::imds::client::{ImdsError, ImdsResponseRetryClassifier, TokenError};
-use aws_sdk_sso::config::TimeoutConfig;
+use aws_sdk_sso::config::timeout::TimeoutConfig;
 
 /// Token Refresh Buffer
 ///

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customizations/ResiliencyConfigCustomization.kt

@@ -74,7 +74,8 @@ class ResiliencyConfigCustomization(coreCodegenContext: CoreCodegenContext) : Co
                     ///
                     /// ## Examples
                     /// ```no_run
-                    /// use $moduleUseName::config::{Config, RetryConfig};
+                    /// use $moduleUseName::config::Config;
+                    /// use $moduleUseName::config::retry::RetryConfig;
                     ///
                     /// let retry_config = RetryConfig::standard().with_max_attempts(5);
                     /// let config = Config::builder().retry_config(retry_config).build();
@@ -88,7 +89,8 @@ class ResiliencyConfigCustomization(coreCodegenContext: CoreCodegenContext) : Co
                     ///
                     /// ## Examples
                     /// ```no_run
-                    /// use $moduleUseName::config::{Builder, Config, RetryConfig};
+                    /// use $moduleUseName::config::{Builder, Config};
+                    /// use $moduleUseName::config::retry::RetryConfig;
                     ///
                     /// fn disable_retries(builder: &mut Builder) {
                     ///     let retry_config = RetryConfig::standard().with_max_attempts(1);
@@ -164,7 +166,8 @@ class ResiliencyConfigCustomization(coreCodegenContext: CoreCodegenContext) : Co
                     ///
                     /// ```no_run
                     /// ## use std::time::Duration;
-                    /// use $moduleUseName::config::{Config, TimeoutConfig};
+                    /// use $moduleUseName::config::Config;
+                    /// use $moduleUseName::config::timeout::TimeoutConfig;
                     ///
                     /// let timeout_config = TimeoutConfig::builder()
                     ///     .operation_attempt_timeout(Duration::from_secs(1))
@@ -182,7 +185,8 @@ class ResiliencyConfigCustomization(coreCodegenContext: CoreCodegenContext) : Co
                     ///
                     /// ```no_run
                     /// ## use std::time::Duration;
-                    /// use $moduleUseName::config::{Builder, Config, TimeoutConfig};
+                    /// use $moduleUseName::config::{Builder, Config};
+                    /// use $moduleUseName::config::timeout::TimeoutConfig;
                     ///
                     /// fn set_request_timeout(builder: &mut Builder) {
                     ///     let timeout_config = TimeoutConfig::builder()
@@ -221,13 +225,14 @@ class ResiliencyReExportCustomization(private val runtimeConfig: RuntimeConfig)
             writer.rustTemplate(
                 """
                 pub use #{sleep}::{AsyncSleep, Sleep};
-                pub use #{types_retry}::{RetryConfig, RetryConfigBuilder};
-                /// Config structs required by [`RetryConfig`]
+                /// Retry configuration
                 pub mod retry {
-                    pub use #{types_retry}::RetryMode;
-                    pub use #{types_retry}::RetryKind;
+                    pub use #{types_retry}::{RetryConfig, RetryConfigBuilder, RetryMode};
+                }
+                /// Timeout configuration
+                pub mod timeout {
+                    pub use #{timeout}::{TimeoutConfig, TimeoutConfigBuilder};
                 }
-                pub use #{timeout}::{TimeoutConfig, TimeoutConfigBuilder};
                 """,
                 "types_retry" to smithyTypesRetry(runtimeConfig),
                 "sleep" to smithyAsyncRtSleep(runtimeConfig),

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/generators/client/CustomizableOperationGenerator.kt

@@ -30,13 +30,26 @@ class CustomizableOperationGenerator(
         const val CUSTOMIZE_MODULE = "crate::operation::customize"
     }
 
+    private val smithyHttp = CargoDependency.SmithyHttp(runtimeConfig).asType()
+    private val smithyTypes = CargoDependency.SmithyTypes(runtimeConfig).asType()
+
     fun render(crate: RustCrate) {
         crate.withModule(RustModule.Operation) { writer ->
             writer.docs("Operation customization and supporting types")
             writer.rust("pub mod customize;")
         }
 
         crate.withNonRootModule(CUSTOMIZE_MODULE) { writer ->
+            writer.rustTemplate(
+                """
+                pub use #{Operation};
+                pub use #{ClassifyRetry};
+                pub use #{RetryKind};
+                """,
+                "Operation" to smithyHttp.member("operation::Operation"),
+                "ClassifyRetry" to smithyHttp.member("retry::ClassifyRetry"),
+                "RetryKind" to smithyTypes.member("retry::RetryKind"),
+            )
             renderCustomizableOperationModule(writer)
 
             if (includeFluentClient) {
@@ -46,8 +59,6 @@ class CustomizableOperationGenerator(
     }
 
     private fun renderCustomizableOperationModule(writer: RustWriter) {
-        val smithyHttp = CargoDependency.SmithyHttp(runtimeConfig).asType()
-
         val operationGenerics = GenericsGenerator(GenericTypeArg("O"), GenericTypeArg("Retry"))
         val handleGenerics = generics.toGenericsGenerator()
         val combinedGenerics = operationGenerics + handleGenerics
@@ -56,7 +67,6 @@ class CustomizableOperationGenerator(
             // SDK Types
             "http_result" to smithyHttp.member("result"),
             "http_body" to smithyHttp.member("body"),
-            "http_operation" to smithyHttp.member("operation"),
             "HttpRequest" to CargoDependency.Http.asType().member("Request"),
             "handle_generics_decl" to handleGenerics.declaration(),
             "handle_generics_bounds" to handleGenerics.bounds(),
@@ -69,7 +79,6 @@ class CustomizableOperationGenerator(
             use crate::client::Handle;
 
             use #{http_body}::SdkBody;
-            use #{http_operation}::Operation;
             use #{http_result}::SdkError;
 
             use std::convert::Infallible;