From f1a404a5d4381dfe9c99571083c89845bbfb5135 Mon Sep 17 00:00:00 2001 From: Lorenzo Caggioni Date: Mon, 4 Apr 2022 15:38:36 +0200 Subject: [PATCH] PR review fixes. --- .../data-solutions/data-platform-foundations/03-composer.tf | 2 +- examples/data-solutions/data-platform-foundations/06-common.tf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/data-solutions/data-platform-foundations/03-composer.tf b/examples/data-solutions/data-platform-foundations/03-composer.tf index 5a1075342..fac47ec57 100644 --- a/examples/data-solutions/data-platform-foundations/03-composer.tf +++ b/examples/data-solutions/data-platform-foundations/03-composer.tf @@ -67,7 +67,7 @@ resource "google_composer_environment" "orch-cmp-0" { env_variables = merge( var.composer_config.env_variables, { BQ_LOCATION = var.location - DATA_CAT_TAGS = try(jsonencode(module.common-datacatalog[0].tags), "{}") + DATA_CAT_TAGS = try(jsonencode(module.common-datacatalog.tags), "{}") DF_KMS_KEY = try(var.service_encryption_keys.dataflow, "") DTL_L0_PRJ = module.lake-0-project.project_id DTL_L0_BQ_DATASET = module.lake-0-bq-0.dataset_id diff --git a/examples/data-solutions/data-platform-foundations/06-common.tf b/examples/data-solutions/data-platform-foundations/06-common.tf index b04e2f87f..80451500c 100644 --- a/examples/data-solutions/data-platform-foundations/06-common.tf +++ b/examples/data-solutions/data-platform-foundations/06-common.tf @@ -60,10 +60,9 @@ module "common-project" { # Data Catalog Policy tag module "common-datacatalog" { - count = var.data_catalog_tags != null ? 1 : 0 source = "../../../modules/data-catalog-policy-tag" - name = "${var.prefix}-datacatalog-policy-tags" project_id = module.common-project.project_id + name = "${var.prefix}-datacatalog-policy-tags" location = var.location tags = var.data_catalog_tags }