fixes: permadiff issue if event trigger region is not specified (#9989) (#6991)

modular-magician · web-flow · commit 51f64700f4e5 · 2024-02-20T11:57:13.000-08:00
* fixes: permadiff issue if event trigger region is not specified - fixes hashicorp/terraform-provider-google#17161 * chore: Updated cloudfunction2 test with no explicit trigger_region [upstream:02e719917fd193513b3e580493a2df4e051cafc9] Signed-off-by: Modular Magician <magic-modules@google.com>
diff --git a/.changelog/9989.txt b/.changelog/9989.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cloudfunctions2: fixed an issue where not specifying `event_config.trigger_region` in `google_cloudfunctions2_function` resulted in a permanent diff. The field now pulls a default value from the API when unset.
+```
diff --git a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function.go
@@ -257,6 +257,7 @@ Compute Engine default service account: {project_number}-compute@developer.gserv
 						},
 						"trigger_region": {
 							Type:     schema.TypeString,
+							Computed: true,
 							Optional: true,
 							Description: `The region that the trigger will be in. The trigger will only receive
 events originating in this region. It can be the same
diff --git a/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google-beta/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go
@@ -330,7 +330,6 @@ resource "google_cloudfunctions2_function" "function" {
   }
 
   event_trigger {
-    trigger_region = "us-central1" # The trigger must be in the same location as the bucket
     event_type = "google.cloud.storage.object.v1.finalized"
     retry_policy = "RETRY_POLICY_RETRY"
     service_account_email = google_service_account.account.email
diff --git a/website/docs/r/cloudfunctions2_function.html.markdown b/website/docs/r/cloudfunctions2_function.html.markdown
@@ -323,7 +323,6 @@ resource "google_cloudfunctions2_function" "function" {
   }
 
   event_trigger {
-    trigger_region = "us-central1" # The trigger must be in the same location as the bucket
     event_type = "google.cloud.storage.object.v1.finalized"
     retry_policy = "RETRY_POLICY_RETRY"
     service_account_email = google_service_account.account.email

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+cloudfunctions2: fixed an issue where not specifying `event_config.trigger_region` in `google_cloudfunctions2_function` resulted in a permanent diff. The field now pulls a default value from the API when unset.
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,6 @@ resource "google_cloudfunctions2_function" "function" {`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`event_trigger {`
`333`		`- trigger_region = "us-central1" # The trigger must be in the same location as the bucket`
`334`	`333`	`event_type = "google.cloud.storage.object.v1.finalized"`
`335`	`334`	`retry_policy = "RETRY_POLICY_RETRY"`
`336`	`335`	`service_account_email = google_service_account.account.email`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,6 @@ resource "google_cloudfunctions2_function" "function" {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`event_trigger {`
`326`		`- trigger_region = "us-central1" # The trigger must be in the same location as the bucket`
`327`	`326`	`event_type = "google.cloud.storage.object.v1.finalized"`
`328`	`327`	`retry_policy = "RETRY_POLICY_RETRY"`
`329`	`328`	`service_account_email = google_service_account.account.email`