Merge branch 'direct-minimal-versions' into s2n-tls-provider

aws/rust-runtime/aws-config/Cargo.toml

@@ -14,14 +14,15 @@ repository = "https://github.com/smithy-lang/smithy-rs"
 [features]
 behavior-version-latest = []
 credentials-process = ["tokio/process"]
-default = ["default-http-connector", "rt-tokio", "credentials-process", "sso"]
+default = ["default-https-client", "rt-tokio", "credentials-process", "sso"]
 rt-tokio = ["aws-smithy-async/rt-tokio", "aws-smithy-runtime/rt-tokio", "tokio/rt"]
 # NOTE: `client-hyper` and `rustls` were proxies for enabling the default HTTP client plugin of `aws-smithy-runtime`
 # there is no direct usage otherwise on hyper or rustls in this crate. These are superceded by the more appropriately
-# named `default-http-connector` feature and `client-hyper` and `rustls` are now synonyms for the same
-client-hyper = ["aws-smithy-runtime/default-http-connector"]
+# named `default-https-client` feature and `client-hyper` and `rustls` are now synonyms for the same
+# TODO(hyper1) - deprecate legacy `client-hyper` and `rustls` features when available in cargo: https://github.com/rust-lang/cargo/issues/7130
+client-hyper = ["aws-smithy-runtime/default-https-client"]
 rustls = ["client-hyper"]
-default-http-connector = ["aws-smithy-runtime/default-http-connector"]
+default-https-client = ["aws-smithy-runtime/default-https-client"]
 sso = ["dep:aws-sdk-sso", "dep:aws-sdk-ssooidc", "dep:ring", "dep:hex", "dep:zeroize", "aws-smithy-runtime-api/http-auth"]
 test-util = ["aws-runtime/test-util"]
 
@@ -64,7 +65,7 @@ proc-macro2 = { version = "1.0.92", optional = true }
 [dev-dependencies]
 aws-smithy-async = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-async", features = ["rt-tokio", "test-util"] }
 aws-smithy-runtime = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-runtime", features = ["client", "test-util"] }
-aws-smithy-http-client = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-http-client", features = ["hyper-1", "test-util"] }
+aws-smithy-http-client = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-http-client", features = ["default-client", "test-util"] }
 aws-smithy-runtime-api = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-runtime-api", features = ["test-util"] }
 futures-util = { version = "0.3.29", default-features = false }
 tracing-test = "0.2.4"

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

@@ -14,7 +14,7 @@ use crate::meta::credentials::CredentialsProviderChain;
 use crate::meta::region::ProvideRegion;
 use crate::provider_config::ProviderConfig;
 
-#[cfg(any(feature = "default-http-connector", feature = "rustls"))]
+#[cfg(any(feature = "default-https-client", feature = "rustls"))]
 /// Default Credentials Provider chain
 ///
 /// The region from the default region provider will be used
@@ -170,7 +170,7 @@ impl Builder {
     /// Creates a `DefaultCredentialsChain`
     ///
     /// ## Panics
-    /// This function will panic if no connector has been set or the `default-http-connector`
+    /// This function will panic if no connector has been set or the `default-https-client`
     /// feature has been disabled.
     pub async fn build(self) -> DefaultCredentialsChain {
         let region = match self.region_override {

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

@@ -984,7 +984,7 @@ pub(crate) mod test {
     #[cfg_attr(windows, ignore)]
     /// Verify that the end-to-end real client has a 1-second connect timeout
     #[tokio::test]
-    #[cfg(feature = "default-http-connector")]
+    #[cfg(feature = "default-https-client")]
     async fn one_second_connect_timeout() {
         use crate::imds::client::ImdsError;
         use aws_smithy_types::error::display::DisplayErrorContext;

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

@@ -418,7 +418,7 @@ mod test {
     }
 
     #[tokio::test]
-    #[cfg(feature = "default-http-connector")]
+    #[cfg(feature = "default-https-client")]
     async fn read_timeout_during_credentials_refresh_should_yield_last_retrieved_credentials() {
         let client = crate::imds::Client::builder()
             // 240.* can never be resolved
@@ -436,7 +436,7 @@ mod test {
     }
 
     #[tokio::test]
-    #[cfg(feature = "default-http-connector")]
+    #[cfg(feature = "default-https-client")]
     async fn read_timeout_during_credentials_refresh_should_error_without_last_retrieved_credentials(
     ) {
         let client = crate::imds::Client::builder()
@@ -458,7 +458,7 @@ mod test {
     // TODO(https://github.com/awslabs/aws-sdk-rust/issues/1117) This test is ignored on Windows because it uses Unix-style paths
     #[cfg_attr(windows, ignore)]
     #[tokio::test]
-    #[cfg(feature = "default-http-connector")]
+    #[cfg(feature = "default-https-client")]
     async fn external_timeout_during_credentials_refresh_should_yield_last_retrieved_credentials() {
         use aws_smithy_async::rt::sleep::AsyncSleep;
         let client = crate::imds::Client::builder()

aws/rust-runtime/aws-config/src/lib.rs

@@ -891,6 +891,7 @@ mod loader {
 
             let identity_cache = match self.identity_cache {
                 None => match self.behavior_version {
+                    #[allow(deprecated)]
                     Some(bv) if bv.is_at_least(BehaviorVersion::v2024_03_28()) => {
                         Some(IdentityCache::lazy().build())
                     }
@@ -1135,7 +1136,7 @@ mod loader {
             assert_eq!(Some(&app_name), conf.app_name());
         }
 
-        #[cfg(feature = "default-http-connector")]
+        #[cfg(feature = "default-https-client")]
         #[tokio::test]
         async fn disable_default_credentials() {
             let config = defaults(BehaviorVersion::latest())
@@ -1145,15 +1146,15 @@ mod loader {
             assert!(config.credentials_provider().is_none());
         }
 
-        #[cfg(feature = "default-http-connector")]
+        #[cfg(feature = "default-https-client")]
         #[tokio::test]
         async fn identity_cache_defaulted() {
             let config = defaults(BehaviorVersion::latest()).load().await;
 
             assert!(config.identity_cache().is_some());
         }
 
-        #[cfg(feature = "default-http-connector")]
+        #[cfg(feature = "default-https-client")]
         #[allow(deprecated)]
         #[tokio::test]
         async fn identity_cache_old_behavior_version() {

aws/rust-runtime/aws-config/src/meta/credentials/chain.rs

@@ -73,7 +73,7 @@ impl CredentialsProviderChain {
     }
 
     /// Add a fallback to the default provider chain
-    #[cfg(any(feature = "default-http-connector", feature = "rustls"))]
+    #[cfg(any(feature = "default-https-client", feature = "rustls"))]
     pub async fn or_default_provider(self) -> Self {
         self.or_else(
             "DefaultProviderChain",
@@ -82,7 +82,7 @@ impl CredentialsProviderChain {
     }
 
     /// Creates a credential provider chain that starts with the default provider
-    #[cfg(any(feature = "default-http-connector", feature = "rustls"))]
+    #[cfg(any(feature = "default-https-client", feature = "rustls"))]
     pub async fn default_provider() -> Self {
         Self::first_try(
             "DefaultProviderChain",

aws/rust-runtime/aws-config/src/profile/credentials.rs

@@ -91,7 +91,7 @@ pub(crate) mod repr;
 ///         future::ProvideCredentials::new(self.load_credentials())
 ///     }
 /// }
-/// # if cfg!(feature = "default-http-connector") {
+/// # if cfg!(feature = "default-https-client") {
 /// let provider = ProfileFileCredentialsProvider::builder()
 ///     .with_custom_provider("Custom", MyCustomProvider)
 ///     .build();

aws/rust-runtime/aws-config/src/provider_config.rs

@@ -128,7 +128,7 @@ impl ProviderConfig {
     ///
     /// # Examples
     /// ```no_run
-    /// # #[cfg(feature = "default-http-connector")]
+    /// # #[cfg(feature = "default-https-client")]
     /// # fn example() {
     /// use aws_config::provider_config::ProviderConfig;
     /// use aws_sdk_sts::config::Region;

aws/rust-runtime/aws-config/src/test_case.rs

@@ -318,7 +318,7 @@ where
     O: for<'a> Deserialize<'a> + Secrets + PartialEq + Debug,
     E: Error,
 {
-    #[cfg(feature = "default-http-connector")]
+    #[cfg(feature = "default-https-client")]
     #[allow(unused)]
     /// Record a test case from live (remote) HTTPS traffic
     ///

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/AwsFluentClientDecorator.kt

@@ -67,7 +67,13 @@ class AwsFluentClientDecorator : ClientCodegenDecorator {
         rustCrate.withModule(ClientRustModule.client) {
             AwsFluentClientExtensions(codegenContext, types).render(this)
         }
-        rustCrate.mergeFeature(Feature("rustls", default = true, listOf("aws-smithy-runtime/default-http-connector")))
+
+        // TODO(hyper1): disable rustls as a default feature in future release
+        // NOTE: We enable both rustls and default-https-client as default features. This keeps the legacy hyper+rustls
+        // stack working as is and lets BehaviorVersion control which client you get. In a future release we will
+        // break this and disable the rustls feature by default (and break old BMV versions w.r.t http client default).
+        rustCrate.mergeFeature(Feature("rustls", default = true, listOf("aws-smithy-runtime/tls-rustls")))
+        rustCrate.mergeFeature(Feature("default-https-client", default = true, listOf("aws-smithy-runtime/default-https-client")))
     }
 
     override fun libRsCustomizations(

aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/HttpChecksumTest.kt

@@ -167,6 +167,15 @@ internal class HttpChecksumTest {
             // Note about the `//#{PresigningMarker}` below. The `RequestChecksumInterceptor` relies on the `PresigningMarker` type from
             // the presigning inlineable. The decorator for that inlineable doesn't play nicely with the test model from the SEP, so we
             // use this as a kind of blunt way to include the presigning inlineable without actually wiring it up with the model.
+            // We also have to ensure the `http-1x` feature the presigning inlineable expects is present on the generated crate.
+            rustCrate.mergeFeature(
+                Feature(
+                    "http-1x",
+                    default = false,
+                    listOf("dep:http-body-1x", "aws-smithy-runtime-api/http-1x"),
+                ),
+            )
+
             val testBase =
                 writable {
                     rustTemplate(
@@ -290,6 +299,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }
@@ -368,6 +378,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }
@@ -389,7 +400,7 @@ internal class HttpChecksumTest {
                 ##[::tokio::test]
                 async fn ${algoLower}_response_checksums_works() {
                     let (http_client, _rx) = #{capture_request}(Some(
-                        http::Response::builder()
+                        #{http_1x}::Response::builder()
                             .header("x-amz-checksum-$algoLower", "${testDef.checksumHeaderValue}")
                             .body(SdkBody::from("${testDef.responsePayload}"))
                             .unwrap(),
@@ -414,6 +425,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }
@@ -435,7 +447,7 @@ internal class HttpChecksumTest {
                 ##[::tokio::test]
                 async fn ${algoLower}_response_checksums_fail_correctly() {
                     let (http_client, _rx) = #{capture_request}(Some(
-                        http::Response::builder()
+                        #{http_1x}::Response::builder()
                             .header("x-amz-checksum-$algoLower", "${testDef.checksumHeaderValue}")
                             .body(SdkBody::from("${testDef.responsePayload}"))
                             .unwrap(),
@@ -476,6 +488,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }
@@ -537,6 +550,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }
@@ -613,7 +627,7 @@ internal class HttpChecksumTest {
                 ##[::tokio::test]
                 async fn response_config_ua_supported() {
                     let (http_client, rx) = #{capture_request}(Some(
-                        http::Response::builder()
+                        #{http_1x}::Response::builder()
                             .header("x-amz-checksum-crc32", "i9aeUg==")
                             .body(SdkBody::from("Hello world"))
                             .unwrap(),
@@ -645,7 +659,7 @@ internal class HttpChecksumTest {
                 ##[::tokio::test]
                 async fn response_config_ua_required() {
                     let (http_client, rx) = #{capture_request}(Some(
-                        http::Response::builder()
+                        #{http_1x}::Response::builder()
                             .header("x-amz-checksum-crc32", "i9aeUg==")
                             .body(SdkBody::from("Hello world"))
                             .unwrap(),
@@ -680,6 +694,7 @@ internal class HttpChecksumTest {
                 *preludeScope,
                 "tokio" to CargoDependency.Tokio.toType(),
                 "capture_request" to RuntimeType.captureRequest(rc),
+                "http_1x" to CargoDependency.Http1x.toType(),
             )
         }
     }

aws/sdk/integration-tests/no-default-features/tests/client-construction.rs

@@ -23,7 +23,7 @@ use std::time::Duration;
 // the connector being enabled transitively
 #[tokio::test]
 #[should_panic(
-    expected = "Enable the `default-http-connector` crate feature or configure an HTTP client to fix this."
+    expected = "Enable the `default-https-client` crate feature or configure an HTTP client to fix this."
 )]
 async fn test_clients_from_sdk_config() {
     aws_config::load_defaults(BehaviorVersion::latest()).await;
@@ -58,8 +58,8 @@ async fn test_clients_from_service_config() {
         .expect_err("it should fail to send a request because there is no HTTP client");
     let msg = format!("{}", DisplayErrorContext(err));
     assert!(
-        msg.contains("No HTTP client was available to send this request. Enable the `default-http-connector` crate feature or configure an HTTP client to fix this."),
-        "expected '{msg}' to contain 'No HTTP client was available to send this request. Enable the `default-http-connector` crate feature or set an HTTP client to fix this.'"
+        msg.contains("No HTTP client was available to send this request. Enable the `default-https-client` crate feature or configure an HTTP client to fix this."),
+        "expected '{msg}' to contain 'No HTTP client was available to send this request. Enable the `default-https-client` crate feature or set an HTTP client to fix this.'"
     );
 }
 

aws/sdk/integration-tests/s3/Cargo.toml

@@ -26,7 +26,7 @@ aws-smithy-protocol-test = { path = "../../build/aws-sdk/sdk/aws-smithy-protocol
 aws-smithy-runtime = { path = "../../build/aws-sdk/sdk/aws-smithy-runtime", features = ["test-util"] }
 aws-smithy-runtime-api = { path = "../../build/aws-sdk/sdk/aws-smithy-runtime-api", features = ["test-util", "http-1x"] }
 aws-smithy-types = { path = "../../build/aws-sdk/sdk/aws-smithy-types" }
-aws-smithy-http-client = { path = "../../build/aws-sdk/sdk/aws-smithy-http-client", features = ["hyper-1", "rustls-ring", "test-util", "wire-mock"] }
+aws-smithy-http-client = { path = "../../build/aws-sdk/sdk/aws-smithy-http-client", features = ["default-client", "rustls-ring", "test-util", "wire-mock"] }
 aws-types = { path = "../../build/aws-sdk/sdk/aws-types" }
 bytes = "1"
 bytes-utils = "0.1.2"

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

@@ -51,12 +51,12 @@ class FluentClientDecorator : ClientCodegenDecorator {
             customizations = listOf(GenericFluentClient(codegenContext)),
         ).render(rustCrate)
 
-        // For backwards compat reasons we have to leave this feature as `rustls` which really historically was
-        // used to enable the `default_http_client` plugin to work (as rustls feature meant enabling both connector-hyper-0-14 + rustls)
-        //
-        // When we moved to hyper-1.x as default we re-purposed this feature flag to still (1) enable a default HTTP
-        // client and (2) still mean rustls (albeit now with aws-lc instead of ring)
-        rustCrate.mergeFeature(Feature("rustls", default = true, listOf("aws-smithy-runtime/default-http-connector")))
+        // TODO(hyper1): disable rustls as a default feature in future release
+        // NOTE: We enable both rustls and default-https-client as default features. This keeps the legacy hyper+rustls
+        // stack working as is and lets BehaviorVersion control which client you get. In a future release we will
+        // break this and disable the rustls feature by default (and break old BMV versions w.r.t http client default).
+        rustCrate.mergeFeature(Feature("rustls", default = true, listOf("aws-smithy-runtime/tls-rustls")))
+        rustCrate.mergeFeature(Feature("default-https-client", default = true, listOf("aws-smithy-runtime/default-https-client")))
     }
 
     override fun libRsCustomizations(