Fix FilterSuppressions to match on hierarchy

smithy-lang · Feb 24, 2023 · af5a8c6 · af5a8c6
1 parent ff9df7d
commit af5a8c6
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 4 deletions.
diff --git a/smithy-build/src/main/java/software/amazon/smithy/build/transforms/FilterSuppressions.java b/smithy-build/src/main/java/software/amazon/smithy/build/transforms/FilterSuppressions.java
@@ -287,11 +287,18 @@ private Model filterSuppressionTraits(
 
             // Only keep IDs that actually acted to suppress an event.
             if (config.getRemoveUnused()) {
-                Set<String> matched = suppressedEvents.stream()
+                Set<ValidationEvent> matchedEvents = suppressedEvents.stream()
                         .filter(event -> Objects.equals(shape.getId(), event.getShapeId().orElse(null)))
-                        .map(ValidationEvent::getId)
                         .collect(Collectors.toSet());
-                allowed.removeIf(value -> !matched.contains(value));
+                List<String> toKeep = new ArrayList<>();
+                for (String allowedValue : allowed) {
+                    for (ValidationEvent event : matchedEvents) {
+                        if (event.containsId(allowedValue)) {
+                            toKeep.add(allowedValue);
+                        }
+                    }
+                }
+                allowed = toKeep;
             }
 
             if (allowed.isEmpty()) {

diff --git a/...y-build/src/test/java/software/amazon/smithy/build/transforms/FilterSuppressionsTest.java b/...y-build/src/test/java/software/amazon/smithy/build/transforms/FilterSuppressionsTest.java
@@ -66,7 +66,8 @@ public void cannotSetBothNamespaceAllowAndDenyList() {
         "namespaces,filterWithProjectionImports",
         "namespaces,detectsValidatorRemoval",
         "namespaces,unchanged",
-        "noSuppressions,removeUnused"
+        "noSuppressions,removeUnused",
+        "eventHierarchy,removeUnused"
     })
     public void runTransformTests(String modelFile, String testName) throws Exception {
         Model model = Model.assembler()

diff --git a/...ftware/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.removeUnused.json b/...ftware/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.removeUnused.json
@@ -0,0 +1,15 @@
+{
+    "version": "2.0",
+    "projections": {
+        "foo": {
+            "transforms": [
+                {
+                    "name": "filterSuppressions",
+                    "args": {
+                        "removeUnused": true
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/...ware/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.removeUnused.smithy b/...ware/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.removeUnused.smithy
@@ -0,0 +1,28 @@
+$version: "2.0"
+
+metadata validators = [
+    {
+        name: "EmitEachSelector",
+        id: "A.B",
+        severity: "WARNING",
+        configuration: {
+            selector: ":not([id='smithy.example#NoMatches'])"
+        }
+    },
+    {
+        name: "EmitEachSelector",
+        id: "B.C.D",
+        severity: "WARNING",
+        configuration: {
+            selector: ":not([id='smithy.example#NoMatches'])"
+        }
+    }
+]
+
+namespace smithy.example
+
+@suppress(["A", "B.C"])
+structure Foo {
+    @suppress(["A", "B.C"])
+    foo: String
+}
diff --git a/...esources/software/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.smithy b/...esources/software/amazon/smithy/build/transforms/filtersuppressions/eventHierarchy.smithy
@@ -0,0 +1,28 @@
+$version: "2.0"
+
+metadata validators = [
+    {
+        name: "EmitEachSelector",
+        id: "A.B",
+        severity: "WARNING",
+        configuration: {
+            selector: ":not([id='smithy.example#NoMatches'])"
+        }
+    },
+    {
+        name: "EmitEachSelector",
+        id: "B.C.D",
+        severity: "WARNING",
+        configuration: {
+            selector: ":not([id='smithy.example#NoMatches'])"
+        }
+    }
+]
+
+namespace smithy.example
+
+@suppress(["A", "B.C"])
+structure Foo {
+    @suppress(["A", "B.C"])
+    foo: String
+}