From 17c985b6eaf9b542163d22a5436f97a1622b1f45 Mon Sep 17 00:00:00 2001 From: Yuval Haor Noga Date: Thu, 19 May 2022 17:10:29 +0300 Subject: [PATCH 1/2] feat: add label_match_statement to managed_rule_group_statement --- main.tf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.tf b/main.tf index 11610cf..cd736cb 100644 --- a/main.tf +++ b/main.tf @@ -662,6 +662,15 @@ resource "aws_wafv2_web_acl" "main" { } } } + + # Scope down label_match_statement + dynamic "label_match_statement" { + for_each = length(lookup(scope_down_statement.value, "label_match_statement", {})) == 0 ? [] : [lookup(scope_down_statement.value, "label_match_statement", {})] + content { + key = lookup(label_match_statement.value, "key") + scope = lookup(label_match_statement.value, "scope") + } + } } } } From 4e2f012142e3521fa73992f70aa7fb373b50d868 Mon Sep 17 00:00:00 2001 From: Abdul Wahid Date: Thu, 26 May 2022 17:12:42 +0100 Subject: [PATCH 2/2] chore: update changelog + readme --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e59fa19..aa782d4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: args: ['--allow-missing-credentials'] - id: trailing-whitespace - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.71.0 + rev: v1.72.1 hooks: - id: terraform_fmt - id: terraform_docs diff --git a/CHANGELOG.md b/CHANGELOG.md index fce7ae4..c28d9b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,21 +5,14 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -- [Variable] typo fix. -- [refactor] response_key to custom_response_body_key to better match underlying tf resource. -- [Examples] typo fix. -- [Custom Response] block variable input. -- [Examples] fix. -- [Custom Response Bodies] supported for multiplexed custom body definitions. Dropped the enabled variable as not needed. -- [README] updated to list custom responses capabilities. -- [make] changelog -- [make] validate. -- [Formatting] main.tf -- [Custom Response] handling on per rules basis with dynamic block definitions. -- [Formatting] -- [Variable] definition typo in type fix. -- [README] updated with input info. -- [Block] custom_response http status code. +- feat: add label_match_statement to managed_rule_group_statement + + + +## [3.8.0] - 2022-05-18 + +- feat: add label_match_statement & rule_labels ([#58](https://github.com/umotif-public/terraform-aws-waf-webaclv2/issues/58)) +- Custom Block Response ([#56](https://github.com/umotif-public/terraform-aws-waf-webaclv2/issues/56)) @@ -46,6 +39,12 @@ All notable changes to this project will be documented in this file. - Added support for forwarded_ip_config inside of geo_match_statement ([#49](https://github.com/umotif-public/terraform-aws-waf-webaclv2/issues/49)) + +## [3.6.0-patch-1] - 2022-03-22 + +- Added support for forwarded_ip_config inside of geo_match_statement + + ## [3.6.0] - 2022-02-21 @@ -201,11 +200,13 @@ All notable changes to this project will be documented in this file. - Initial commit -[Unreleased]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.7.3...HEAD +[Unreleased]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.8.0...HEAD +[3.8.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.7.3...3.8.0 [3.7.3]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.7.2...3.7.3 [3.7.2]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.7.1...3.7.2 [3.7.1]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.7.0...3.7.1 -[3.7.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.6.0...3.7.0 +[3.7.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.6.0-patch-1...3.7.0 +[3.6.0-patch-1]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.6.0...3.6.0-patch-1 [3.6.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.5.0...3.6.0 [3.5.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.4.0...3.5.0 [3.4.0]: https://github.com/umotif-public/terraform-aws-waf-webaclv2/compare/3.3.0...3.4.0