Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLT-503: Add test and sandbox environments to DPC WAF plan and apply #128

Merged
merged 8 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/api-waf-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
app: [dpc]
env: [dev]
env: [dev, test, sbx]
steps:
- uses: actions/checkout@v4
- uses: ./actions/setup-tfenv-terraform
Expand Down
46 changes: 25 additions & 21 deletions terraform/modules/firewall/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,36 +62,40 @@ resource "aws_wafv2_web_acl" "this" {
}
}

rule {
name = "ip-sets"
priority = 2
dynamic "rule" {
for_each = length(var.ip_sets) > 0 ? [1] : []

action {
block {}
}
content {
name = "ip-sets"
priority = 2

statement {
not_statement {
statement {
or_statement {
dynamic "statement" {
for_each = var.ip_sets
iterator = ip_set
content {
ip_set_reference_statement {
arn = ip_set.value
action {
block {}
}

statement {
not_statement {
statement {
or_statement {
dynamic "statement" {
for_each = var.ip_sets
iterator = ip_set
content {
ip_set_reference_statement {
arn = ip_set.value
}
}
}
}
}
}
}
}

visibility_config {
cloudwatch_metrics_enabled = true
metric_name = "${var.name}-ip-sets"
sampled_requests_enabled = false
visibility_config {
cloudwatch_metrics_enabled = true
metric_name = "${var.name}-ip-sets"
sampled_requests_enabled = false
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions terraform/services/api-waf/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ data "aws_lb" "api" {
}

data "aws_wafv2_ip_set" "external_services" {
count = var.env == "sbx" ? 0 : 1
name = "external-services"
scope = "REGIONAL"
}

resource "aws_wafv2_ip_set" "api_customers" {
count = var.env == "sbx" ? 0 : 1
name = "${var.app}-${var.env}-api-customers"
description = "IP ranges for customers of this API"
scope = "REGIONAL"
Expand Down Expand Up @@ -49,8 +51,8 @@ module "aws_waf" {
content_type = "APPLICATION_JSON"

associated_resource_arn = data.aws_lb.api.arn
ip_sets = [
data.aws_wafv2_ip_set.external_services.arn,
aws_wafv2_ip_set.api_customers.arn,
ip_sets = var.env == "sbx" ? [] : [
one(data.aws_wafv2_ip_set.external_services).arn,
one(aws_wafv2_ip_set.api_customers).arn,
]
}