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

Jump to bottom

provider/fastly Changes setting conditionals to optional #14103

Merged
merged 2 commits into from
May 1, 2017
Merged

provider/fastly Changes setting conditionals to optional #14103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3489795
Makes request condition optional for fastly request settings
travertischio Apr 30, 2017
041d5a3
Makes cache setting condition optional in fastly service
travertischio Apr 30, 2017
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
18 changes: 10 additions & 8 deletions builtin/providers/fastly/resource_fastly_service_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,17 +318,18 @@ func resourceServiceV1() *schema.Resource {
Required: true,
Description: "A name to refer to this Cache Setting",
},
"cache_condition": {
Type: schema.TypeString,
Required: true,
Description: "Name of a condition to check if this Cache Setting applies",
},
"action": {
Type: schema.TypeString,
Optional: true,
Description: "Action to take",
},
// optional
"cache_condition": {
Type: schema.TypeString,
Optional: true,
Default: "",
Description: "Name of a condition to check if this Cache Setting applies",
},
"stale_ttl": {
Type: schema.TypeInt,
Optional: true,
Expand Down Expand Up @@ -776,12 +777,13 @@ func resourceServiceV1() *schema.Resource {
Required: true,
Description: "Unique name to refer to this Request Setting",
},
// Optional fields
"request_condition": {
Type: schema.TypeString,
Required: true,
Description: "Name of a request condition to apply.",
Optional: true,
Default: "",
Description: "Name of a request condition to apply. If there is no condition this setting will always be applied.",
},
// Optional fields
"max_stale_age": {
Type: schema.TypeInt,
Optional: true,
Expand Down
4 changes: 2 additions & 2 deletions website/source/docs/providers/fastly/r/service_v1.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ The `cache_setting` block supports:
* `name` - (Required) Unique name for this Cache Setting.
* `action` - (Required) One of `cache`, `pass`, or `restart`, as defined
on Fastly's documentation under ["Caching action descriptions"](https://docs.fastly.com/guides/performance-tuning/controlling-caching#caching-action-descriptions).
* `cache_condition` - (Required) Name of already defined `condition` used to test whether this settings object should be used. This `condition` must be of type `CACHE`.
* `cache_condition` - (Optional) Name of already defined `condition` used to test whether this settings object should be used. This `condition` must be of type `CACHE`.
* `stale_ttl` - (Optional) Max "Time To Live" for stale (unreachable) objects.
Default `300`.
* `ttl` - (Optional) The Time-To-Live (TTL) for the object.
Expand Down Expand Up @@ -263,7 +263,7 @@ The `request_setting` block allow you to customize Fastly's request handling, by
defining behavior that should change based on a predefined `condition`:

* `name` - (Required) The domain for this request setting.
* `request_condition` - (Required) Name of already defined `condition` to
* `request_condition` - (Optional) Name of already defined `condition` to
determine if this request setting should be applied.
* `max_stale_age` - (Optional) How old an object is allowed to be to serve
`stale-if-error` or `stale-while-revalidate`, in seconds. Default `60`.
Expand Down