Skip to content

Commit 03757f5

Browse files
authored
fix: update service_account_id output variable (#486)
1 parent 8e23fa1 commit 03757f5

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

modules/instance_template/main.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
# Locals
1919
#########
2020

21+
data "google_service_account" "existing_sa" {
22+
provider = google-beta
23+
count = local.create_service_account == false ? 1 : 0
24+
account_id = google_compute_instance_template.tpl.service_account[0].email
25+
}
26+
2127
locals {
2228
source_image = var.source_image != "" ? var.source_image : "rocky-linux-9-optimized-gcp-v20240111"
2329
source_image_family = var.source_image_family != "" ? var.source_image_family : "rocky-linux-9-optimized-gcp"
@@ -80,7 +86,11 @@ locals {
8086
id = google_service_account.sa[0].account_id,
8187
email = google_service_account.sa[0].email,
8288
member = google_service_account.sa[0].member
83-
} : {}
89+
} : {
90+
id = data.google_service_account.existing_sa[0].account_id,
91+
email = data.google_service_account.existing_sa[0].email,
92+
member = data.google_service_account.existing_sa[0].member
93+
}
8494
}
8595

8696
# Service account

modules/instance_template/metadata.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,11 @@ spec:
365365
version: ^10.0
366366
spec:
367367
outputExpr: "[\"roles/bigquery.dataEditor\"]"
368+
- source:
369+
source: github.com/GoogleCloudPlatform/terraform-google-bigtable
370+
version: ">= 0.1.0"
371+
spec:
372+
outputExpr: "[\"roles/bigtable.admin\"]"
368373
- name: enable_shielded_vm
369374
description: Whether to enable the Shielded VM configuration on the instance. Note that the instance image must support Shielded VMs. See https://cloud.google.com/compute/docs/images
370375
varType: bool

0 commit comments

Comments
 (0)