Remove getFieldValue.

Author: Fahad Zubair

codegen-core/common-test-models/nested-error.smithy

@@ -16,30 +16,30 @@ operation SampleOperation {
     input:= {}
     errors: [
         SimpleError,
-        ErrorWithCompositeShape,
+        ErrorInInput,
         ErrorWithDeepCompositeShape,
-        ComposedSensitiveError
+        ComposedSensitiveError,
     ]
 }
 
 @error("client")
-structure ErrorWithCompositeShape {
-    message: ErrorMessage
+structure SimpleError {
+    message: String
 }
 
 @error("client")
-structure SimpleError {
-    message: String
+structure ErrorInInput {
+    message: ErrorMessage
 }
 
 structure ErrorMessage {
     @required
-    statusCode: String
+    statusCode: Integer
     @required
     errorMessage: String
     requestId: String
     @required
-    toolName: String
+    isRetryable: Boolean
 }
 
 structure WrappedErrorMessage {

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

@@ -109,9 +109,20 @@ open class StructureGenerator(
         ) {
             writer.rustBlock("fn fmt(&self, f: &mut #1T::Formatter<'_>) -> #1T::Result", RuntimeType.stdFmt) {
                 rust("""let mut formatter = f.debug_struct(${name.dq()});""")
+
                 members.forEach { member ->
                     val memberName = symbolProvider.toMemberName(member)
-                    val fieldValue = getFieldValue(member, memberName)
+                    // If the struct is marked sensitive all fields get redacted, otherwise each field is determined on its own
+                    val fieldValue =
+                        if (shape.shouldRedact(model)) {
+                            REDACTION
+                        } else {
+                            member.redactIfNecessary(
+                                model,
+                                "self.$memberName",
+                            )
+                        }
+
                     rust(
                         "formatter.field(${memberName.dq()}, &$fieldValue);",
                     )
@@ -122,23 +133,6 @@ open class StructureGenerator(
         }
     }
 
-    // If the struct is marked sensitive all fields get redacted, otherwise each field is determined on its own.
-    private fun getFieldValue(
-        member: MemberShape,
-        memberName: String?,
-    ): String {
-        val fieldValue =
-            if (shape.shouldRedact(model)) {
-                REDACTION
-            } else {
-                member.redactIfNecessary(
-                    model,
-                    "self.$memberName",
-                )
-            }
-        return fieldValue
-    }
-
     private fun renderImplDisplayIfSyntheticImplDisplayTraitApplied() {
         if (shape.getTrait<SyntheticImplDisplayTrait>() == null) {
             return

codegen-core/src/test/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/error/NestedErrorStructureTest.kt

@@ -24,7 +24,7 @@ class NestedErrorStructureTest {
     private var sampleModel = File("../codegen-core/common-test-models/nested-error.smithy").readText().asSmithyModel()
     private val model = sampleModel.let(AddSyntheticTraitForImplDisplay::transform)
 
-    private val errorWithCompositeShape = model.lookup<StructureShape>("sample#ErrorWithCompositeShape")
+    private val errorInInput = model.lookup<StructureShape>("sample#ErrorInInput")
     private val simpleError = model.lookup<StructureShape>("sample#SimpleError")
     private val errorWithDeepCompositeShape = model.lookup<StructureShape>("sample#ErrorWithDeepCompositeShape")
     private val composedSensitiveError = model.lookup<StructureShape>("sample#ComposedSensitiveError")
@@ -35,7 +35,7 @@ class NestedErrorStructureTest {
 
     private val allStructures =
         arrayOf(
-            errorWithCompositeShape,
+            errorInInput,
             simpleError,
             errorWithDeepCompositeShape,
             composedSensitiveError,
@@ -46,7 +46,7 @@ class NestedErrorStructureTest {
         )
     private val errorShapes =
         arrayOf(
-            errorWithCompositeShape,
+            errorInInput,
             simpleError,
             errorWithDeepCompositeShape,
             errorWithNestedError,
@@ -95,27 +95,27 @@ class NestedErrorStructureTest {
                 rustTemplate(
                     """
                         let message = crate::test_model::ErrorMessage {
-                            status_code: "200".to_owned(),
+                            status_code: 333,
                             error_message: "this is an error".to_owned(),
                             request_id: None,
-                            tool_name : "vscode".to_owned()
+                            is_retryable: false,
                         };
                         let formatted = format!("{message}");
-                        assert_eq!(formatted, "ErrorMessage {status_code=200, error_message=this is an error, request_id=None, tool_name=vscode}");
+                        assert_eq!(formatted, "ErrorMessage {status_code=333, error_message=this is an error, request_id=None, is_retryable=false}");
                         """,
                 )
             }
             unitTest("optional_field_prints_value") {
                 rustTemplate(
                     """
                         let message = crate::test_model::ErrorMessage {
-                            status_code: "200".to_owned(),
+                            status_code: 419,
                             error_message: "this is an error".to_owned(),
                             request_id: Some("1234".to_owned()),
-                            tool_name : "vscode".to_owned()
+                            is_retryable : true,
                         };
                         let formatted = format!("{message}");
-                        assert_eq!(formatted, "ErrorMessage {status_code=200, error_message=this is an error, request_id=Some(1234), tool_name=vscode}");
+                        assert_eq!(formatted, "ErrorMessage {status_code=419, error_message=this is an error, request_id=Some(1234), is_retryable=true}");
                         """,
                 )
             }
@@ -142,21 +142,20 @@ class NestedErrorStructureTest {
                             message: Some(crate::test_model::WrappedErrorMessage {
                                 some_value: Some(123),
                                 contained: Some(crate::test_model::ErrorMessage {
-                                    status_code: "200".to_owned(),
+                                    status_code: 509,
                                     error_message: "this is an error".to_owned(),
                                     request_id: Some("1234".to_owned()),
-                                    tool_name: "vscode".to_owned(),
+                                    is_retryable: false,
                                 }),
                             }),
                         }),
                     };
                     let formatted = format!("{message}");
                     const EXPECTED: &str = "ErrorWithNestedError: ErrorWithDeepCompositeShape: \
                         WrappedErrorMessage {some_value=Some(123), \
-                        contained=Some(ErrorMessage {status_code=200, \
+                        contained=Some(ErrorMessage {status_code=509, \
                         error_message=this is an error, \
-                        request_id=Some(1234), \
-                        tool_name=vscode})}";
+                        request_id=Some(1234), is_retryable=false})}";
                     assert_eq!(formatted, EXPECTED);
                     """,
                 )

codegen-server/python/src/main/kotlin/software/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerEnumGenerator.kt

@@ -59,27 +59,20 @@ class PythonConstrainedEnum(
         }
 
     private fun pyEnumName(context: EnumGeneratorContext): Writable =
-        // Only named enums have a `name` property. Do not generate `fn name` for
-        // unnamed enums.
-        if (context.enumTrait.hasNames()) {
-            writable {
-                rustBlock(
-                    """
-                    ##[getter]
-                    pub fn name(&self) -> &str
-                    """,
-                ) {
-                    rustBlock("match self") {
-                        context.sortedMembers.forEach { member ->
-                            val memberName = member.name()?.name
-                            check(memberName != null) { "${context.enumTrait} cannot have null members" }
-                            rust("""${context.enumName}::$memberName => ${memberName?.dq()},""")
-                        }
+        writable {
+            rustBlock(
+                """
+                ##[getter]
+                pub fn name(&self) -> &str
+                """,
+            ) {
+                rustBlock("match self") {
+                    context.sortedMembers.forEach { member ->
+                        val memberName = member.name()?.name
+                        rust("""${context.enumName}::$memberName => ${memberName?.dq()},""")
                     }
                 }
             }
-        } else {
-            writable {}
         }
 }