Merge pull request #20 from PerfectThymeTech/marvinbuss/fix_path

Update Data Landing Zone references
PerfectThymeTech · Jun 21, 2023 · 8d81fd5 · 8d81fd5
2 parents 84d0c52 + 5b2eb9a
commit 8d81fd5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git 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:

diff --git 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
 }
diff --git 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 = {

diff --git 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"