RFC30 update

Author: thomas-k-cameron

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

@@ -15,6 +15,7 @@ import software.amazon.smithy.rust.codegen.client.smithy.customize.ClientCodegen
 import software.amazon.smithy.rust.codegen.client.smithy.customize.CombinedClientCodegenDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.customize.NoOpEventStreamSigningDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.customize.RequiredCustomizations
+import software.amazon.smithy.rust.codegen.client.smithy.customize.SerdeDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.endpoint.EndpointsDecorator
 import software.amazon.smithy.rust.codegen.client.smithy.generators.client.FluentClientDecorator
 import software.amazon.smithy.rust.codegen.client.testutil.ClientDecoratableBuildPlugin
@@ -54,6 +55,7 @@ class RustClientCodegenPlugin : ClientDecoratableBuildPlugin() {
         val codegenDecorator =
             CombinedClientCodegenDecorator.fromClasspath(
                 context,
+                SerdeDecorator(),
                 ClientCustomizations(),
                 RequiredCustomizations(),
                 FluentClientDecorator(),

codegen-client/src/main/kotlin/software/amazon/smithy/rust/codegen/client/smithy/customize/SerdeDecorator.kt

@@ -0,0 +1,28 @@
+/*
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+
+package software.amazon.smithy.rust.codegen.client.smithy.customize
+
+import software.amazon.smithy.rust.codegen.client.smithy.ClientCodegenContext
+import software.amazon.smithy.rust.codegen.core.rustlang.Feature
+import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
+
+/**
+ * This class,
+ * - Adds serde as a dependency
+ *
+ */
+class SerdeDecorator : ClientCodegenDecorator {
+    override val name: String = "SerdeDecorator"
+    override val order: Byte = -1
+
+    override fun extras(codegenContext: ClientCodegenContext, rustCrate: RustCrate) {
+        fun _feature(feature_name: String, crate_name: String): Feature {
+            return Feature(feature_name, false, listOf(crate_name + "/" + feature_name))
+        }
+        rustCrate.mergeFeature(_feature("serde-serialize", "aws-smithy-types"))
+        rustCrate.mergeFeature(_feature("serde-deserialize", "aws-smithy-types"))
+    }
+}

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

@@ -21,6 +21,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.generators.EnumGenerator
 import software.amazon.smithy.rust.codegen.core.smithy.generators.EnumGeneratorContext
 import software.amazon.smithy.rust.codegen.core.smithy.generators.EnumMemberModel
 import software.amazon.smithy.rust.codegen.core.smithy.generators.EnumType
+import software.amazon.smithy.rust.codegen.core.smithy.generators.RenderSerdeAttribute
 import software.amazon.smithy.rust.codegen.core.util.dq
 
 /** Infallible enums have an `Unknown` variant and can't fail to parse */
@@ -97,6 +98,8 @@ data class InfallibleEnumType(
                 part of the enums that are public interface.
                 """.trimIndent(),
             )
+
+            RenderSerdeAttribute.writeAttributes(this)
             context.enumMeta.render(this)
             rust("struct $UnknownVariantValue(pub(crate) String);")
             rustBlock("impl $UnknownVariantValue") {

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

@@ -262,6 +262,8 @@ class FluentClientGenerator(
         ) {
             val outputType = symbolProvider.toSymbol(operation.outputShape(model))
             val errorType = symbolProvider.symbolForOperationError(operation)
+            val inputBuilderType = symbolProvider.symbolForBuilder(input)
+            val fnName = clientOperationFnName(operation, symbolProvider)
 
             // Have to use fully-qualified result here or else it could conflict with an op named Result
             rustTemplate(
@@ -301,6 +303,7 @@ class FluentClientGenerator(
                         .map_err(#{SdkError}::construction_failure)?;
                     self.handle.client.call(op).await
                 }
+
                 """,
                 "CustomizableOperation" to ClientRustModule.Client.customize.toType()
                     .resolve("CustomizableOperation"),
@@ -317,6 +320,42 @@ class FluentClientGenerator(
                 ),
             )
             if (codegenContext.settings.codegenConfig.enableNewSmithyRuntime) {
+                // this fixes this error
+                //  error[E0592]: duplicate definitions with name `set_fields`
+                //     --> sdk/connectcases/src/operation/update_case/builders.rs:115:5
+                //      |
+                //  78  | /     pub fn set_fields(
+                //  79  | |         mut self,
+                //  80  | |         data: crate::operation::update_case::builders::UpdateCaseInputBuilder,
+                //  81  | |     ) -> Self {
+                //      | |_____________- other definition for `set_fields`
+                //  ...
+                //  115 | /     pub fn set_fields(
+                //  116 | |         mut self,
+                //  117 | |         input: std::option::Option<std::vec::Vec<crate::types::FieldValue>>,
+                //  118 | |     ) -> Self {
+                //      | |_____________^ duplicate definitions for `set_fields`
+                if (inputBuilderType.toString().endsWith("Builder")) {
+                    rustTemplate(
+                        """
+                    ##[#{AwsSdkUnstableAttribute}]
+                    /// This function replaces the parameter with new one.
+                    /// It is useful when you want to replace the existing data with de-serialized data.
+                    /// ```compile_fail
+                    /// let result_future = async {
+                    ///     let deserialized_parameters: $inputBuilderType  = serde_json::from_str(&json_string).unwrap();
+                    ///     client.$fnName().set_fields(&deserialized_parameters).send().await
+                    /// };
+                    /// ```
+                    pub fn set_fields(mut self, data: $inputBuilderType) -> Self {
+                        self.inner = data;
+                        self
+                    }
+                    """,
+                        "AwsSdkUnstableAttribute" to Attribute.AwsSdkUnstableAttribute.inner,
+                    )
+                }
+
                 rustTemplate(
                     """
                     // TODO(enableNewSmithyRuntime): Replace `send` with `send_v2`

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGenerator.kt

@@ -23,7 +23,6 @@ import software.amazon.smithy.rust.codegen.core.rustlang.documentShape
 import software.amazon.smithy.rust.codegen.core.rustlang.render
 import software.amazon.smithy.rust.codegen.core.rustlang.rust
 import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock
-import software.amazon.smithy.rust.codegen.core.rustlang.rustInline
 import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
 import software.amazon.smithy.rust.codegen.core.rustlang.stripOuter
 import software.amazon.smithy.rust.codegen.core.rustlang.withBlock