Add Managed Headers resource #1688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WowVeryLogin
force-pushed
the
ddavydov/add-managed-headers-support
branch
from
4d807de to
3aeb7d9
Compare
|
This project handles dependency version bumps (including upstream changes from cloudflare-go) independently of the standard PR process using automation. This allows the dependency upgrades to land without causing merge conflicts in multiple branches and handled in a consistent way. The exception to this is security related dependency upgrades but they should be co-ordinated with the maintainer team privately. Please remove the changes to the go.mod or go.sum files from this PR in order to proceed with review and merging. |
jacobbednarz
reviewed
Jun 9, 2022
|
❤️ ❤️ ❤️ this! couple of CI lint failures, removing the dep bumps from this PR, and once you run |
WowVeryLogin
force-pushed
the
ddavydov/add-managed-headers-support
branch
7 times, most recently
from
7dadd73 to
1212a06
Compare
jacobbednarz
reviewed
Jun 9, 2022
docs/resources/cloudflare_ruleset.md
Outdated
| @@ -286,7 +286,7 @@ resource "cloudflare_ruleset" "custom_fields_logging_example" { | |||
|
|
|||
| - `kind` (String) Type of Ruleset to create. Available values: `"custom"`, `"managed"`, `"root"`, `"schema"`, `"zone"`. | |||
| - `name` (String) Name of the ruleset. | |||
| - `phase` (String) Point in the request/response lifecycle where the ruleset will be created. Available values: `"ddos_l4"`, `"ddos_l7"`, `"http_log_custom_fields"`, `"http_request_firewall_custom"`, `"http_request_firewall_managed"`, `"http_request_late_transform"`, `"http_request_main"`, `"http_request_sanitize"`, `"http_request_transform"`, `"http_request_origin"`, `"http_response_firewall_managed"`, `"http_response_headers_transform"`, `"magic_transit"`, `"http_ratelimit"`, `"http_request_sbfm"`. | |||
| - `phase` (String) Point in the request/response lifecycle where the ruleset will be created. Available values: `"ddos_l4"`, `"ddos_l7"`, `"http_log_custom_fields"`, `"http_request_firewall_custom"`, `"http_request_firewall_managed"`, `"http_request_late_transform"`, `"http_request_late_transform_managed"`, `"http_request_main"`, `"http_request_origin"`, `"http_request_sanitize"`, `"http_request_transform"`, `"http_response_firewall_managed"`, `"http_response_headers_transform"`, `"magic_transit"`, `"http_ratelimit"`, `"http_request_sbfm"`. | |||
There was a problem hiding this comment.
oh nice! a bump in cloudflare-go automatically gave us updated documentation 🎉
jacobbednarz
reviewed
Jun 9, 2022
| Config: testAccCheckCloudflareManagedHeaders(rnd, zoneID), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| resource.TestCheckResourceAttr(resourceName, "zone_id", zoneID), | ||
| resource.TestCheckResourceAttr(resourceName, "managed_request_headers.#", "1"), |
There was a problem hiding this comment.
Suggested change
| resource.TestCheckResourceAttr(resourceName, "managed_request_headers.#", "1"), | |
| resource.TestCheckResourceAttr(resourceName, "managed_request_headers.#", "4"), |
jacobbednarz
reviewed
Jun 9, 2022
| return nil | ||
| } | ||
|
|
||
| func TestAccCloudflareManagedHeaders(t *testing.T) { |
There was a problem hiding this comment.
this test is failing because all the values are returned from the API (not just the ones you've configured)
TF_ACC=1 go test $(go list ./...) -v -run "^TestAccCloudflareManagedHeaders" -count 1 -parallel 1 -timeout 120m -parallel 1
? github.com/cloudflare/terraform-provider-cloudflare [no test files]
=== RUN TestAccCloudflareManagedHeaders
=== PAUSE TestAccCloudflareManagedHeaders
=== CONT TestAccCloudflareManagedHeaders
resource_cloudflare_managed_headers_test.go:74: Step 1/1 error: Check failed: Check 3/7 error: cloudflare_managed_headers.ynrmlqedsb: Attribute 'managed_request_headers.0.id' expected "add_true_client_ip_headers", got "add_bot_protection_headers"
--- FAIL: TestAccCloudflareManagedHeaders (9.98s)
FAIL
FAIL github.com/cloudflare/terraform-provider-cloudflare/internal/provider 10.468s
? github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/changelog-check [no test files]
? github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/maintainer-only-file-check [no test files]
? github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/tf-log-check [no test files]
? github.com/cloudflare/terraform-provider-cloudflare/version [no test files]
FAIL
make: *** [testacc] Error 1
There was a problem hiding this comment.
Yes, fixed the test
WowVeryLogin
force-pushed
the
ddavydov/add-managed-headers-support
branch
from
1212a06 to
eb3dc55
Compare
jacobbednarz
added
the
workflow/pending-upstream-library
…`enabled` headers Updates the managed headers resource to only manage the enabled headers (instead of all the available headers) and ensure we don't care for the ordering in the API response.
|
CI is now happy with a shimed in cloudflare-go |
jacobbednarz
force-pushed
the
ddavydov/add-managed-headers-support
branch
from
a5ce1ed to
c8295c2
Compare
|
changelog detected ✅ |
|
This functionality has been released in v3.18.0 of the Terraform Cloudflare Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding support of the Managed Headers API. Tests and example resource are present.
Closes #1607