From a3e8f5391bb762bbda1684fd00869b0f9bd7462d Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 15 Feb 2021 18:15:20 +0100 Subject: [PATCH] Avoid data sources in in gcs-to-bq-with-dataflow example --- .../gcs-to-bq-with-dataflow/main.tf | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/data-solutions/gcs-to-bq-with-dataflow/main.tf b/data-solutions/gcs-to-bq-with-dataflow/main.tf index 6337bd4e..f67db64d 100644 --- a/data-solutions/gcs-to-bq-with-dataflow/main.tf +++ b/data-solutions/gcs-to-bq-with-dataflow/main.tf @@ -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}", ] }, }