extract apphub uri from self_link instead of interpolating.

terraform-google-modules · Oct 21, 2024 · 4188ede · 4188ede
1 parent 45ab601
commit 4188ede
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/mssql/outputs.tf b/modules/mssql/outputs.tf
@@ -88,7 +88,7 @@ output "primary" {
 
 output "apphub_service_uri" {
   value = {
-    service_uri = "//cloudsql.googleapis.com/projects/${var.project_id}/instances/${var.name}"
+    service_uri = "//cloudsql.googleapis.com/projects${element(split("/projects", google_sql_database_instance.default.self_link), 1)}"
     service_id  = substr(format("%s-%s", var.name, md5(var.project_id)), 0, 63)
   }
   description = "Service URI in CAIS style to be used by Apphub."

diff --git a/modules/mysql/outputs.tf b/modules/mysql/outputs.tf
@@ -157,7 +157,7 @@ output "env_vars" {
 
 output "apphub_service_uri" {
   value = {
-    service_uri = "//cloudsql.googleapis.com/projects/${var.project_id}/instances/${var.name}"
+    service_uri = "//cloudsql.googleapis.com/projects${element(split("/projects", google_sql_database_instance.default.self_link), 1)}"
     service_id  = substr(format("%s-%s", var.name, md5(var.project_id)), 0, 63)
   }
   description = "Service URI in CAIS style to be used by Apphub."

diff --git a/modules/postgresql/outputs.tf b/modules/postgresql/outputs.tf
@@ -155,7 +155,7 @@ output "env_vars" {
 
 output "apphub_service_uri" {
   value = {
-    service_uri = "//cloudsql.googleapis.com/projects/${var.project_id}/instances/${var.name}"
+    service_uri = "//cloudsql.googleapis.com/projects${element(split("/projects", google_sql_database_instance.default.self_link), 1)}"
     service_id  = substr(format("%s-%s", var.name, md5(var.project_id)), 0, 63)
   }
   description = "Service URI in CAIS style to be used by Apphub."