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

f/added oversize handling to waf v2 body and headers #26506

Merged
merged 56 commits into from
Oct 3, 2022
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4543df7
added oversize handling to wafv2
scottwestover Aug 27, 2022
2e605f7
[GH-25832] added: changelog for pull request
scottwestover Aug 27, 2022
c901dc2
added: support for wafv2 cookie match type
scottwestover Aug 28, 2022
b38e2ea
added: support for cookies attribute to wafv2 web acl
scottwestover Aug 29, 2022
fd15aed
added: support for headers attribute to wafv2 web acl
scottwestover Aug 29, 2022
a4734bc
added: support for json body attribute to wafv2 web acl
scottwestover Aug 29, 2022
25b43f0
changed: updated wafv2 documentation to include new fields
scottwestover Aug 29, 2022
9e77880
added: additional acceptance tests for wafv2
scottwestover Aug 29, 2022
ef63bd8
f/wafv2_rule_group - updated changelog
scottwestover Aug 29, 2022
78e5054
fixed: resolved conflicts with main branch
scottwestover Aug 30, 2022
ba06059
fixed: changelog to match the changes that were added
scottwestover Aug 30, 2022
2c9005b
fixed: conflicts in test file for waf after merge
scottwestover Aug 30, 2022
71a44ca
updated linting for terraform resource blocks in waf test file
scottwestover Aug 30, 2022
447371a
updated linting for terraform resource blocks in waf test file
scottwestover Aug 30, 2022
1ca4d38
updated linting for terraform resource blocks in waf test file
scottwestover Aug 30, 2022
5aad6e6
updated linting for terraform resource blocks in waf test file
scottwestover Aug 30, 2022
cc37a18
Merge branch 'main' into GH-25832/waf-v2-oversize-content-handling
scottwestover Aug 30, 2022
20e2fdf
fixed: function names for wafv2 flex files
scottwestover Aug 30, 2022
a25241d
f/fixed json naming convention in test files for wafv2
scottwestover Aug 30, 2022
fcb4587
f/fixed conflicts
scottwestover Aug 31, 2022
85119b1
f/fixed conflicts
scottwestover Aug 31, 2022
d7091cc
f/fixed conflicts
scottwestover Aug 31, 2022
d18b977
f/fixed changelog after resolving conflicts
scottwestover Aug 31, 2022
3d806e7
Separate CHANGELOG entries.
ewbankkit Aug 31, 2022
1cc708e
WAFv2: Use '_Values()' functions (#14601).
ewbankkit Aug 31, 2022
38964c4
WAFv2: Ensure schema generator names end with 'Schema'.
ewbankkit Aug 31, 2022
05c025b
WAFv2: Use 'Scope_Values()' (#14601).
ewbankkit Aug 31, 2022
712deda
WAFv2: Use 'IPAddressVersion_Values()' (#14601).
ewbankkit Aug 31, 2022
1b0bec9
'emptySchemaDeprecated' -> 'emptyDeprecatedSchema'.
ewbankkit Aug 31, 2022
edab500
'oversizeHandlingSchema' -> 'oversizeHandlingOptionalComputedSchema' …
ewbankkit Aug 31, 2022
6efdbca
Add 'cookiesSchema'.
ewbankkit Aug 31, 2022
479bf37
'jsonMatchPatternSchema' -> 'jsonBodyMatchPatternSchema'.
ewbankkit Aug 31, 2022
14bf018
Add 'cookiesMatchPatternSchema'.
ewbankkit Aug 31, 2022
2b4da92
WAFv2: 'oversize_handling' is Optional for 'body'.
ewbankkit Aug 31, 2022
f4246d2
'oversizeHandlingOptionalComputedSchema' -> 'oversizeHandlingOptional…
ewbankkit Aug 31, 2022
95e73b3
MaxItems for 'body' is 1.
ewbankkit Aug 31, 2022
2e39839
Merge branch 'main' into HEAD
ewbankkit Sep 27, 2022
3295b86
r/aws_wafv2_rule_group: Switch to 'WithoutTimeout' CRUD handlers (#15…
ewbankkit Sep 27, 2022
fc32dd9
r/aws_wafv2_web_acl: Switch to 'WithoutTimeout' CRUD handlers (#15090).
ewbankkit Sep 27, 2022
15d101e
WAFv2: Simplify sweepers.
ewbankkit Sep 27, 2022
57d7277
oversize_handling may be Optional. In that case return an empty Body.
ewbankkit Sep 28, 2022
ad1720d
Revert "oversize_handling may be Optional. In that case return an emp…
ewbankkit Sep 28, 2022
8372d20
r/aws_wafv2_ip_set: Switch to 'WithoutTimeout' CRUD handlers (#15090).
ewbankkit Sep 28, 2022
ef76ded
r/aws_wafv2_regex_pattern_set: Switch to 'WithoutTimeout' CRUD handle…
ewbankkit Sep 28, 2022
34367c9
r/aws_wafv2_web_acl_association: Switch to 'WithoutTimeout' CRUD hand…
ewbankkit Sep 28, 2022
9af7760
Fix semgrep 'dgryski.semgrep-go.errnilcheck.err-nil-check'.
ewbankkit Sep 28, 2022
01bfe91
expandRules: Ignore rule with empty 'name'.
ewbankkit Sep 28, 2022
c81b7ca
Revert "expandRules: Ignore rule with empty 'name'."
ewbankkit Sep 28, 2022
8e8046e
WAFv2: 'body.oversize_handling' is Required (breaking change).
ewbankkit Sep 28, 2022
1d826f4
WAFv2: Add required 'body.oversize_handling' values.
ewbankkit Sep 28, 2022
422c3dd
WAFv2: Document required 'body.oversize_handling' value.
ewbankkit Sep 28, 2022
e8aa32c
Breaking change: Add Required 'oversize_handling' attribute to the 'f…
ewbankkit Sep 28, 2022
7a292ba
WAFv2: Remove 'body.oversize_handling'.
ewbankkit Oct 3, 2022
7960ee3
Revert "WAFv2: Add required 'body.oversize_handling' values."
ewbankkit Oct 3, 2022
fb891e4
r/aws_wafv2_rule_group: Remove 'testAccRuleGroupConfig_byteMatchState…
ewbankkit Oct 3, 2022
ccf72ab
WAFv2: Restore 'json_body.oversize_handling' to Optional.
ewbankkit Oct 3, 2022
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
20 changes: 10 additions & 10 deletions internal/service/wafv2/rule_group_test.go
Original file line number Diff line number Diff line change
@@ -2651,8 +2651,8 @@ resource "aws_wafv2_rule_group" "test" {

field_to_match {
body {
oversize_handling = "CONTINUE"
}
oversize_handling = "CONTINUE"
}
}

text_transformation {
@@ -2749,7 +2749,7 @@ resource "aws_wafv2_rule_group" "test" {
headers {
match_scope = "ALL"
match_pattern {
all {}
all {}
}
}
}
@@ -2801,7 +2801,7 @@ resource "aws_wafv2_rule_group" "test" {
headers {
match_scope = "ALL"
match_pattern {
all {}
all {}
}
oversize_handling = "MATCH"
}
@@ -2854,7 +2854,7 @@ resource "aws_wafv2_rule_group" "test" {
headers {
match_scope = "ALL"
match_pattern {
included_headers = ["session", "session-id"]
included_headers = ["session", "session-id"]
}
oversize_handling = "MATCH"
}
@@ -2907,7 +2907,7 @@ resource "aws_wafv2_rule_group" "test" {
headers {
match_scope = "ALL"
match_pattern {
excluded_headers = ["session", "session-id"]
excluded_headers = ["session", "session-id"]
}
oversize_handling = "MATCH"
}
@@ -2959,7 +2959,7 @@ resource "aws_wafv2_rule_group" "test" {
field_to_match {
json_body {
match_pattern {
all {}
all {}
}
oversize_handling = "MATCH"
}
@@ -3012,7 +3012,7 @@ resource "aws_wafv2_rule_group" "test" {
json_body {
match_scope = "ALL"
match_pattern {
all {}
all {}
}
oversize_handling = "MATCH"
}
@@ -3065,7 +3065,7 @@ resource "aws_wafv2_rule_group" "test" {
json_body {
match_scope = "ALL"
match_pattern {
included_paths = ["/dogs/0/name", "/cats"]
included_paths = ["/dogs/0/name", "/cats"]
}
oversize_handling = "MATCH"
}
@@ -3119,7 +3119,7 @@ resource "aws_wafv2_rule_group" "test" {
invalid_fallback_behavior = "NO_MATCH"
match_scope = "ALL"
match_pattern {
all {}
all {}
}
oversize_handling = "MATCH"
}