Skip to content

Commit d83f565

Browse files
committed
Create new function writeMemberFilterSensitiveLog
1 parent 7e62b08 commit d83f565

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,31 @@ void writeFilterSensitiveLog(TypeScriptWriter writer, String objectParam) {
7575
writer.write("...$L,", objectParam);
7676
for (MemberShape member : members) {
7777
if (isMemberOverwriteRequired(member, new HashSet<String>())) {
78-
Shape memberTarget = model.expectShape(member.getTarget());
7978
String memberName = getSanitizedMemberName(member);
80-
String memberParam = String.format("%s.%s", objectParam, memberName);
8179
writer.openBlock("...($1L.$2L && { $2L: ", "}),", objectParam, memberName, () -> {
82-
if (member.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
83-
// member is Sensitive, hide the value.
84-
writer.write("SENSITIVE_STRING");
85-
} else if (memberTarget.isStructureShape() || memberTarget.isUnionShape()) {
86-
writeStructureFilterSensitiveLog(writer, memberTarget, memberParam);
87-
} else if (memberTarget instanceof CollectionShape) {
88-
MemberShape collectionMember = ((CollectionShape) memberTarget).getMember();
89-
writeCollectionFilterSensitiveLog(writer, collectionMember, memberParam);
90-
} else if (memberTarget instanceof MapShape) {
91-
MemberShape mapMember = ((MapShape) memberTarget).getValue();
92-
writeMapFilterSensitiveLog(writer, mapMember, memberParam);
93-
}
80+
String memberParam = String.format("%s.%s", objectParam, memberName);
81+
writeMemberFilterSensitiveLog(writer, member, memberParam);
9482
});
9583
}
9684
}
9785
}
9886

87+
void writeMemberFilterSensitiveLog(TypeScriptWriter writer, MemberShape member, String memberParam) {
88+
Shape memberTarget = model.expectShape(member.getTarget());
89+
if (member.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
90+
// member is Sensitive, hide the value.
91+
writer.write("SENSITIVE_STRING");
92+
} else if (memberTarget.isStructureShape() || memberTarget.isUnionShape()) {
93+
writeStructureFilterSensitiveLog(writer, memberTarget, memberParam);
94+
} else if (memberTarget instanceof CollectionShape) {
95+
MemberShape collectionMember = ((CollectionShape) memberTarget).getMember();
96+
writeCollectionFilterSensitiveLog(writer, collectionMember, memberParam);
97+
} else if (memberTarget instanceof MapShape) {
98+
MemberShape mapMember = ((MapShape) memberTarget).getValue();
99+
writeMapFilterSensitiveLog(writer, mapMember, memberParam);
100+
}
101+
}
102+
99103
/**
100104
* Recursively writes filterSensitiveLog for StructureShape.
101105
*/

0 commit comments

Comments
 (0)