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

Page rule additions #68

Closed
wants to merge 31 commits into from
Closed

Page rule additions #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9c362a5
add resolve_override page_rule action
SteveGoldthorpe-Work May 15, 2018
4215d73
Merge pull request #2 from SteveGoldthorpe-WDFC/add-page-rule-resolve…
SteveGoldthorpe-Work May 15, 2018
1bd5f6a
add host_header_override page_rule action
SteveGoldthorpe-Work May 15, 2018
6c578de
add doc for resolve_override
SteveGoldthorpe-Work May 15, 2018
a143bdd
Merge branch 'testing' into add-page-rule-host_header_override
SteveGoldthorpe-Work May 15, 2018
8b9f728
Merge pull request #3 from SteveGoldthorpe-WDFC/add-page-rule-resolve…
SteveGoldthorpe-Work May 15, 2018
e5bc508
Merge branch 'testing' into add-page-rule-host_header_override
SteveGoldthorpe-Work May 15, 2018
e04425c
Merge pull request #4 from SteveGoldthorpe-WDFC/add-page-rule-host_he…
SteveGoldthorpe-Work May 15, 2018
6f63e36
missing bracket after merge conflict
SteveGoldthorpe-Work May 15, 2018
6a6fe25
Merge pull request #5 from SteveGoldthorpe-WDFC/add-page-rule-host_he…
SteveGoldthorpe-Work May 15, 2018
2984ddc
fix typo and go fmt
SteveGoldthorpe-Work May 15, 2018
d38ec12
go fmt
SteveGoldthorpe-Work May 15, 2018
7a91da4
Merge branch 'testing' into add-page-rule-resolve_override
SteveGoldthorpe-Work May 15, 2018
653a17a
Merge pull request #6 from SteveGoldthorpe-WDFC/add-page-rule-resolve…
SteveGoldthorpe-Work May 15, 2018
6635b10
Merge pull request #7 from SteveGoldthorpe-WDFC/add-page-rule-host_he…
SteveGoldthorpe-Work May 15, 2018
6f7d40a
add bypass_cache_on_cookie page_rule action
SteveGoldthorpe-Work May 15, 2018
c9ed559
restore automatic_https_rewrites comment
SteveGoldthorpe-Work May 15, 2018
e56ae80
Merge branch 'testing' into add-page-rule-bypass_cache_on_cookie
SteveGoldthorpe-Work May 15, 2018
42fa463
Merge pull request #8 from SteveGoldthorpe-WDFC/add-page-rule-bypass_…
SteveGoldthorpe-Work May 15, 2018
c9aeba9
page_rules status is active or disabled not paused
SteveGoldthorpe-Work May 15, 2018
354ee2b
Merge pull request #9 from SteveGoldthorpe-WDFC/fix-page-rule-disabled
SteveGoldthorpe-Work May 15, 2018
8c2f141
add waf page rule
SteveGoldthorpe-Work May 31, 2018
02e7302
Merge pull request #10 from SteveGoldthorpe-Work/add-page-rule-waf
SteveGoldthorpe-Work May 31, 2018
e8baece
add doc for waf page rule keyword
SteveGoldthorpe-Work May 31, 2018
bc26ab3
Merge pull request #11 from SteveGoldthorpe-Work/add-page-rule-waf
SteveGoldthorpe-Work May 31, 2018
613e0b1
Support explicit_cache_control action
simpson-ross Jun 14, 2018
d2e4251
Add missing security_level value
simpson-ross Jun 20, 2018
29e3643
Add cache_key to pageRuleAPIStringFields
simonexmachina Jun 21, 2018
1ac9e50
Add boolean sort_query_string_for_cache action
simpson-ross Jun 21, 2018
167db52
Add origin_error_page_pass_thru and true_client_ip_header boolean act…
simpson-ross Jun 21, 2018
6d60fe6
Add mirage and disable_railgun actions
simpson-ross Jun 21, 2018
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 cloudflare/resource_cloudflare_page_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func resourceCloudFlarePageRule() *schema.Resource {
"security_level": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{"essentially_off", "low", "medium", "high", "under_attack"}, false),
ValidateFunc: validation.StringInSlice([]string{"off", "essentially_off", "low", "medium", "high", "under_attack"}, false),
},

"ssl": {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/page_rule.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Action blocks support the following:
* `host_header_override` - (Optional) The Host Header to override on the origin servers.
* `resolve_override` - (Optional) Override the origin server with this host.
* `rocket_loader` - (Optional) Whether to set the rocket loader to `"off"`, `"manual"`, or `"automatic"`.
* `security_level` - (Optional) Whether to set the security level to `"essentially_off"`, `"low"`, `"medium"`, `"high"`, or `"under_attack"`.
* `security_level` - (Optional) Whether to set the security level to `"off"`, `"essentially_off"`, `"low"`, `"medium"`, `"high"`, or `"under_attack"`.
Copy link
Member

Choose a reason for hiding this comment

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

"off" is an enterprise only feature - do we need to make note of this somewhere? Or just rely on the API to return sane error messages if it isn't available?

Copy link
Author

Choose a reason for hiding this comment

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

I don't think it's the responsibility of the provider to know or care about a customer's contract type with Cloudflare. The API should just To The Right Thing ™️ if a user without appropriate permissions tries to use it.

* `ssl` - (Optional) Whether to set the SSL mode to `"off"`, `"flexible"`, `"full"`, or `"strict"`.
* `waf` - (Optional) Whether this action is `"on"` or `"off"`.

Expand Down