zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jccb/squid-update

This commit is contained in:
Julio Castillo 2021-02-15 18:17:34 +01:00
parent abf61fa7e2 a3e8f5391b
commit 884da47f21
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data-solutions/gcs-to-bq-with-dataflow/main.tf
View File

@ -100,13 +100,13 @@ module "service-account-df" {
}
}
data "google_bigquery_default_service_account" "bq_sa" {
project = module.project-service.project_id
}
# data "google_bigquery_default_service_account" "bq_sa" {
# project = module.project-service.project_id
# }
data "google_storage_project_service_account" "gcs_account" {
project = module.project-service.project_id
}
# data "google_storage_project_service_account" "gcs_account" {
# project = module.project-service.project_id
# }
###############################################################################
# KMS #
@ -128,15 +128,14 @@ module "kms" {
},
key-gcs = {
"roles/cloudkms.cryptoKeyEncrypterDecrypter" = [
#"serviceAccount:${module.project-service.service_accounts.robots.storage}",
"serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"
"serviceAccount:${module.project-service.service_accounts.robots.storage}",
#"serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"
]
},
key-bq = {
"roles/cloudkms.cryptoKeyEncrypterDecrypter" = [
# TODO: Find a better place to store BQ service account
#"serviceAccount:${module.project-service.service_accounts.default.bq}",
"serviceAccount:${data.google_bigquery_default_service_account.bq_sa.email}",
"serviceAccount:${module.project-service.service_accounts.default.bq}",
#"serviceAccount:${data.google_bigquery_default_service_account.bq_sa.email}",
]
},
}