Added customer name as a variable

main.tf

@@ -36,6 +36,7 @@ module "service_accounts" {
   create_workload_identity = var.create_workload_identity
   stackdriver_sa_name      = var.stackdriver_sa_name
   enable_stackdriver       = var.enable_stackdriver
+  customer_name            = var.customer_name
   depends_on               = [module.project_factory_project_services]
 }
 

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   = substr("kms-gcs-${random_id.main.hex}", 0, 30)
+  account_id   = substr("kms-gcs-${var.customer_name}-${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   = substr("stackdriver-${random_id.main.hex}", 0, 30)
+  account_id   = substr("stackdriver-${var.customer_name}-${random_id.main.hex}", 0, 30)
   display_name = "Service Account For Workload Identity"
 }
 

modules/service_accounts/variables.tf

@@ -28,3 +28,7 @@ variable "enable_stackdriver" {
   description = "Flag to indicate whether to enable workload identity for the service account."
   type        = bool
 }
+
+variable "customer_name" {
+  type = string
+}

variables.tf

@@ -313,3 +313,8 @@ variable "stackdriver_sa_name" {
   default = "wandb-stackdriver"
 }
 
+variable "customer_name" {
+  description = "Customer name for identifying service accounts"
+  type = string
+  default = "wandb"
+}