stop using helper for security strategies

Author: lobsterkatie

src/sentry/grouping/strategies/security.py

@@ -8,45 +8,55 @@
     produces_variants,
     strategy,
 )
-from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp, SecurityReport
+from sentry.interfaces.security import Csp, ExpectCT, ExpectStaple, Hpkp
 
 
-def _security_v1(
-    reported_id: str, obj: SecurityReport, context: GroupingContext, **meta: Any
+@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
+@produces_variants(["default"])
+def expect_ct_v1(
+    interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
     return {
         context["variant"]: BaseGroupingComponent(
-            id=reported_id,
+            id="expect-ct",
             values=[
-                BaseGroupingComponent(id="salt", values=[reported_id]),
-                BaseGroupingComponent(id="hostname", values=[obj.hostname]),
+                BaseGroupingComponent(id="salt", values=["expect-ct"]),
+                BaseGroupingComponent(id="hostname", values=[interface.hostname]),
             ],
         )
     }
 
 
-@strategy(ids=["expect-ct:v1"], interface=ExpectCT, score=1000)
-@produces_variants(["default"])
-def expect_ct_v1(
-    interface: ExpectCT, event: Event, context: GroupingContext, **meta: Any
-) -> ReturnedVariants:
-    return _security_v1("expect-ct", interface, context=context, **meta)
-
-
 @strategy(ids=["expect-staple:v1"], interface=ExpectStaple, score=1001)
 @produces_variants(["default"])
 def expect_staple_v1(
     interface: ExpectStaple, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    return _security_v1("expect-staple", interface, context=context, **meta)
+    return {
+        context["variant"]: BaseGroupingComponent(
+            id="expect-staple",
+            values=[
+                BaseGroupingComponent(id="salt", values=["expect-staple"]),
+                BaseGroupingComponent(id="hostname", values=[interface.hostname]),
+            ],
+        )
+    }
 
 
 @strategy(ids=["hpkp:v1"], interface=Hpkp, score=1002)
 @produces_variants(["default"])
 def hpkp_v1(
     interface: Hpkp, event: Event, context: GroupingContext, **meta: Any
 ) -> ReturnedVariants:
-    return _security_v1("hpkp", interface, context=context, **meta)
+    return {
+        context["variant"]: BaseGroupingComponent(
+            id="hpkp",
+            values=[
+                BaseGroupingComponent(id="salt", values=["hpkp"]),
+                BaseGroupingComponent(id="hostname", values=[interface.hostname]),
+            ],
+        )
+    }
 
 
 @strategy(ids=["csp:v1"], interface=Csp, score=1003)