pass dependency

Author: kuhe

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

@@ -174,7 +174,12 @@ private void renderNonErrorStructure() {
         }
 
         StructuredMemberWriter config = new StructuredMemberWriter(
-                model, symbolProvider, shape.getAllMembers().values(), this.requiredMemberMode);
+            model, 
+            symbolProvider, 
+            shape.getAllMembers().values(), 
+            this.requiredMemberMode,
+            sensitiveDataFinder
+        );
         config.writeMembers(writer, shape);
         writer.closeBlock("}");
         writer.write("");
@@ -277,7 +282,7 @@ private void renderErrorStructure() {
             HttpProtocolGeneratorUtils.writeRetryableTrait(writer, shape, ";");
         }
         StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(model, symbolProvider,
-                shape.getAllMembers().values(), this.requiredMemberMode);
+                shape.getAllMembers().values(), this.requiredMemberMode, sensitiveDataFinder);
         // since any error interface must extend from JavaScript Error interface,
         // message member is already
         // required in the JavaScript Error interface

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

@@ -68,18 +68,28 @@ final class StructuredMemberWriter {
     boolean noDocs;
     RequiredMemberMode requiredMemberMode;
     final Set<String> skipMembers = new HashSet<>();
-    private final SensitiveDataFinder sensitiveDataFinder = new SensitiveDataFinder();
+    private final SensitiveDataFinder sensitiveDataFinder;
 
     StructuredMemberWriter(Model model, SymbolProvider symbolProvider, Collection<MemberShape> members) {
         this(model, symbolProvider, members, RequiredMemberMode.NULLABLE);
     }
 
     StructuredMemberWriter(Model model, SymbolProvider symbolProvider, Collection<MemberShape> members,
             RequiredMemberMode requiredMemberMode) {
+        this(model, symbolProvider, members, requiredMemberMode, new SensitiveDataFinder());
+    }
+
+    StructuredMemberWriter(
+            Model model,
+            SymbolProvider symbolProvider,
+            Collection<MemberShape> members,
+            RequiredMemberMode requiredMemberMode,
+            SensitiveDataFinder sensitiveDataFinder) {
         this.model = model;
         this.symbolProvider = symbolProvider;
         this.members = new LinkedHashSet<>(members);
         this.requiredMemberMode = requiredMemberMode;
+        this.sensitiveDataFinder = sensitiveDataFinder;
     }
 
     void writeMembers(TypeScriptWriter writer, Shape shape) {

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

@@ -22,6 +22,7 @@
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.UnionShape;
+import software.amazon.smithy.typescript.codegen.TypeScriptSettings.RequiredMemberMode;
 import software.amazon.smithy.typescript.codegen.validation.SensitiveDataFinder;
 import software.amazon.smithy.utils.SmithyInternalApi;
 import software.amazon.smithy.utils.StringUtils;
@@ -255,7 +256,12 @@ private void writeFilterSensitiveLog(String namespace) {
                     for (MemberShape member : shape.getAllMembers().values()) {
                         String memberName = symbolProvider.toMemberName(member);
                         StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(
-                                model, symbolProvider, shape.getAllMembers().values());
+                            model, 
+                            symbolProvider, 
+                            shape.getAllMembers().values(),
+                            RequiredMemberMode.NULLABLE,
+                            sensitiveDataFinder
+                        );
                         writer.openBlock("if (${1L}.${2L} !== undefined) return {${2L}: ", "};",
                             objectParam, memberName, () -> {
                                 String memberParam = String.format("%s.%s", objectParam, memberName);
@@ -272,7 +278,12 @@ private void writeFilterSensitiveLog(String namespace) {
 
     private void writeValidate() {
         StructuredMemberWriter structuredMemberWriter = new StructuredMemberWriter(
-                model, symbolProvider, shape.getAllMembers().values());
+            model, 
+            symbolProvider, 
+            shape.getAllMembers().values(),
+            RequiredMemberMode.NULLABLE,
+            sensitiveDataFinder
+        );
 
         structuredMemberWriter.writeMemberValidatorCache(writer, "memberValidators");
 

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/validation/SensitiveDataFinder.java

@@ -16,9 +16,19 @@
 import software.amazon.smithy.model.traits.SensitiveTrait;
 import software.amazon.smithy.model.traits.StreamingTrait;
 
+/**
+ * This validator tells you whether a shape contains sensitive data fields.
+ * This is used to decide whether a sensitive log filter function needs to be generated for
+ * a given shape.
+ */
 public class SensitiveDataFinder {
     private Map<Shape, Boolean> cache = new HashMap<>();
 
+    /**
+     * @param shape - the shape in question.
+     * @param model - model context for the shape, containing its related shapes.
+     * @return whether a sensitive field exists in the shape and its downstream shapes.
+     */
     public boolean findsSensitiveData(Shape shape, Model model) {
         boolean found = findRecursive(shape, model);
         cache.put(shape, found);