Skip to content

Remove google_cloudfunctions_function.retry_on_failure #2392

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

Merged
merged 1 commit into from
Nov 2, 2018
Merged

Remove google_cloudfunctions_function.retry_on_failure #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 5 additions & 25 deletions google/resource_cloudfunctions_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func resourceCloudFunctionsFunction() *schema.Resource {
Type: schema.TypeList,
Optional: true,
Computed: true,
ConflictsWith: []string{"trigger_http", "retry_on_failure", "trigger_topic", "trigger_http"},
ConflictsWith: []string{"trigger_http"},
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -245,11 +245,10 @@ func resourceCloudFunctionsFunction() *schema.Resource {
},

"retry_on_failure": {
Type: schema.TypeBool,
Optional: true,
Computed: true,
Deprecated: "This field is deprecated. Use `event_trigger.failure_policy.retry` instead.",
ConflictsWith: []string{"trigger_http"},
Type: schema.TypeBool,
Optional: true,
Computed: true,
Removed: "This field is removed. Use `event_trigger.failure_policy.retry` instead.",
},

"project": {
Expand Down Expand Up @@ -404,12 +403,6 @@ func resourceCloudFunctionsRead(d *schema.ResourceData, meta interface{}) error
}

d.Set("event_trigger", flattenEventTrigger(function.EventTrigger))
if function.EventTrigger != nil {
if _, ok := d.GetOk("retry_on_failure"); ok {
retry := function.EventTrigger.FailurePolicy != nil && function.EventTrigger.FailurePolicy.Retry != nil
d.Set("retry_on_failure", retry)
}
}

d.Set("region", cloudFuncId.Region)
d.Set("project", cloudFuncId.Project)
Expand Down Expand Up @@ -476,19 +469,6 @@ func resourceCloudFunctionsUpdate(d *schema.ResourceData, meta interface{}) erro
updateMaskArr = append(updateMaskArr, "environment_variables")
}

// Event trigger will run after failure policy and take precedence
if d.HasChange("retry_on_failure") {
if d.Get("retry_on_failure").(bool) {
if function.EventTrigger == nil {
function.EventTrigger = &cloudfunctions.EventTrigger{}
}
function.EventTrigger.FailurePolicy = &cloudfunctions.FailurePolicy{
Retry: &cloudfunctions.Retry{},
}
}
updateMaskArr = append(updateMaskArr, "eventTrigger.failurePolicy.retry")
}

if d.HasChange("event_trigger") {
function.EventTrigger = expandEventTrigger(d.Get("event_trigger").([]interface{}), project)
updateMaskArr = append(updateMaskArr, "eventTrigger", "eventTrigger.failurePolicy.retry")
Expand Down
3 changes: 0 additions & 3 deletions website/docs/r/cloudfunctions_function.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ The following arguments are supported:

* `environment_variables` - (Optional) A set of key/value environment variable pairs to assign to the function.

* `retry_on_failure` - (Optional) Whether the function should be retried on failure. This only applies to bucket and topic triggers, not HTTPS triggers.
Deprecated. Use `event_trigger.failure_policy.retry` instead.

The `event_trigger` block supports:

* `event_type` - (Required) The type of event to observe. For example: `"providers/cloud.storage/eventTypes/object.change"`
Expand Down