@@ -75,27 +75,31 @@ void writeFilterSensitiveLog(TypeScriptWriter writer, String objectParam) {
75
75
writer .write ("...$L," , objectParam );
76
76
for (MemberShape member : members ) {
77
77
if (isMemberOverwriteRequired (member , new HashSet <String >())) {
78
- Shape memberTarget = model .expectShape (member .getTarget ());
79
78
String memberName = getSanitizedMemberName (member );
80
- String memberParam = String .format ("%s.%s" , objectParam , memberName );
81
79
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 );
94
82
});
95
83
}
96
84
}
97
85
}
98
86
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
+
99
103
/**
100
104
* Recursively writes filterSensitiveLog for StructureShape.
101
105
*/
0 commit comments