Rebase with main

Author: Fahad Zubair

.changelog/1738663351.md

@@ -0,0 +1,11 @@
+---
+applies_to:
+- server
+authors:
+- drganjoo
+references: []
+breaking: false
+new_feature: true
+bug_fix: false
+---
+Allow invalid UTF-8 characters to be replaced with � 

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/protocols/parse/JsonParserGenerator.kt

@@ -101,7 +101,7 @@ class JsonParserGenerator(
         ReturnSymbolToParse(codegenContext.symbolProvider.toSymbol(shape), false)
     },
     private val customizations: List<JsonParserCustomization> = listOf(),
-    smithyJson: RuntimeType = RuntimeType.smithyJson(codegenContext.runtimeConfig),
+    smithyJsonWithFeatureFlag: RuntimeType = RuntimeType.smithyJson(codegenContext.runtimeConfig),
 ) : StructuredDataParserGenerator {
     private val model = codegenContext.model
     private val symbolProvider = codegenContext.symbolProvider
@@ -111,20 +111,20 @@ class JsonParserGenerator(
     private val builderInstantiator = codegenContext.builderInstantiator()
     private val codegenScope =
         arrayOf(
-            "Error" to smithyJson.resolve("deserialize::error::DeserializeError"),
-            "expect_blob_or_null" to smithyJson.resolve("deserialize::token::expect_blob_or_null"),
-            "expect_bool_or_null" to smithyJson.resolve("deserialize::token::expect_bool_or_null"),
-            "expect_document" to smithyJson.resolve("deserialize::token::expect_document"),
-            "expect_number_or_null" to smithyJson.resolve("deserialize::token::expect_number_or_null"),
-            "expect_start_array" to smithyJson.resolve("deserialize::token::expect_start_array"),
-            "expect_start_object" to smithyJson.resolve("deserialize::token::expect_start_object"),
-            "expect_string_or_null" to smithyJson.resolve("deserialize::token::expect_string_or_null"),
-            "expect_timestamp_or_null" to smithyJson.resolve("deserialize::token::expect_timestamp_or_null"),
-            "json_token_iter" to smithyJson.resolve("deserialize::json_token_iter"),
+            "Error" to smithyJsonWithFeatureFlag.resolve("deserialize::error::DeserializeError"),
+            "expect_blob_or_null" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_blob_or_null"),
+            "expect_bool_or_null" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_bool_or_null"),
+            "expect_document" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_document"),
+            "expect_number_or_null" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_number_or_null"),
+            "expect_start_array" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_start_array"),
+            "expect_start_object" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_start_object"),
+            "expect_string_or_null" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_string_or_null"),
+            "expect_timestamp_or_null" to smithyJsonWithFeatureFlag.resolve("deserialize::token::expect_timestamp_or_null"),
+            "json_token_iter" to smithyJsonWithFeatureFlag.resolve("deserialize::json_token_iter"),
             "Peekable" to RuntimeType.std.resolve("iter::Peekable"),
-            "skip_value" to smithyJson.resolve("deserialize::token::skip_value"),
-            "skip_to_end" to smithyJson.resolve("deserialize::token::skip_to_end"),
-            "Token" to smithyJson.resolve("deserialize::Token"),
+            "skip_value" to smithyJsonWithFeatureFlag.resolve("deserialize::token::skip_value"),
+            "skip_to_end" to smithyJsonWithFeatureFlag.resolve("deserialize::token::skip_to_end"),
+            "Token" to smithyJsonWithFeatureFlag.resolve("deserialize::Token"),
             "or_empty" to orEmptyJson(),
             *preludeScope,
         )

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/protocol/ServerProtocol.kt

@@ -145,7 +145,15 @@ fun jsonParserGenerator(
         listOf(
             ServerRequestBeforeBoxingDeserializedMemberConvertToMaybeConstrainedJsonParserCustomization(codegenContext),
         ) + additionalParserCustomizations,
-        smithyJson,
+        smithyJsonWithFeatureFlag =
+            if (codegenContext.settings.codegenConfig.replaceInvalidUtf8) {
+                CargoDependency.smithyJson(codegenContext.runtimeConfig)
+                    .copy(features = setOf("replace-invalid-utf8"))
+                    .toType()
+            } else {
+                RuntimeType.smithyJson(codegenContext.runtimeConfig)
+            },
+        ,
     )
 
 class ServerAwsJsonProtocol(

rust-runtime/aws-smithy-json/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-json"
-version = "0.61.2"
+version = "0.62.0"
 authors = [
     "AWS Rust SDK Team <[email protected]>",
     "John DiSanti <[email protected]>",