Merge branch 'main' into aws-smithy-mocks/avoid-experimental-stmt_expr_attributes

Author: landonxjames

.gitignore

@@ -61,8 +61,6 @@ target/
 # python
 __pycache__
 
-
-# AI ccontext
+# AI context dirs
 .kiro/
-# Convenient naming convention I have been using to manage context between different workflows
 .kiro-*/

AGENTS.md

@@ -137,6 +137,19 @@ val mimeType = RuntimeType.forInlineFun("APPLICATION_JSON", module) {
 
 ⚠️ **Footgun**: Name collisions mean only one implementation gets generated.
 
+## Git Workflow
+
+**Committing with pre-commit hooks:**
+
+This repo uses pre-commit hooks (formatting, linting, `runtime-versioner`). Some hooks modify files (e.g., reformatting). When a hook modifies files, the commit will fail. To fix:
+
+```bash
+git add -u
+git commit -m "your message"
+```
+
+The `git add -u` stages the hook's modifications, and the second commit attempt will pass. Do **not** use `--no-verify` to skip hooks.
+
 ## GitHub CLI Integration
 
 **View issues and PRs:**

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

@@ -13,13 +13,16 @@ import software.amazon.smithy.model.shapes.MemberShape
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.ShapeId
+import software.amazon.smithy.model.shapes.StructureShape
 import software.amazon.smithy.model.shapes.ToShapeId
 import software.amazon.smithy.model.traits.HttpQueryTrait
 import software.amazon.smithy.model.traits.HttpTrait
 import software.amazon.smithy.model.transform.ModelTransformer
 import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
 import software.amazon.smithy.rust.codegen.client.smithy.ClientRustSettings
 import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator
+import software.amazon.smithy.rust.codegen.client.smithy.generators.OperationCustomization
+import software.amazon.smithy.rust.codegen.client.smithy.generators.OperationSection
 import software.amazon.smithy.rust.codegen.client.smithy.generators.client.CustomizableOperationSection
 import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientCustomization
 import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientSection
@@ -41,6 +44,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
 import software.amazon.smithy.rust.codegen.core.smithy.contextName
 import software.amazon.smithy.rust.codegen.core.smithy.customize.AdHocCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.customize.adhocCustomization
+import software.amazon.smithy.rust.codegen.core.smithy.generators.SchemaGenerator
 import software.amazon.smithy.rust.codegen.core.util.cloneOperation
 import software.amazon.smithy.rust.codegen.core.util.expectTrait
 import software.amazon.smithy.rust.codegen.core.util.thenSingletonListOf
@@ -141,6 +145,24 @@ class AwsPresigningDecorator internal constructor(
         TopDownIndex.of(ctx.model).getContainedOperations(ctx.serviceShape)
             .any { presignableOperations.containsKey(it.id) }
 
+    override fun operationCustomizations(
+        codegenContext: ClientCodegenContext,
+        operation: OperationShape,
+        baseCustomizations: List<OperationCustomization>,
+    ): List<OperationCustomization> {
+        val presignableOp = presignableOperations[operation.id]
+        return if (presignableOp != null && presignableOp.hasModelTransforms()) {
+            val transformedOp =
+                codegenContext.model.expectShape(
+                    syntheticShapeId(operation.id),
+                    OperationShape::class.java,
+                )
+            baseCustomizations + PresignedSchemaCustomization(codegenContext, transformedOp)
+        } else {
+            baseCustomizations
+        }
+    }
+
     override fun extraSections(codegenContext: ClientCodegenContext): List<AdHocCustomization> =
         anyPresignedShapes(codegenContext).thenSingletonListOf {
             adhocCustomization<CustomizableOperationSection.CustomizableOperationImpl> {
@@ -390,6 +412,43 @@ class AwsPresignedFluentBuilderMethod(
         }
 }
 
+/**
+ * Generates a `PRESIGNED_INPUT_SCHEMA` constant for operations with presigning model transforms.
+ */
+private class PresignedSchemaCustomization(
+    private val codegenContext: ClientCodegenContext,
+    private val transformedOperationShape: OperationShape,
+) : OperationCustomization() {
+    override fun section(section: OperationSection): Writable =
+        writable {
+            when (section) {
+                is OperationSection.AdditionalItems -> {
+                    val transformedInputShape =
+                        codegenContext.model.expectShape(
+                            transformedOperationShape.inputShape,
+                            StructureShape::class.java,
+                        )
+                    SchemaGenerator(
+                        codegenContext,
+                        this,
+                        transformedInputShape,
+                        schemaPrefix = "PRESIGNED",
+                    ).renderSchemaOnly()
+                }
+                is OperationSection.OperationImplBlock -> {
+                    rustTemplate(
+                        """
+                        /// The schema for this operation's presigned input shape.
+                        pub const PRESIGNED_INPUT_SCHEMA: &'static #{Schema} = &PRESIGNED_SCHEMA;
+                        """,
+                        "Schema" to RuntimeType.smithySchema(codegenContext.runtimeConfig).resolve("Schema"),
+                    )
+                }
+                else -> {}
+            }
+        }
+}
+
 interface PresignModelTransform {
     fun transform(model: Model): Model
 }

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

@@ -6,6 +6,7 @@
 package software.amazon.smithy.rustsdk
 
 import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
+import software.amazon.smithy.rust.codegen.core.rustlang.InlineDependency
 import software.amazon.smithy.rust.codegen.core.rustlang.Visibility
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeCrateLocation
@@ -50,6 +51,7 @@ object AwsRuntimeType {
                 visibility = Visibility.PUBCRATE,
                 AwsCargoDependency.awsSigv4(runtimeConfig),
                 CargoDependency.smithyRuntimeApiClient(runtimeConfig),
+                InlineDependency.serializationSettings(runtimeConfig),
             ),
         )
 

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

@@ -25,8 +25,10 @@ import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType.Companion.pre
 import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
 import software.amazon.smithy.rust.codegen.core.smithy.generators.BuilderCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.generators.BuilderSection
+import software.amazon.smithy.rust.codegen.core.smithy.generators.SchemaStructureCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.generators.StructureCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.generators.StructureSection
+import software.amazon.smithy.rust.codegen.core.smithy.generators.SyntheticSchemaMember
 import software.amazon.smithy.rust.codegen.core.smithy.generators.error.ErrorImplCustomization
 import software.amazon.smithy.rust.codegen.core.smithy.generators.error.ErrorImplSection
 import software.amazon.smithy.rust.codegen.core.smithy.isOptional
@@ -63,7 +65,25 @@ abstract class BaseRequestIdDecorator : ClientCodegenDecorator {
     override fun structureCustomizations(
         codegenContext: ClientCodegenContext,
         baseCustomizations: List<StructureCustomization>,
-    ): List<StructureCustomization> = baseCustomizations + listOf(RequestIdStructureCustomization(codegenContext))
+    ): List<StructureCustomization> {
+        // Replace SchemaStructureCustomization with one that includes the synthetic request ID member
+        val syntheticMember =
+            SyntheticSchemaMember(
+                fieldName = "_$fieldName",
+                schemaMemberName = fieldName,
+                shapeType = "String",
+                httpHeaderName = "x-amzn-requestid",
+            )
+        val updated =
+            baseCustomizations.map { c ->
+                if (c is SchemaStructureCustomization) {
+                    SchemaStructureCustomization(codegenContext, listOf(syntheticMember))
+                } else {
+                    c
+                }
+            }
+        return updated + listOf(RequestIdStructureCustomization(codegenContext))
+    }
 
     override fun builderCustomizations(
         codegenContext: ClientCodegenContext,

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

@@ -7,6 +7,7 @@ package software.amazon.smithy.rustsdk
 
 import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
 import software.amazon.smithy.rust.codegen.client.smithy.ClientRustModule
+import software.amazon.smithy.rust.codegen.client.smithy.customizations.SchemaSerdeAllowlist
 import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegenDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.generators.config.ConfigCustomization
 import software.amazon.smithy.rust.codegen.client.smithy.generators.config.ServiceConfig
@@ -110,6 +111,19 @@ class GenericSmithySdkConfigSettings : ClientCodegenDecorator {
                     ${section.serviceConfigBuilder}.set_time_source(${section.sdkConfig}.time_source());
                     ${section.serviceConfigBuilder}.set_behavior_version(${section.sdkConfig}.behavior_version());
                     ${section.serviceConfigBuilder}.set_auth_scheme_preference(${section.sdkConfig}.auth_scheme_preference().cloned());
+                    """,
+                )
+                if (SchemaSerdeAllowlist.usesSchemaSerdeExclusively(codegenContext)) {
+                    rust(
+                        """
+                        if let Some(protocol) = ${section.sdkConfig}.protocol() {
+                            ${section.serviceConfigBuilder}.set_protocol(Some(protocol.clone()));
+                        }
+                        """,
+                    )
+                }
+                rust(
+                    """
                     // setting `None` here removes the default
                     if let Some(config) = ${section.sdkConfig}.stalled_stream_protection() {
                         ${section.serviceConfigBuilder}.set_stalled_stream_protection(Some(config));

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

@@ -0,0 +1,172 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.rustsdk
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.rust.codegen.core.rustlang.CargoDependency
+import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
+import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
+import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
+import software.amazon.smithy.rust.codegen.core.testutil.integrationTest
+import software.amazon.smithy.rust.codegen.core.testutil.tokioTest
+
+/**
+ * Regression test for the schema-serde event-stream response deserializer
+ * populating `_request_id` from the `x-amzn-requestid` response header.
+ *
+ * restJson1 is on [SchemaSerdeAllowlist] (see
+ * `codegen-client/.../customizations/SchemaDecorator.kt`), so the generated
+ * client hits `deserializeStreamingEventStreamSchema` in
+ * [ResponseDeserializerGenerator] rather than the legacy streaming path.
+ *
+ * Before the fix (PR #4628), the schema-serde event-stream path skipped the
+ * `MutateOutput` customization emitted by [BaseRequestIdDecorator], so
+ * `output.request_id()` always returned `None` even when the service set
+ * `x-amzn-requestid`.
+ */
+class EventStreamRequestIdTest {
+    companion object {
+        // `$version` is escaped to avoid Kotlin interpolation in a raw-string.
+        private const val PREFIX = "\$version: \"2\""
+        val model =
+            """
+            $PREFIX
+            namespace test
+
+            use aws.api#service
+            use aws.auth#sigv4
+            use aws.protocols#restJson1
+            use smithy.rules#endpointRuleSet
+
+            @service(sdkId: "dontcare")
+            @restJson1
+            @sigv4(name: "dontcare")
+            @auth([sigv4])
+            @endpointRuleSet({
+                "version": "1.0",
+                "rules": [{ "type": "endpoint", "conditions": [], "endpoint": { "url": "https://example.com" } }],
+                "parameters": {
+                    "Region": { "required": false, "type": "String", "builtIn": "AWS::Region" },
+                }
+            })
+            service TestService {
+                version: "2023-01-01",
+                operations: [StreamOperation]
+            }
+
+            @http(uri: "/StreamOperation", method: "POST")
+            @optionalAuth
+            operation StreamOperation {
+                input: StreamInput,
+                output: StreamOutput,
+            }
+
+            @input
+            structure StreamInput {
+                @httpPayload
+                body: StreamBody,
+            }
+
+            @output
+            structure StreamOutput {
+                @httpPayload
+                events: TestStream,
+            }
+
+            @streaming
+            union TestStream {
+                hello: HelloEvent,
+            }
+
+            // Unused by this test but required to make the input valid — every
+            // `@streaming` union must appear in an operation input so the
+            // marshaller generator runs.
+            @streaming
+            union StreamBody {
+                ping: PingEvent,
+            }
+
+            structure HelloEvent {
+                @eventPayload
+                data: String,
+            }
+
+            structure PingEvent {}
+            """.asSmithyModel()
+    }
+
+    @Test
+    fun `request_id is populated on event stream responses`() {
+        awsSdkIntegrationTest(model) { context, rustCrate ->
+            rustCrate.integrationTest("event_stream_request_id") {
+                tokioTest("request_id_is_set_from_x_amzn_requestid_header") {
+                    val rc = context.runtimeConfig
+                    val moduleName = context.moduleUseName()
+                    rustTemplate(
+                        """
+                        use $moduleName::config::{Credentials, Region};
+                        use $moduleName::{Config, Client};
+                        // Re-exported by BaseRequestIdDecorator.extras.
+                        use $moduleName::operation::RequestId;
+
+                        // An empty event-stream body is a valid zero-frame stream.
+                        // The deserializer still constructs the output and sets
+                        // headers before wrapping the body in an EventReceiver.
+                        let http_client = #{StaticReplayClient}::new(vec![
+                            #{ReplayEvent}::new(
+                                #{HttpRequest1x}::builder()
+                                    .uri("https://example.com/StreamOperation")
+                                    .body(#{SdkBody}::empty())
+                                    .unwrap(),
+                                #{HttpResponse1x}::builder()
+                                    .status(200)
+                                    .header("x-amzn-requestid", "test-request-id-1234")
+                                    .header("content-type", "application/vnd.amazon.eventstream")
+                                    .body(#{SdkBody}::empty())
+                                    .unwrap(),
+                            ),
+                        ]);
+
+                        let config = Config::builder()
+                            .credentials_provider(Credentials::for_tests())
+                            .region(Region::new("us-east-1"))
+                            .http_client(http_client.clone())
+                            .build();
+                        let client = Client::from_conf(config);
+
+                        // We don't need to send any input events for this test —
+                        // the deserializer produces the output as soon as headers
+                        // arrive. We pass an empty stream for the `body` input.
+                        let input_stream = #{futures_util}::stream::empty();
+                        let output = client
+                            .stream_operation()
+                            .body(input_stream.into())
+                            .send()
+                            .await
+                            .expect("request should succeed");
+
+                        assert_eq!(
+                            Some("test-request-id-1234"),
+                            output.request_id(),
+                            "request_id should be populated from x-amzn-requestid header",
+                        );
+                        """,
+                        "HttpRequest1x" to RuntimeType.HttpRequest1x,
+                        "HttpResponse1x" to RuntimeType.HttpResponse1x,
+                        "ReplayEvent" to
+                            RuntimeType.smithyHttpClientTestUtil(rc)
+                                .resolve("test_util::ReplayEvent"),
+                        "SdkBody" to RuntimeType.sdkBody(rc),
+                        "StaticReplayClient" to
+                            RuntimeType.smithyHttpClientTestUtil(rc)
+                                .resolve("test_util::StaticReplayClient"),
+                        "futures_util" to CargoDependency.FuturesUtil.toType(),
+                    )
+                }
+            }
+        }
+    }
+}