Skip to content

Commit 0382f0e

Browse files
committed
Log unknown union member as 'UNKNOWN'
1 parent fedb423 commit 0382f0e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
* if (obj.bear !== undefined)
116116
* return { bear: Bear.filterSensitiveLog(obj.bear) };
117117
* if (obj.$unknown !== undefined)
118-
* return { [obj.$unknown[0]]: obj.$unknown[1] };
118+
* return { [obj.$unknown[0]]: 'UNKNOWN' };
119119
* }
120120
* }
121121
* }</pre>
@@ -270,7 +270,7 @@ private void writeFilterSensitiveLog() {
270270
writer.write("};");
271271
}
272272
}
273-
writer.write("if (${1L}.$$unknown !== undefined) return {[${1L}.$$unknown[0]]: ${1L}.$$unknown[1]};",
273+
writer.write("if (${1L}.$$unknown !== undefined) return {[${1L}.$$unknown[0]]: 'UNKNOWN'};",
274274
objectParam);
275275
}
276276
);

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void callsFilterInUnionWithSensitiveData() {
154154
" export const filterSensitiveLog = (obj: TestUnion): any => {\n"
155155
+ " if (obj.bar !== undefined) return {bar: obj.bar};\n"
156156
+ " if (obj.sensitiveBar !== undefined) return {[sensitiveBar]: SENSITIVE_STRING};\n"
157-
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: obj.$unknown[1]};\n"
157+
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};\n"
158158
+ " }\n");
159159
}
160160

@@ -175,7 +175,7 @@ public void callsFilterInUnionWithoutSensitiveData() {
175175
" export const filterSensitiveLog = (obj: TestUnion): any => {\n"
176176
+ " if (obj.fooString !== undefined) return {fooString: obj.fooString};\n"
177177
+ " if (obj.barString !== undefined) return {barString: obj.barString};\n"
178-
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: obj.$unknown[1]};\n"
178+
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};\n"
179179
+ " }\n");
180180
}
181181

@@ -257,7 +257,7 @@ public void callsFilterInListWithUnionWithSensitiveData() {
257257
" export const filterSensitiveLog = (obj: TestUnion): any => {\n"
258258
+ " if (obj.bar !== undefined) return {bar: obj.bar};\n"
259259
+ " if (obj.sensitiveBar !== undefined) return {[sensitiveBar]: SENSITIVE_STRING};\n"
260-
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: obj.$unknown[1]};\n"
260+
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};\n"
261261
+ " }\n");
262262
}
263263

@@ -351,7 +351,7 @@ public void callsFilterInMapWithUnionWithSensitiveData() {
351351
" export const filterSensitiveLog = (obj: TestUnion): any => {\n"
352352
+ " if (obj.bar !== undefined) return {bar: obj.bar};\n"
353353
+ " if (obj.sensitiveBar !== undefined) return {[sensitiveBar]: SENSITIVE_STRING};\n"
354-
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: obj.$unknown[1]};\n"
354+
+ " if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};\n"
355355
+ " }\n");
356356
}
357357

0 commit comments

Comments
 (0)