Merge branch 'main' into update-all-lockfiles-1758665151

Author: aajtodd

.github/workflows/ci.yml

@@ -110,6 +110,8 @@ jobs:
           runner: ubuntu-latest
         - action: check-server-codegen-unit-tests-python
           runner: ubuntu-latest
+        - action: check-serde-codegen-unit-tests
+          runner: ubuntu-latest
         - action: check-server-e2e-test
           runner: ubuntu-latest
         - action: check-server-python-e2e-test

ci.mk

@@ -84,6 +84,10 @@ check-server-codegen-integration-tests:
 check-server-codegen-unit-tests:
 	$(CI_ACTION) $@ $(ARGS)
 
+.PHONY: check-serde-codegen-unit-tests
+check-serde-codegen-unit-tests:
+	$(CI_ACTION) $@ $(ARGS)
+
 .PHONY: check-server-codegen-integration-tests-python
 check-server-codegen-integration-tests-python:
 	$(CI_ACTION) $@ $(ARGS)

codegen-serde/src/main/kotlin/software/amazon/smithy/rust/codegen/serde/SerializeImplGenerator.kt

@@ -544,7 +544,7 @@ class SerializeImplGenerator(private val codegenContext: CodegenContext) {
     ) {
         rustTemplate(
             """
-            impl<'a> #{serde}::Serialize for #{ConfigurableSerdeRef}<'a, #{Shape}> {
+            impl #{serde}::Serialize for #{ConfigurableSerdeRef}<'_, #{Shape}> {
                 fn serialize<S>(&self, serializer: S) -> #{Result}<S::Ok, S::Error>
                 where
                     S: #{serde}::Serializer,
@@ -567,7 +567,7 @@ class SerializeImplGenerator(private val codegenContext: CodegenContext) {
         return writable {
             rustTemplate(
                 """
-                impl<'a, 'b> #{serde}::Serialize for #{ConfigurableSerdeRef}<'a, #{Shape}<'b>> {
+                impl #{serde}::Serialize for #{ConfigurableSerdeRef}<'_, #{Shape}<'_>> {
                     fn serialize<S>(&self, serializer: S) -> #{Result}<S::Ok, S::Error>
                     where
                         S: #{serde}::Serializer,

codegen-serde/src/main/kotlin/software/amazon/smithy/rust/codegen/serde/SupportStructures.kt

@@ -133,7 +133,7 @@ object SupportStructures {
                 """
                 pub(crate) struct Sensitive<T>(pub(crate) T);
 
-                impl<'a, T> #{serde}::Serialize for ConfigurableSerdeRef<'a, Sensitive<T>>
+                impl<T> #{serde}::Serialize for ConfigurableSerdeRef<'_, Sensitive<T>>
                 where
                 T: #{serde}::Serialize,
                 {
@@ -175,7 +175,7 @@ object SupportStructures {
                         .serialize(serializer)
                     }
                 }
-                impl<'a, T> #{serde}::Serialize for #{ConfigurableSerdeRef}<'a, Option<T>>
+                impl<T> #{serde}::Serialize for #{ConfigurableSerdeRef}<'_, Option<T>>
                 where
                     T: #{SerializeConfigured},
                 {
@@ -235,7 +235,7 @@ object SupportStructures {
                     ///
                     /// Note: This may alter the type of the serialized output and make it impossible to deserialize as
                     /// numerical fields will be replaced with strings.
-                    pub const fn redact_sensitive_fields() -> Self { Self { redact_sensitive_fields: true, out_of_range_floats_as_strings: false } }
+                    pub const fn redact_sensitive_fields() -> Self { Self { redact_sensitive_fields: true, out_of_range_floats_as_strings: true } }
 
                     /// Preserve the contents of sensitive fields during serializing
                     pub const fn leak_sensitive_fields() -> Self { Self { redact_sensitive_fields: false, out_of_range_floats_as_strings: false } }

codegen-serde/src/test/kotlin/software/amazon/smithy/rust/codegen/serde/SerdeDecoratorTest.kt

@@ -255,6 +255,7 @@ class SerdeDecoratorTest {
             IntegrationTestParams(cargoCommand = "cargo test --all-features", service = "com.example#MyService")
         serverIntegrationTest(model, params = params) { _, crate ->
             crate.integrationTest("test_serde") {
+                rust("##![allow(unexpected_cfgs)]")
                 unitTest("fails_if_serde_feature_exists", additionalAttributes = listOf(Attribute(cfg(feature("serde"))))) {
                     rust("assert!(false);")
                 }
@@ -347,6 +348,7 @@ class SerdeDecoratorTest {
                             .build()
                             .unwrap();
                         let mut settings = SerializationSettings::default();
+                        settings.out_of_range_floats_as_strings = true;
                         let serialized = #{serde_json}::to_string(&input.serialize_ref(&settings)).expect("failed to serialize");
                         assert_eq!(serialized, ${expectedNoRedactions.dq()});
                         settings.redact_sensitive_fields = true;

codegen-serde/src/test/kotlin/software/amazon/smithy/rust/codegen/serde/SerdeProtocolTestTest.kt

@@ -5,46 +5,21 @@
 
 package software.amazon.smithy.rust.codegen.serde
 
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.ValueSource
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.SourceLocation
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.model.transform.ModelTransformer
-import software.amazon.smithy.rust.codegen.client.testutil.clientIntegrationTest
-import software.amazon.smithy.rust.codegen.core.smithy.generators.protocol.ServiceShapeId
 import software.amazon.smithy.rust.codegen.core.testutil.IntegrationTestParams
 import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
 import software.amazon.smithy.rust.codegen.core.util.letIf
 import software.amazon.smithy.rust.codegen.server.smithy.testutil.serverIntegrationTest
 import java.io.File
-import java.util.stream.Stream
 
 class SerdeProtocolTestTest {
-    companion object {
-        @JvmStatic
-        fun testedModels(): Stream<Arguments> =
-            Stream.of(
-                Arguments.of(ShapeId.from(ServiceShapeId.REST_JSON)),
-                Arguments.of(ShapeId.from("com.amazonaws.constraints#ConstraintService")),
-            )
-    }
-
-    @Test
-    fun testRestJson() {
-        val serviceShapeId = ShapeId.from("com.amazonaws.constraints#ConstraintService")
-        val model = Model.assembler().discoverModels().assemble().result.get().attachSerdeToService(serviceShapeId)
-        clientIntegrationTest(
-            model,
-            IntegrationTestParams(service = serviceShapeId.toString(), cargoCommand = "cargo test --all-features"),
-        ) { clientCodegenContext, rustCrate ->
-        }
-    }
-
     private fun Model.attachSerdeToService(serviceShapeId: ShapeId): Model {
         val service =
             this.expectShape(serviceShapeId, ServiceShape::class.java).toBuilder().addTrait(

tools/ci-scripts/check-serde-codegen-unit-tests

@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -eux
+cd smithy-rs
+./gradlew codegen-serde:test