Merge pull request #32 from citizensadvice/fix-logging

Remove tagging feature, other code improvements

Author: MatthewCane

ca_cdk_constructs/edge_services/waf_rule_templates.py

@@ -148,7 +148,7 @@ def ip_rule_property(
         scope,
         f"{name}IpSetIPV6",
         addresses=addresses.get("IPV6", []),
-        description=f"{name}IpSetIPV4",
+        description=f"{name}IpSetIPV6",
         ip_address_version="IPV6",
         scope="CLOUDFRONT",
     ).attr_arn

ca_cdk_constructs/edge_services/waf_v2_builder.py

@@ -14,7 +14,6 @@ class WafV2Builder:
     :param scope: The scope of the construct, i.e the parent stack or construct.
     :param name: The name of the WAF ACL.
     :param description: The description of the WAF ACL.
-    :param tags: The tags of the WAF ACL. {"Component": "WAF"} is added in addition to this.
     :param waf_scope: The scope of the WAF ACL. Defaults to CLOUDFRONT.
     :param log_group: The CloudWatch log group to use for logging. Log group name MUST start with 'aws-waf-logs-'. If not included logging will be disabled.
     :param default_action: The default action of the WAF ACL. Defaults to Allow.
@@ -33,7 +32,6 @@ class WafV2Builder:
       self,
       name="TestWaf",
       description="A dummy WAF for testing",
-      tags={"Foo": "Bar"},
     )
 
     waf_builder.add_ip_rule(
@@ -53,7 +51,6 @@ def __init__(
         scope: Construct,
         name: str,
         description: str,
-        tags: Optional[dict] = dict(),
         waf_scope: Optional[str] = "CLOUDFRONT",
         log_group: Optional[cf_logs.LogGroup] = None,
         default_action: Optional[waf.CfnWebACL.DefaultActionProperty] = None,
@@ -83,8 +80,6 @@ def __init__(
                 sampled_requests_enabled=False,
             )
 
-        self.tags = tags | {"Component": "WAF"}
-
     def add_custom_rule(self, rule: waf.CfnWebACL.RuleProperty) -> None:
         """
         Adds a custom rule to the WAFv2 WebACL.
@@ -178,8 +173,6 @@ def build(self) -> waf.CfnWebACL:
             visibility_config=self.visibility_config,
             rules=self.rules,
         )
-        for key, value in self.tags.items():
-            Tags.of(web_acl).add(key, value)
 
         if self.log_group:
             self.logging_config = waf.CfnLoggingConfiguration(

tests/test_waf_v2_builder.py

@@ -11,7 +11,6 @@ def waf_builder():
         Stack(App(), "TestStack"),
         name="TestWaf",
         description="A dummy WAF for testing",
-        tags={"Foo": "Bar"},
     )
     yield waf_builder
 
@@ -100,7 +99,6 @@ def test_waf_v2_logging_enabled():
         stack,
         name="TestWaf",
         description="A dummy WAF for testing",
-        tags={"Foo": "Bar"},
         log_group=test_log_group,
     )
     waf = waf_builder.build()