From d7cb0f455ae317094c5bd2295204600896b3c38b Mon Sep 17 00:00:00 2001 From: Marvin Buss Date: Wed, 21 Jun 2023 11:58:33 +0200 Subject: [PATCH 1/4] Update Workflow Trigger --- .github/workflows/dataLandingZone.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/dataLandingZone.yml b/.github/workflows/dataLandingZone.yml index 74eb04b..27a9c95 100644 --- a/.github/workflows/dataLandingZone.yml +++ b/.github/workflows/dataLandingZone.yml @@ -3,10 +3,24 @@ on: push: branches: - main + paths: + - "**.tf" + - "**.yml" + - "**.yaml" + - "!.github/workflows/**" + - "!.pre-commit-config.yaml" + - "!.terraform-docs.yml" pull_request: branches: - main + paths: + - "**.tf" + - "**.yml" + - "**.yaml" + - "!.github/workflows/**" + - "!.pre-commit-config.yaml" + - "!.terraform-docs.yml" jobs: terraform_lint: From 0aeefa6f2565d5a5d360cfc03aa5f5ce197b12b0 Mon Sep 17 00:00:00 2001 From: Marvin Buss Date: Wed, 21 Jun 2023 11:59:16 +0200 Subject: [PATCH 2/4] Update data product library path reference --- locals.tf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/locals.tf b/locals.tf index 2504a2a..f0ec4d6 100644 --- a/locals.tf +++ b/locals.tf @@ -30,10 +30,11 @@ locals { } locals { - data_product_library_path = "${path.root}/dataproducts" + data_product_library_path = var.data_product_library_path + # Load file paths - data_product_filepaths_json = tolist(fileset(local.data_product_library_path, "**/*.{json,json.tftpl}")) - data_product_filepaths_yaml = tolist(fileset(local.data_product_library_path, "**/*.{yml,yml.tftpl,yaml,yaml.tftpl}")) + data_product_filepaths_json = local.data_product_library_path == "" ? [] : tolist(fileset(local.data_product_library_path, "**/*.{json,json.tftpl}")) + data_product_filepaths_yaml = local.data_product_library_path == "" ? [] : tolist(fileset(local.data_product_library_path, "**/*.{yml,yml.tftpl,yaml,yaml.tftpl}")) # Load file content data_product_definitions_json = { From 879af430722aa5a69ea645035bb9c5088427075b Mon Sep 17 00:00:00 2001 From: Marvin Buss Date: Wed, 21 Jun 2023 11:59:29 +0200 Subject: [PATCH 3/4] Update data lake variable --- datalakes.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datalakes.tf b/datalakes.tf index 9956819..fdd56d0 100644 --- a/datalakes.tf +++ b/datalakes.tf @@ -14,7 +14,7 @@ module "datalake_raw" { private_dns_zone_id_dfs = var.private_dns_zone_id_dfs private_dns_zone_id_queue = var.private_dns_zone_id_queue private_dns_zone_id_table = var.private_dns_zone_id_table - data_platform_subscription_ids = [] + data_platform_subscription_ids = var.data_platform_subscription_ids } module "datalake_enriched" { @@ -33,7 +33,7 @@ module "datalake_enriched" { private_dns_zone_id_dfs = var.private_dns_zone_id_dfs private_dns_zone_id_queue = var.private_dns_zone_id_queue private_dns_zone_id_table = var.private_dns_zone_id_table - data_platform_subscription_ids = [] + data_platform_subscription_ids = var.data_platform_subscription_ids } module "datalake_curated" { @@ -52,7 +52,7 @@ module "datalake_curated" { private_dns_zone_id_dfs = var.private_dns_zone_id_dfs private_dns_zone_id_queue = var.private_dns_zone_id_queue private_dns_zone_id_table = var.private_dns_zone_id_table - data_platform_subscription_ids = [] + data_platform_subscription_ids = var.data_platform_subscription_ids } module "datalake_workspace" { @@ -71,5 +71,5 @@ module "datalake_workspace" { private_dns_zone_id_dfs = var.private_dns_zone_id_dfs private_dns_zone_id_queue = var.private_dns_zone_id_queue private_dns_zone_id_table = var.private_dns_zone_id_table - data_platform_subscription_ids = [] + data_platform_subscription_ids = var.data_platform_subscription_ids } From 8d967cd0d853527fb998fe332aa310f2f87a3ec0 Mon Sep 17 00:00:00 2001 From: Marvin Buss Date: Wed, 21 Jun 2023 17:05:51 +0200 Subject: [PATCH 4/4] Update provider --- tests/e2e/terraform.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/terraform.tf b/tests/e2e/terraform.tf index 7e1c97c..b9d5e17 100644 --- a/tests/e2e/terraform.tf +++ b/tests/e2e/terraform.tf @@ -4,15 +4,15 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.57.0" + version = "3.61.0" } azapi = { source = "azure/azapi" - version = "1.6.0" + version = "1.7.0" } databricks = { source = "databricks/databricks" - version = "1.17.0" + version = "1.19.0" } random = { source = "hashicorp/random"