Skip to content

Commit 580c5dd

Browse files
authored
Merge pull request #153 from thefirstofthe300/ds/stabilize-plan
Stablize default service account in plan
2 parents c4bfa04 + 8f30fa9 commit 580c5dd

File tree

1 file changed

+7
-7
lines changed
  • modules/core_project_factory

1 file changed

+7
-7
lines changed

modules/core_project_factory/main.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,26 @@ resource "google_compute_shared_vpc_service_project" "shared_vpc_attachment" {
135135
/******************************************
136136
Default compute service account retrieval
137137
*****************************************/
138-
data "google_compute_default_service_account" "default" {
139-
project = "${google_project.main.id}"
140-
141-
depends_on = ["google_project_service.project_services"]
138+
data "null_data_source" "default_service_account" {
139+
inputs = {
140+
email = "${google_project.main.number}[email protected]"
141+
}
142142
}
143143

144144
/******************************************
145145
Default compute service account deletion
146146
*****************************************/
147147
resource "null_resource" "delete_default_compute_service_account" {
148148
provisioner "local-exec" {
149-
command = "${path.module}/scripts/delete-service-account.sh ${local.project_id} ${var.credentials_path} ${data.google_compute_default_service_account.default.id}"
149+
command = "${path.module}/scripts/delete-service-account.sh ${local.project_id} ${var.credentials_path} ${data.null_data_source.default_service_account.outputs["email"]}"
150150
}
151151

152152
triggers {
153-
default_service_account = "${data.google_compute_default_service_account.default.id}"
153+
default_service_account = "${data.null_data_source.default_service_account.outputs["email"]}"
154154
activated_apis = "${join(",", var.activate_apis)}"
155155
}
156156

157-
depends_on = ["google_project_service.project_services", "data.google_compute_default_service_account.default"]
157+
depends_on = ["google_project_service.project_services"]
158158
}
159159

160160
/******************************************

0 commit comments

Comments
 (0)