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.

Sign up for GitHub

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

fix(tpg v5)!: rule.rate_limit_options.enforce_on_key has not default value #77

Merged
merged 9 commits into from
Oct 24, 2023
Merged

fix(tpg v5)!: rule.rate_limit_options.enforce_on_key has not default value #77

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b0aa2b
fix: upgraded versions.tf to include minor bumps from tpg v5
imrannayer Oct 17, 2023
8ecf52b
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
a1cc748
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
6e88f91
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
d950c1d
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
c360e9c
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
219435f
fix test for rule.rate_limit_options.enforce_on_key
imrannayer Oct 17, 2023
f2c8b27
Merge branch 'main' into fix/upgrade-5
imrannayer Oct 17, 2023
7e6b1f8
Delete examples/simple-example/versions.tf
imrannayer Oct 24, 2023
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
3 changes: 3 additions & 0 deletions docs/upgrading_to_v2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
The v2.0 release contains backwards-incompatible changes.

This update requires upgrading the minimum provider version to `4.79`.

### TPG max version is bumped to 5.x
In `4.X`, the default value for `rule.rate_limit_options.enforce_on_key` is `ALL`. In `5.X` this field no longer has a default value. If you need `All` you will need to set it explicitly. See [Rule 2](https://github.com/GoogleCloudPlatform/terraform-google-cloud-armor/blob/main/examples/security-policy-all/main.tf) in `examples/security-policy-all` folder for reference.
28 changes: 0 additions & 28 deletions examples/security-policy-all/versions.tf
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need versions.tf for examples?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Infrequently, might be needed if the example make use a provider directly such as Random, etc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we dont have any other provider except google, leme remove it.

This file was deleted.

28 changes: 0 additions & 28 deletions examples/security-policy-edge/versions.tf
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions examples/security-policy-managed-protection-plus/versions.tf
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions examples/security-policy-recaptcha/versions.tf
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/simple-example/versions.tf
View file
Open in desktop
imrannayer marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
version = ">= 4.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.0"
version = ">= 4.0"
}
}
}
6 changes: 3 additions & 3 deletions test/integration/security-policy-all/security_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestSecurityPolicyAll(t *testing.T) {
assert.Equal("throttle", sp.Get("action").String(), "priority 2 rule has expected action")
assert.Equal("XSS Sensitivity Level 2 with excluded rules", sp.Get("description").String(), "priority 2 rule has expected description")
assert.Equal("allow", sp.Get("rateLimitOptions.conformAction").String(), "priority 2 rule has expected Rate limit confirm action")
assert.Equal("ALL", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 2 rule has expected Rate limit enforce on key")
assert.Equal("", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 2 rule has expected Rate limit enforce on key")
assert.Equal("deny(502)", sp.Get("rateLimitOptions.exceedAction").String(), "priority 2 rule has expected Rate limit exceed action")
assert.Equal("10", sp.Get("rateLimitOptions.rateLimitThreshold.count").String(), "priority 2 rule has expected Rate limit threshold count")
assert.Equal("60", sp.Get("rateLimitOptions.rateLimitThreshold.intervalSec").String(), "priority 2 rule has expected Rate limit threshold interval")
Expand Down Expand Up @@ -170,7 +170,7 @@ func TestSecurityPolicyAll(t *testing.T) {
assert.Equal(srcIpRanges[0].String(), "45.116.227.71", "priority 15 rule found first valid cidr range")
assert.Equal(srcIpRanges[1].String(), "190.217.68.214", "priority 15 rule found second valid cidr range")
assert.Equal("allow", sp.Get("rateLimitOptions.conformAction").String(), "priority 15 rule has Rate limit confirm action")
assert.Equal("ALL", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 15 rule has Rate limit Enforce on key")
assert.Equal("", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 15 rule has Rate limit Enforce on key")
assert.Equal("deny(502)", sp.Get("rateLimitOptions.exceedAction").String(), "priority 15 rule has Rate limit exceed action")
assert.Equal("10", sp.Get("rateLimitOptions.rateLimitThreshold.count").String(), "priority 15 rule has Rate limit threshold count")
assert.Equal("60", sp.Get("rateLimitOptions.rateLimitThreshold.intervalSec").String(), "priority 15 rule has Rate limit threshold interval")
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestSecurityPolicyAll(t *testing.T) {
assert.Equal("Throttle specific IP address in US Region", sp.Get("description").String(), "priority 23 rule has expected description")
assert.Equal("origin.region_code == \"US\" && inIpRange(origin.ip, '47.185.201.159/32')\n", sp.Get("match.expr.expression").String(), "priority 23 rule has expected expression")
assert.Equal("allow", sp.Get("rateLimitOptions.conformAction").String(), "priority 23 rule has Rate limit confirm action")
assert.Equal("ALL", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 23 rule has Rate limit Enforce on key")
assert.Equal("", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 23 rule has Rate limit Enforce on key")
assert.Equal("deny(502)", sp.Get("rateLimitOptions.exceedAction").String(), "priority 23 rule has Rate limit exceed action")
assert.Equal("10", sp.Get("rateLimitOptions.rateLimitThreshold.count").String(), "priority 23 rule has Rate limit threshold count")
assert.Equal("60", sp.Get("rateLimitOptions.rateLimitThreshold.intervalSec").String(), "priority 23 rule has Rate limit threshold interval")
Expand Down
2 changes: 1 addition & 1 deletion test/integration/simple-example/simple_example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func TestSimpleExample(t *testing.T) {
assert.Equal("Throttle specific IP address in US Region", sp.Get("description").String(), "priority 23 rule has expected description")
assert.Equal("origin.region_code == \"US\" && inIpRange(origin.ip, '47.185.201.159/32')\n", sp.Get("match.expr.expression").String(), "priority 23 rule has expected expression")
assert.Equal("allow", sp.Get("rateLimitOptions.conformAction").String(), "priority 23 rule has Rate limit confirm action")
assert.Equal("ALL", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 23 rule has Rate limit Enforce on key")
assert.Equal("", sp.Get("rateLimitOptions.enforceOnKey").String(), "priority 23 rule has Rate limit Enforce on key")
assert.Equal("deny(502)", sp.Get("rateLimitOptions.exceedAction").String(), "priority 23 rule has Rate limit exceed action")
assert.Equal("10", sp.Get("rateLimitOptions.rateLimitThreshold.count").String(), "priority 23 rule has Rate limit threshold count")
assert.Equal("60", sp.Get("rateLimitOptions.rateLimitThreshold.intervalSec").String(), "priority 23 rule has Rate limit threshold interval")
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.79.0, < 5.0"
version = ">= 4.79.0, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.79.0, < 5.0"
version = ">= 4.79.0, < 6"
}
}
provider_meta "google" {
Expand Down