From 7e1c6845539c25b21eac7e2e1b5906c5f015546e Mon Sep 17 00:00:00 2001
From: nttarun-719 <nttarun@google.com>
Date: Wed, 6 Aug 2025 08:14:34 +0530
Subject: [PATCH 1/2] renaming app hub service id in all the modules

---
 modules/mssql/outputs.tf      | 2 +-
 modules/mysql/outputs.tf      | 2 +-
 modules/postgresql/outputs.tf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/mssql/outputs.tf b/modules/mssql/outputs.tf
index e44e6e96..eff413a0 100644
--- a/modules/mssql/outputs.tf
+++ b/modules/mssql/outputs.tf
@@ -89,7 +89,7 @@ output "primary" {
 output "apphub_service_uri" {
   value = {
     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)
+    service_id  = substr(format("%s-%s", var.name, md5(format("%smssql", 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
index 6e0ec0a2..f3c639b6 100644
--- a/modules/mysql/outputs.tf
+++ b/modules/mysql/outputs.tf
@@ -158,7 +158,7 @@ output "env_vars" {
 output "apphub_service_uri" {
   value = {
     service_uri = "//sqladmin.googleapis.com/projects${element(split("/projects", google_sql_database_instance.default.self_link), 1)}"
-    service_id  = substr("${var.name}-${md5("${var.region}-${var.project_id}")}", 0, 63)
+    service_id  = substr("${var.name}-${md5("mysql-${var.region}-${var.project_id}")}", 0, 63)
     location    = var.region
   }
   description = "Service URI in CAIS style to be used by Apphub."
diff --git a/modules/postgresql/outputs.tf b/modules/postgresql/outputs.tf
index 2d1b28b0..38b15f05 100644
--- a/modules/postgresql/outputs.tf
+++ b/modules/postgresql/outputs.tf
@@ -162,7 +162,7 @@ output "env_vars" {
 output "apphub_service_uri" {
   value = {
     service_uri = "//sqladmin.googleapis.com/projects${element(split("/projects", google_sql_database_instance.default.self_link), 1)}"
-    service_id  = substr("${var.name}-${md5("${var.region}-${var.project_id}")}", 0, 63)
+    service_id  = substr("${var.name}-${md5("postgresql-${var.region}-${var.project_id}")}", 0, 63)
     location    = var.region
   }
   description = "Service URI in CAIS style to be used by Apphub."

From 82950354eafe888696ca9225c8ffc618fc9b915d Mon Sep 17 00:00:00 2001
From: nttarun-719 <nttarun@google.com>
Date: Mon, 11 Aug 2025 12:51:07 +0530
Subject: [PATCH 2/2] renmaing mssql apphub service id

---
 modules/mssql/outputs.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mssql/outputs.tf b/modules/mssql/outputs.tf
index eff413a0..4a143876 100644
--- a/modules/mssql/outputs.tf
+++ b/modules/mssql/outputs.tf
@@ -89,7 +89,7 @@ output "primary" {
 output "apphub_service_uri" {
   value = {
     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(format("%smssql", var.project_id))), 0, 63)
+    service_id  = substr("${var.name}-${md5("mssql-${var.region}-${var.project_id}")}", 0, 63)
   }
   description = "Service URI in CAIS style to be used by Apphub."
 }