Merge pull request #19 from remerge/fix-missing-default-service-account

Fix support for missing default service account
remerge · Nov 6, 2023 · ca0cc22 · ca0cc22
2 parents 1341874 + ace0123
commit ca0cc22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/google/compute/template/main.tf b/google/compute/template/main.tf
@@ -1,9 +1,10 @@
 data "google_compute_default_service_account" "default" {
+  count   = var.service_account == null ? 1 : 0
   project = var.project
 }
 
 locals {
-  service_account = coalesce(var.service_account, data.google_compute_default_service_account.default.email)
+  service_account = coalesce(var.service_account, try(data.google_compute_default_service_account.default[0].email, null))
 }
 
 resource "google_compute_instance_template" "default" {

diff --git a/okta/pam/project/main.tf b/okta/pam/project/main.tf
@@ -30,11 +30,12 @@ resource "google_secret_manager_secret_version" "okta_enrollment_token" {
 }
 
 data "google_compute_default_service_account" "default" {
+  count   = var.service_account == null ? 1 : 0
   project = var.project
 }
 
 locals {
-  service_account = coalesce(var.service_account, data.google_compute_default_service_account.default.email)
+  service_account = coalesce(var.service_account, try(data.google_compute_default_service_account.default[0].email, null))
 }
 
 resource "google_secret_manager_secret_iam_member" "okta_enrollment_token" {