Skip to content

Commit 13ec49f

Browse files
bharathkkbapeabody
andauthored
fix: workaround for import issue when SA is unknown (#795)
Co-authored-by: Andrew Peabody <[email protected]>
1 parent de977f5 commit 13ec49f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/core_project_factory/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ locals {
4444
) : local.base_project_id
4545
s_account_fmt = var.create_project_sa ? format(
4646
"serviceAccount:%s",
47-
google_service_account.default_service_account[0].email,
47+
try(google_service_account.default_service_account[0].email, ""),
4848
) : ""
4949
api_s_account = format(
5050

modules/core_project_factory/outputs.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ output "project_number" {
3737
}
3838

3939
output "service_account_id" {
40-
value = var.create_project_sa ? google_service_account.default_service_account[0].account_id : ""
40+
value = var.create_project_sa ? try(google_service_account.default_service_account[0].account_id, "") : ""
4141
description = "The id of the default service account"
4242
}
4343

4444
output "service_account_display_name" {
45-
value = var.create_project_sa ? google_service_account.default_service_account[0].display_name : ""
45+
value = var.create_project_sa ? try(google_service_account.default_service_account[0].display_name, "") : ""
4646
description = "The display name of the default service account"
4747
}
4848

4949
output "service_account_email" {
50-
value = var.create_project_sa ? google_service_account.default_service_account[0].email : ""
50+
value = var.create_project_sa ? try(google_service_account.default_service_account[0].email, "") : ""
5151
description = "The email of the default service account"
5252
}
5353

5454
output "service_account_name" {
55-
value = var.create_project_sa ? google_service_account.default_service_account[0].name : ""
55+
value = var.create_project_sa ? try(google_service_account.default_service_account[0].name, "") : ""
5656
description = "The fully-qualified name of the default service account"
5757
}
5858

5959
output "service_account_unique_id" {
60-
value = var.create_project_sa ? google_service_account.default_service_account[0].unique_id : ""
60+
value = var.create_project_sa ? try(google_service_account.default_service_account[0].unique_id, "") : ""
6161
description = "The unique id of the default service account"
6262
}
6363

0 commit comments

Comments
 (0)