fix: WI GCP SA output (terraform-google-modules#1009)

bharathkkb · web-flow · commit b431aa5d7dc1 · 2021-09-27T22:44:19.000-05:00
* fix: WI GCP SA output

* exercise op in example
diff --git a/examples/workload_identity/outputs.tf b/examples/workload_identity/outputs.tf
@@ -56,7 +56,7 @@ output "cluster_name" {
 # Default instantiation of WI module
 output "default_wi_email" {
   description = "GCP service account."
-  value       = module.workload_identity.gcp_service_account_email
+  value       = module.workload_identity.gcp_service_account.email
 }
 
 output "default_wi_ksa_name" {
diff --git a/modules/workload-identity/output.tf b/modules/workload-identity/output.tf
@@ -41,5 +41,5 @@ output "gcp_service_account_name" {
 
 output "gcp_service_account" {
   description = "GCP service account."
-  value       = data.google_service_account.cluster_service_account
+  value       = var.use_existing_gcp_sa ? data.google_service_account.cluster_service_account[0] : google_service_account.cluster_service_account[0]
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ output "cluster_name" {`
`56`	`56`	`# Default instantiation of WI module`
`57`	`57`	`output "default_wi_email" {`
`58`	`58`	`description = "GCP service account."`
`59`		`- value = module.workload_identity.gcp_service_account_email`
	`59`	`+ value = module.workload_identity.gcp_service_account.email`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`output "default_wi_ksa_name" {`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ output "gcp_service_account_name" {`
`41`	`41`
`42`	`42`	`output "gcp_service_account" {`
`43`	`43`	`description = "GCP service account."`
`44`		`- value = data.google_service_account.cluster_service_account`
	`44`	`+ value = var.use_existing_gcp_sa ? data.google_service_account.cluster_service_account[0] : google_service_account.cluster_service_account[0]`
`45`	`45`	`}`