fix: Use provided gcp_given_name for workload identity (terraform-google-modules#1003)

morgante · web-flow · commit d72e59510f9b · 2021-09-17T13:42:00.000-04:00
Fixes terraform-google-modules#1002
diff --git a/modules/workload-identity/main.tf b/modules/workload-identity/main.tf
@@ -32,7 +32,7 @@ locals {
 data "google_service_account" "cluster_service_account" {
   count = var.use_existing_gcp_sa ? 1 : 0
 
-  account_id = var.name
+  account_id = local.gcp_given_name
   project    = var.project_id
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ locals {`
`32`	`32`	`data "google_service_account" "cluster_service_account" {`
`33`	`33`	`count = var.use_existing_gcp_sa ? 1 : 0`
`34`	`34`
`35`		`- account_id = var.name`
	`35`	`+ account_id = local.gcp_given_name`
`36`	`36`	`project = var.project_id`
`37`	`37`	`}`
`38`	`38`