Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update adls and adf modules #84

Merged
merged 5 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions azurerm/modules/azurerm-adf/main.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
data "azurerm_client_config" "current" {
}



resource "azurerm_data_factory" "example" {
count = var.create_adf ? 1 : 0
name = var.resource_namer
Expand Down Expand Up @@ -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
}
}

Expand Down
6 changes: 6 additions & 0 deletions azurerm/modules/azurerm-adf/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ variable "name_component" {
type = string
}

variable "tenant_id" {
type = string
default = ""
description = "Azure Tenant ID."
}

############################################
# RESOURCE INFORMATION
############################################
Expand Down
11 changes: 0 additions & 11 deletions azurerm/modules/azurerm-adls/data.tf

This file was deleted.

4 changes: 2 additions & 2 deletions azurerm/modules/azurerm-adls/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}

Expand All @@ -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]
}
}
12 changes: 12 additions & 0 deletions azurerm/modules/azurerm-adls/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}