Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove filterSensitiveLog for service exceptions #488

Merged
merged 3 commits into from
Jan 11, 2022
Merged

chore: remove filterSensitiveLog for service exceptions #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5a8b67
chore: remove filterSensitiveLog for service exceptions
trivikr Jan 10, 2022
af5e1f9
chore: remove check for namespace in error structures
trivikr Jan 10, 2022
4e6ea27
chore: do not call filterSensitiveLog on exceptions
trivikr Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions ...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion ...degen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down