feat: update adls and adf modules (#84)

* update adf module * update * add vars * fix typo * fix another typo
Ensono · Jul 28, 2023 · 6cc50a1 · 6cc50a1
1 parent 550cf27
commit 6cc50a1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/azurerm/modules/azurerm-adf/main.tf b/azurerm/modules/azurerm-adf/main.tf
@@ -1,8 +1,3 @@
-data "azurerm_client_config" "current" {
-}
-
-
-
 resource "azurerm_data_factory" "example" {
   count                           = var.create_adf ? 1 : 0
   name                            = var.resource_namer
@@ -45,7 +40,7 @@ resource "azurerm_data_factory" "example" {
       project_name    = var.vsts_project_name
       repository_name = var.repository_name
       root_folder     = var.root_folder
-      tenant_id       = data.azurerm_client_config.current.tenant_id
+      tenant_id       = var.tenant_id
     }
   }
 

diff --git a/azurerm/modules/azurerm-adf/vars.tf b/azurerm/modules/azurerm-adf/vars.tf
@@ -19,6 +19,12 @@ variable "name_component" {
   type        = string
 }
 
+variable "tenant_id" {
+  type        = string
+  default     = ""
+  description = "Azure Tenant ID."
+}
+
 ############################################
 # RESOURCE INFORMATION
 ############################################

diff --git a/azurerm/modules/azurerm-adls/data.tf b/azurerm/modules/azurerm-adls/data.tf
diff --git a/azurerm/modules/azurerm-adls/main.tf b/azurerm/modules/azurerm-adls/main.tf
@@ -91,7 +91,7 @@ resource "azurerm_private_endpoint" "pe_dfs" {
 
   private_dns_zone_group {
     name                 = azurerm_storage_account.storage_account_default[each.key].name
-    private_dns_zone_ids = [data.azurerm_private_dns_zone.dfs_pvt_dns[0].id]
+    private_dns_zone_ids = [var.dfs_private_zone_id]
   }
 }
 
@@ -114,6 +114,6 @@ resource "azurerm_private_endpoint" "pe_blob" {
 
   private_dns_zone_group {
     name                 = azurerm_storage_account.storage_account_default[each.key].name
-    private_dns_zone_ids = [data.azurerm_private_dns_zone.blob_pvt_dns[0].id]
+    private_dns_zone_ids = [var.blob_private_zone_id]
   }
 }
diff --git a/azurerm/modules/azurerm-adls/vars.tf b/azurerm/modules/azurerm-adls/vars.tf
@@ -175,4 +175,16 @@ variable "la_workspace_id" {
   type        = string
   default     = ""
   description = "Log Analytics Workspace ID"
+}
+
+variable "dfs_private_zone_id" {
+  type = string
+  default = ""
+  description = "Resource ID of the DFS Private DNS Zone"
+}
+
+variable "blob_private_zone_id" {
+  type = string
+  default = ""
+  description = "Resource ID of the Blob Private DNS Zone"
 }