From 20935bbda898830d21cf7bd561b1c863fadaa7b3 Mon Sep 17 00:00:00 2001
From: amanpruthi <aman.pruthi@velotio.com>
Date: Thu, 11 Jul 2024 11:17:59 +0530
Subject: [PATCH] Added namespace as a prefix

---
 modules/service_accounts/main.tf | 4 ++--
 variables.tf                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/service_accounts/main.tf b/modules/service_accounts/main.tf
index eddd1689..35594ab6 100644
--- a/modules/service_accounts/main.tf
+++ b/modules/service_accounts/main.tf
@@ -65,7 +65,7 @@ resource "google_project_iam_member" "secretmanager_admin" {
 ####### service account for kms and gcs cross project access
 resource "google_service_account" "kms_gcs_sa" {
   count        = var.create_workload_identity == true ? 1 : 0
-  account_id   = var.kms_gcs_sa_name
+  account_id   = substr("kms-gcs-${random_id.main.hex}", 0, 30)
   display_name = "Service Account For Workload Identity"
 }
 
@@ -132,7 +132,7 @@ resource "google_service_account_iam_member" "workload_binding" {
 ### service account for stackdriver
 resource "google_service_account" "stackdriver" {
   count        = var.enable_stackdriver == true ? 1 : 0
-  account_id   = var.stackdriver_sa_name
+  account_id   = substr("stackdriver-${random_id.main.hex}", 0, 30)
   display_name = "Service Account For Workload Identity"
 }
 
diff --git a/variables.tf b/variables.tf
index da4a536b..fb5c05c7 100644
--- a/variables.tf
+++ b/variables.tf
@@ -295,7 +295,7 @@ variable "ilb_proxynetwork_cidr" {
 variable "create_workload_identity" {
   description = "Flag to indicate whether to create a workload identity for the service account."
   type        = bool
-  default     = true
+  default     = false
 }
 
 variable "kms_gcs_sa_name" {
@@ -305,7 +305,7 @@ variable "kms_gcs_sa_name" {
 
 variable "enable_stackdriver" {
   type = bool
-  default = true
+  default = false
 }
 
 variable "stackdriver_sa_name" {