Merge branch 'main' into crc-fast

Author: vcjana

.changelog/1769183956.md

@@ -0,0 +1,29 @@
+---
+applies_to:
+- client
+- aws-sdk-rust
+authors:
+- vcjana
+references:
+- smithy-rs#4454
+- smithy-rs#4467
+- aws-sdk-rust#1389
+breaking: true
+new_feature: true
+bug_fix: false
+---
+Enable retries by default for AWS SDK clients using `BehaviorVersion::v2026_01_12()` or later.
+
+Previously, retries were only enabled when constructing clients via `aws_config::load_from_env()`. Clients constructed directly using `Client::from_conf()` did not have retries enabled, which was inconsistent with AWS SDK behavior in other languages.
+
+This change affects AWS SDK clients constructed with `Client::from_conf()` when using `BehaviorVersion::v2026_01_12()` or `BehaviorVersion::latest()`. Generic Smithy clients (non-AWS) are not affected.
+
+To disable retries:
+```rust
+let config = aws_sdk_s3::Config::builder()
+    .retry_config(RetryConfig::disabled())
+    // ...
+    .build();
+```
+
+For more context, see the [discussion on retry behavior](https://github.com/smithy-lang/smithy-rs/discussions/4466).

.changelog/fix-jmespath-integer-literals.md

@@ -0,0 +1,13 @@
+---
+applies_to:
+- client
+- aws-sdk-rust
+authors:
+- vcjana
+references:
+- smithy-rs#4500
+breaking: false
+new_feature: false
+bug_fix: true
+---
+Fix JMESPath integer literal handling in waiters to support Smithy 1.66.0, which parses integer literals as `Long` instead of `Double`.

.changelog/http-1x.md

@@ -0,0 +1,18 @@
+---
+applies_to:
+  - aws-sdk-rust
+  - client
+  - server
+authors:
+  - landonxjames
+  - drganjoo
+references:
+  - smithy-rs#4484
+breaking: false
+new_feature: true
+bug_fix: false
+---
+
+All Smithy-rs crates, for both servers and clients, now use the 1.x version of
+the `http` crate for all internal processing. Utility methods are still provided
+for users to convert between SDK types and both of the `http` 0.x and 1.x types.

.github/workflows/ci.yml

@@ -397,7 +397,7 @@ jobs:
         - arch: x86_64
           runner: smithy_ubuntu-latest_8-core
         - arch: aarch64
-          runner: smithy_ubuntu-latest_8-core-arm
+          runner: ubuntu-24.04-arm
     steps:
     - uses: GitHubSecurityLab/actions-permissions/monitor@v1
     - uses: actions/checkout@v4

.github/workflows/manual-canary.yml

@@ -107,7 +107,7 @@ jobs:
         - arch: x86_64
           runner: smithy_ubuntu-latest_8-core
         - arch: aarch64
-          runner: smithy_ubuntu-latest_8-core-arm
+          runner: ubuntu-24.04-arm
     steps:
     - uses: GitHubSecurityLab/actions-permissions/monitor@v1
     - uses: actions/checkout@v4

.github/workflows/pull-request-bot.yml

@@ -118,15 +118,15 @@ jobs:
         ./gradlew -Paws.services=+sts,+sso,+ssooidc,+signin,+transcribestreaming,+dynamodb :aws:sdk:assemble
 
         # Copy the Server runtime crate(s) in
-        cp -r rust-runtime/aws-smithy-http-server rust-runtime/aws-smithy-http-server-python rust-runtime/aws-smithy-http-server-typescript aws/sdk/build/aws-sdk/sdk
+        cp -r rust-runtime/aws-smithy-http-server rust-runtime/aws-smithy-http-server-python rust-runtime/aws-smithy-http-server-typescript rust-runtime/aws-smithy-legacy-http-server aws/sdk/build/aws-sdk/sdk
 
         pushd aws/sdk/build/aws-sdk
 
         # Remove example crates from workspace
         sed -i '/examples/d' Cargo.toml
 
         # Add server runtime crates to the workspace
-        sed -i 's/"sdk\/sts",/"sdk\/sts","sdk\/aws-smithy-http-server","sdk\/aws-smithy-http-server-python","sdk\/aws-smithy-http-server-typescript",/' Cargo.toml
+        sed -i 's/"sdk\/sts",/"sdk\/sts","sdk\/aws-smithy-http-server","sdk\/aws-smithy-http-server-python","sdk\/aws-smithy-http-server-typescript","sdk\/aws-smithy-legacy-http-server",/' Cargo.toml
 
         RUSTDOCFLAGS="--cfg docsrs" cargo +${{ env.rust_nightly_version }} doc --all-features --no-deps
 

aws/SDK_CHANGELOG.next.json

@@ -109,4 +109,4 @@
     }
   ],
   "aws-sdk-model": []
-}
+}

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

@@ -28,7 +28,8 @@ class AwsChunkedContentEncodingDecorator : ClientCodegenDecorator {
     // This decorator must decorate after any of the following:
     // - HttpRequestChecksumDecorator
     // - HttpRequestCompressionDecorator
-    override val order: Byte = (minOf(HttpRequestChecksumDecorator.ORDER, HttpRequestCompressionDecorator.ORDER) - 1).toByte()
+    override val order: Byte =
+        (minOf(HttpRequestChecksumDecorator.ORDER, HttpRequestCompressionDecorator.ORDER) - 1).toByte()
 
     override fun operationCustomizations(
         codegenContext: ClientCodegenContext,
@@ -81,8 +82,8 @@ private fun RuntimeConfig.awsChunked() =
         InlineAwsDependency.forRustFile(
             "aws_chunked", visibility = Visibility.PUBCRATE,
             CargoDependency.Bytes,
-            CargoDependency.Http,
-            CargoDependency.HttpBody,
+            CargoDependency.Http1x,
+            CargoDependency.HttpBody1x,
             CargoDependency.Tracing,
             AwsCargoDependency.awsRuntime(this).withFeature("http-02x"),
             CargoDependency.smithyRuntimeApiClient(this),

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

@@ -170,8 +170,8 @@ class AwsPresigningDecorator internal constructor(
             rustCrate.mergeFeature(
                 Feature(
                     "http-1x",
-                    default = false,
-                    listOf("dep:http-body-1x", "aws-smithy-runtime-api/http-1x"),
+                    default = true,
+                    listOf("aws-smithy-runtime-api/http-1x"),
                 ),
             )
         }
@@ -204,6 +204,14 @@ class AwsPresignedFluentBuilderMethod(
             "SdkError" to RuntimeType.sdkError(runtimeConfig),
         )
 
+    // Presigning requires both http version features since it pub exposes into_http_02x_request
+    // and into_http_1x_request functions
+    private val smithyRuntimeApi =
+        CargoDependency.smithyRuntimeApiClient(codegenContext.runtimeConfig)
+            .withFeature("http-02x")
+            .withFeature("http-1x")
+            .toType()
+
     override fun section(section: FluentClientSection): Writable =
         writable {
             if (section is FluentClientSection.FluentBuilderImpl && section.operationShape.hasTrait(PresignableTrait::class.java)) {
@@ -219,7 +227,7 @@ class AwsPresignedFluentBuilderMethod(
                     *codegenScope,
                     "OpError" to section.operationErrorType,
                     "RawResponseType" to
-                        RuntimeType.smithyRuntimeApiClient(runtimeConfig)
+                        smithyRuntimeApi
                             .resolve("client::orchestrator::HttpResponse"),
                 ) {
                     renderPresignedMethodBody(section)
@@ -305,13 +313,13 @@ class AwsPresignedFluentBuilderMethod(
             "OperationError" to section.operationErrorType,
             "RuntimePlugins" to RuntimeType.runtimePlugins(runtimeConfig),
             "SharedInterceptor" to
-                RuntimeType.smithyRuntimeApiClient(runtimeConfig).resolve("client::interceptors")
+                smithyRuntimeApi.resolve("client::interceptors")
                     .resolve("SharedInterceptor"),
             "SigV4PresigningRuntimePlugin" to
                 AwsRuntimeType.presigningInterceptor(runtimeConfig)
                     .resolve("SigV4PresigningRuntimePlugin"),
             "StopPoint" to RuntimeType.smithyRuntime(runtimeConfig).resolve("client::orchestrator::StopPoint"),
-            "USER_AGENT" to CargoDependency.Http.toType().resolve("header::USER_AGENT"),
+            "USER_AGENT" to CargoDependency.Http1x.toType().resolve("header::USER_AGENT"),
             "alternate_presigning_serializer" to
                 writable {
                     if (presignableOp.hasModelTransforms()) {
@@ -334,7 +342,7 @@ class AwsPresignedFluentBuilderMethod(
                             "Layer" to smithyTypes.resolve("config_bag::Layer"),
                             "RuntimePlugin" to RuntimeType.runtimePlugin(codegenContext.runtimeConfig),
                             "SharedRequestSerializer" to
-                                RuntimeType.smithyRuntimeApiClient(codegenContext.runtimeConfig)
+                                smithyRuntimeApi
                                     .resolve("client::ser_de::SharedRequestSerializer"),
                         )
                     }

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

@@ -36,6 +36,8 @@ object AwsRuntimeType {
         RuntimeType.forInlineDependency(
             InlineAwsDependency.forRustFile(
                 "presigning", visibility = Visibility.PUBLIC,
+                // Requires http_02x because of existing pub *_http_02x_request methods
+                CargoDependency.Http0x,
                 CargoDependency.Http1x,
                 CargoDependency.HttpBody1x,
             ),