Merge branch 'main' into bug-380087742

glasnt · web-flow · commit db6515047bd7 · 2024-12-20T08:24:30.000+11:00
diff --git a/application_integration/provision_region/main.tf b/application_integration/provision_region/main.tf
@@ -48,9 +48,9 @@ resource "google_integrations_client" "example" {
   run_as_service_account     = google_service_account.default.email
   cloud_kms_config {
     kms_location   = "us-east1"
-    kms_ring       = google_kms_key_ring.default.id
-    key            = google_kms_crypto_key.default.id
-    key_version    = google_kms_crypto_key_version.default.id
+    kms_ring       = basename(google_kms_key_ring.default.id)
+    key            = basename(google_kms_crypto_key.default.id)
+    key_version    = basename(google_kms_crypto_key_version.default.id)
     kms_project_id = data.google_project.default.project_id
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ resource "google_integrations_client" "example" {`
`48`	`48`	`run_as_service_account = google_service_account.default.email`
`49`	`49`	`cloud_kms_config {`
`50`	`50`	`kms_location = "us-east1"`
`51`		`- kms_ring = google_kms_key_ring.default.id`
`52`		`- key = google_kms_crypto_key.default.id`
`53`		`- key_version = google_kms_crypto_key_version.default.id`
	`51`	`+ kms_ring = basename(google_kms_key_ring.default.id)`
	`52`	`+ key = basename(google_kms_crypto_key.default.id)`
	`53`	`+ key_version = basename(google_kms_crypto_key_version.default.id)`
`54`	`54`	`kms_project_id = data.google_project.default.project_id`
`55`	`55`	`}`
`56`	`56`	`}`