chore: remove filterSensitiveLog for service exceptions (#488)

smithy-lang · Jan 11, 2022 · e83e9b3 · e83e9b3
1 parent 000909d
commit e83e9b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java b/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java
@@ -168,10 +168,6 @@ private void renderNonErrorStructure() {
      *   $fault: "client";
      *   resourceType: string | undefined;
      * }
-     *
-     * export namespace NoSuchResource {
-     *   export const filterSensitiveLog = (obj: NoSuchResource): any => ({...obj});
-     * }
      * }</pre>
      */
     private void renderErrorStructure() {
@@ -197,7 +193,6 @@ private void renderErrorStructure() {
         structuredMemberWriter.writeMembers(writer, shape);
         writer.closeBlock("}"); // interface
         writer.write("");
-        renderStructureNamespace(structuredMemberWriter, false);
     }
 
     private void renderStructureNamespace(StructuredMemberWriter structuredMemberWriter, boolean includeValidation) {

diff --git a/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java b/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java
@@ -34,6 +34,7 @@
 import software.amazon.smithy.model.shapes.StringShape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.EnumTrait;
+import software.amazon.smithy.model.traits.ErrorTrait;
 import software.amazon.smithy.model.traits.IdempotencyTokenTrait;
 import software.amazon.smithy.model.traits.LengthTrait;
 import software.amazon.smithy.model.traits.MediaTypeTrait;
@@ -163,6 +164,9 @@ private void writeStructureFilterSensitiveLog(
         } else if (structureTarget.hasTrait(StreamingTrait.class) && structureTarget.isUnionShape()) {
             // disable logging for StreamingTrait
             writer.write("'STREAMING_CONTENT'");
+        } else if (structureTarget.hasTrait(ErrorTrait.class)) {
+            // Sensitive logs are not filtered from errors.
+            writer.write("$L", structureParam);
         } else {
             // Call filterSensitiveLog on Structure.
             writer.write("$T.filterSensitiveLog($L)", symbolProvider.toSymbol(structureTarget), structureParam);

diff --git a/...degen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java b/...degen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java
@@ -481,7 +481,6 @@ private void testErrorStructureCodegen(String file, String expectedType) {
         String contents = testStructureCodegen(file, expectedType);
 
         assertThat(contents, containsString("as __SmithyException"));
-        assertThat(contents, containsString("namespace Err {"));
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up @@
             String contents = testStructureCodegen(file, expectedType);
             assertThat(contents, containsString("as __SmithyException"));
-            assertThat(contents, containsString("namespace Err {"));
         }
         @Test
@@ Expand Down @@