Merge pull request #5313 from aws/fix-sensitivelistmap

fix sensitive missing on list/map

CHANGELOG_PENDING.md

@@ -5,3 +5,5 @@
 ### SDK Enhancements
 
 ### SDK Bugs
+* Apply sensitive struct tag to lists/maps with sensitive members.
+  * This change propagates existing sensitive protection to lists/maps.

private/model/api/shape.go

@@ -600,7 +600,7 @@ func (ref *ShapeRef) GoTags(toplevel bool, isRequired bool) string {
 		tags = append(tags, ShapeTag{"ignore", "true"})
 	}
 
-	if ref.Shape.Sensitive {
+	if ref.Shape.IsSensitive() {
 		tags = append(tags, ShapeTag{"sensitive", "true"})
 	}
 
@@ -619,6 +619,21 @@ func (s *Shape) HasPayloadMembers() bool {
 	return false
 }
 
+// IsSensitive checks whether the Shape itself is sensitive, or if the Shape is
+// a collection/map with a sensitive member.
+func (s *Shape) IsSensitive() bool {
+	if s.Sensitive {
+		return true
+	}
+	if s.MemberRef.Shape != nil && s.MemberRef.Shape.Sensitive {
+		return true
+	}
+	if s.ValueRef.Shape != nil && s.ValueRef.Shape.Sensitive {
+		return true
+	}
+	return false
+}
+
 // Docstring returns the godocs formated documentation
 func (ref *ShapeRef) Docstring() string {
 	if ref.Documentation != "" {