public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Add support for new-style cloud functions triggers. (#2412)

Browse Source 
<!-- This change is generated by MagicModules. -->
/cc @rileykarson
This commit is contained in:
The Magician 2018-11-06 09:30:19 -08:00 committed by Nathan McKinley
parent 98e52f0161
commit 1ecab9556a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
google/resource_cloudfunctions_function.go
View File

@ -607,6 +607,11 @@ func expandEventTrigger(configured []interface{}, project string) *cloudfunction
eventType := data["event_type"].(string)
shape := ""
switch {
case strings.HasPrefix(eventType, "google.storage.object."):
shape = "projects/%s/buckets/%s"
case strings.HasPrefix(eventType, "google.pubsub.topic."):
shape = "projects/%s/topics/%s"
// Legacy style triggers
case strings.HasPrefix(eventType, "providers/cloud.storage/eventTypes/"):
shape = "projects/%s/buckets/%s"
case strings.HasPrefix(eventType, "providers/cloud.pubsub/eventTypes/"):

4
google/resource_cloudfunctions_function_test.go
View File

@ -637,7 +637,7 @@ resource "google_cloudfunctions_function" "function" {
timeout = 61
entry_point = "helloGCS"
event_trigger {
event_type = "providers/cloud.storage/eventTypes/object.change"
event_type = "google.storage.object.finalize"
resource = "${google_storage_bucket.bucket.name}"
failure_policy {
retry = true
@ -667,7 +667,7 @@ resource "google_cloudfunctions_function" "function" {
timeout = 61
entry_point = "helloGCS"
event_trigger {
event_type = "providers/cloud.storage/eventTypes/object.change"
event_type = "google.storage.object.finalize"
resource = "${google_storage_bucket.bucket.name}"
}
}`, bucketName, zipFilePath, functionName)

8
website/docs/r/cloudfunctions_function.html.markdown
View File

@ -85,9 +85,11 @@ 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"`
and `"providers/cloud.pubsub/eventTypes/topic.publish"`. See the documentation on [calling Cloud Functions](https://cloud.google.com/functions/docs/calling/)
for a full reference. Only Cloud Storage and Cloud Pub/Sub triggers are supported at this time.
* `event_type` - (Required) The type of event to observe. For example: `"google.storage.object.finalize"`.
See the documentation on [calling Cloud Functions](https://cloud.google.com/functions/docs/calling/) for a full reference.
Only Cloud Storage and Cloud Pub/Sub triggers are supported at this time.
Legacy Cloud Storage and Cloud Pub/Sub triggers are also supported, such as `"providers/cloud.storage/eventTypes/object.change"`
and `"providers/cloud.pubsub/eventTypes/topic.publish"`.
* `resource` - (Required) Required. The name of the resource from which to observe events, for example, `"myBucket"`