fix permadiff issue in google_cloudfunctions2_function service_config.environment_variables (#11333) (#19024)

modular-magician · web-flow · commit 3c25c2d0814b · 2024-08-07T09:37:22.000-07:00
[upstream:941065fec9456e7eeba0199f99066213434a2c68]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/11333.txt b/.changelog/11333.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cloudfunctions2: fixed a "Provider produced inconsistent final plan" bug affecting the `service_config.environment_variables` field in `google_cloudfunctions2_function` resource
+```
diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function.go
@@ -367,6 +367,7 @@ supplied the value is interpreted as bytes.`,
 						},
 						"environment_variables": {
 							Type:             schema.TypeMap,
+							Computed:         true,
 							Optional:         true,
 							DiffSuppressFunc: environmentVariablesDiffSuppress,
 							Description:      `Environment variables that shall be available during function execution.`,
diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go
@@ -185,7 +185,8 @@ resource "google_cloudfunctions2_function" "function" {
     max_instance_request_concurrency = 80
     available_cpu = "4"
     environment_variables = {
-        SERVICE_CONFIG_TEST = "config_test"
+        SERVICE_CONFIG_TEST      = "config_test"
+        SERVICE_CONFIG_DIFF_TEST = google_service_account.account.email
     }
     ingress_settings = "ALLOW_INTERNAL_ONLY"
     all_traffic_on_latest_revision = true
diff --git a/website/docs/r/cloudfunctions2_function.html.markdown b/website/docs/r/cloudfunctions2_function.html.markdown
@@ -125,7 +125,8 @@ resource "google_cloudfunctions2_function" "function" {
     max_instance_request_concurrency = 80
     available_cpu = "4"
     environment_variables = {
-        SERVICE_CONFIG_TEST = "config_test"
+        SERVICE_CONFIG_TEST      = "config_test"
+        SERVICE_CONFIG_DIFF_TEST = google_service_account.account.email
     }
     ingress_settings = "ALLOW_INTERNAL_ONLY"
     all_traffic_on_latest_revision = true

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+cloudfunctions2: fixed a "Provider produced inconsistent final plan" bug affecting the `service_config.environment_variables` field in `google_cloudfunctions2_function` resource
	`3`	+```