Apply IP allow list to CMS application regardless of environment type

terraform/20-app/waf.cms.tf

@@ -4,39 +4,37 @@ resource "aws_wafv2_web_acl" "cms_admin" {
   scope       = "REGIONAL"
 
   default_action {
-    allow {}
+    dynamic "block" {
+      for_each = [""]
+      content {
+      }
+    }
+    dynamic "allow" {
+      for_each = []
+      content {
+      }
+    }
   }
 
-  dynamic "rule" {
-    for_each = local.waf_cms_admin.rules
-
-    content {
-      name     = rule.value.name
-      priority = rule.value.priority
-
-      override_action {
-        none {}
-      }
+  rule {
+    name     = "ip-allowlist"
+    priority = 0
 
-      statement {
-        managed_rule_group_statement {
-          name        = rule.value.name
-          vendor_name = "AWS"
-        }
-      }
+    action {
+      allow {}
+    }
 
-      visibility_config {
-        metric_name                = rule.value.name
-        cloudwatch_metrics_enabled = true
-        sampled_requests_enabled   = true
+    statement {
+      ip_set_reference_statement {
+        arn = aws_wafv2_ip_set.ip_allow_list_regional.arn
       }
     }
-  }
 
-  visibility_config {
-    metric_name                = "${local.prefix}-cms"
-    cloudwatch_metrics_enabled = true
-    sampled_requests_enabled   = true
+    visibility_config {
+      cloudwatch_metrics_enabled = true
+      metric_name                = "IPAllowListRule"
+      sampled_requests_enabled   = true
+    }
   }
 
   rule {
@@ -87,6 +85,38 @@ resource "aws_wafv2_web_acl" "cms_admin" {
       sampled_requests_enabled   = true
     }
   }
+
+  dynamic "rule" {
+    for_each = local.waf_cms_admin.rules
+
+    content {
+      name     = rule.value.name
+      priority = rule.value.priority
+
+      override_action {
+        none {}
+      }
+
+      statement {
+        managed_rule_group_statement {
+          name        = rule.value.name
+          vendor_name = "AWS"
+        }
+      }
+
+      visibility_config {
+        metric_name                = rule.value.name
+        cloudwatch_metrics_enabled = true
+        sampled_requests_enabled   = true
+      }
+    }
+  }
+
+  visibility_config {
+    metric_name                = "${local.prefix}-cms"
+    cloudwatch_metrics_enabled = true
+    sampled_requests_enabled   = true
+  }
 }
 
 resource "aws_wafv2_web_acl_association" "cms_admin" {

terraform/20-app/waf.ip-allow-set.tf

@@ -8,3 +8,13 @@ resource "aws_wafv2_ip_set" "ip_allow_list" {
         formatlist("%s/32", module.vpc.nat_public_ips)
     )
 }
+
+resource "aws_wafv2_ip_set" "ip_allow_list_regional" {
+  name               = "${local.prefix}-ip-allow-list-regional"
+  scope              = "REGIONAL"
+  ip_address_version = "IPV4"
+  addresses          = concat(
+    local.complete_ip_allow_list,
+    formatlist("%s/32", module.vpc.nat_public_ips)
+  )
+}