Optional Resource Group creation in adb-lakehouse module (#153)

* Optional Resource Group creation in adb-lakehouse module

The commit contains the implementation for the workspace resource group. However this change requires to no more use the local.rg_location variable, since the value is known after the apply, and rhis force the replacement of all of the resources

* Fix resource group name value in the azure data factory resource

Author: micheledaddetta-databricks

examples/adb-lakehouse/main.tf

@@ -20,6 +20,7 @@ module "adb-lakehouse" {
   location                        = var.location
   spoke_vnet_address_space        = var.spoke_vnet_address_space
   spoke_resource_group_name       = var.spoke_resource_group_name
+  create_resource_group           = var.create_resource_group
   managed_resource_group_name     = var.managed_resource_group_name
   databricks_workspace_name       = var.databricks_workspace_name
   data_factory_name               = var.data_factory_name

examples/adb-lakehouse/providers.tf

@@ -1,6 +1,6 @@
 provider "azurerm" {
   features {}
-  skip_provider_registration = true
+  resource_provider_registrations = "none"
 }
 
 provider "databricks" {

examples/adb-lakehouse/variables.tf

@@ -5,7 +5,13 @@ variable "location" {
 
 variable "spoke_resource_group_name" {
   type        = string
-  description = "(Required) The name of the Resource Group to create"
+  description = "(Required) The name of the Resource Group to create or to use"
+}
+
+variable "create_resource_group" {
+  type        = bool
+  description = "(Optional) Creates resource group if set to true (default)"
+  default     = true
 }
 
 variable "managed_resource_group_name" {

modules/adb-lakehouse/key_vault.tf

@@ -1,7 +1,7 @@
 resource "azurerm_key_vault" "example" {
   count                       = var.key_vault_name != "" ? 1 : 0
   name                        = var.key_vault_name
-  location                    = local.rg_location
+  location                    = var.location
   resource_group_name         = local.rg_name
   enabled_for_disk_encryption = true
   tenant_id                   = data.azurerm_client_config.current.tenant_id

modules/adb-lakehouse/network.tf

@@ -1,22 +1,22 @@
 resource "azurerm_virtual_network" "this" {
   name                = "VNET-${var.project_name}-${var.environment_name}"
-  location            = local.rg_location
+  location            = var.location
   resource_group_name = local.rg_name
   address_space       = [var.spoke_vnet_address_space]
   tags                = var.tags
 }
 
 resource "azurerm_network_security_group" "this" {
   name                = "databricks-nsg-${var.project_name}-${var.environment_name}"
-  location            = local.rg_location
+  location            = var.location
   resource_group_name = local.rg_name
   tags                = var.tags
 }
 
 
 resource "azurerm_route_table" "this" {
   name                = "route-table-${var.project_name}-${var.environment_name}"
-  location            = local.rg_location
+  location            = var.location
   resource_group_name = local.rg_name
   tags                = var.tags
 }

modules/adb-lakehouse/storage.tf

@@ -2,7 +2,7 @@ resource "azurerm_storage_account" "dls" {
   count                    = length(var.storage_account_names)
   name                     = "dls${var.storage_account_names[count.index]}${var.environment_name}"
   location                 = var.location
-  resource_group_name      = var.spoke_resource_group_name
+  resource_group_name      = local.rg_name
   account_tier             = "Standard"
   account_replication_type = "GRS"
   tags                     = var.tags

modules/adb-lakehouse/vnet_injected_databricks_workspace.tf

@@ -4,11 +4,13 @@ locals {
     "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action",
     "Microsoft.Network/virtualNetworks/subnets/unprepareNetworkPolicies/action",
   ]
+
+  managed_resource_group_name = var.managed_resource_group_name == "" ? "${var.databricks_workspace_name}-managed-rg" : var.managed_resource_group_name
 }
 
 resource "azurerm_subnet" "private" {
   name                 = "private-subnet-${var.databricks_workspace_name}"
-  resource_group_name  = var.spoke_resource_group_name
+  resource_group_name  = local.rg_name
   virtual_network_name = azurerm_virtual_network.this.name
 
   address_prefixes = var.private_subnet_address_prefixes
@@ -25,7 +27,7 @@ resource "azurerm_subnet" "private" {
 
 resource "azurerm_subnet" "public" {
   name                 = "public-subnet-${var.databricks_workspace_name}"
-  resource_group_name  = var.spoke_resource_group_name
+  resource_group_name  = local.rg_name
   virtual_network_name = azurerm_virtual_network.this.name
 
   address_prefixes = var.public_subnet_address_prefixes
@@ -60,14 +62,10 @@ resource "azurerm_subnet_route_table_association" "public" {
   route_table_id = azurerm_route_table.this.id
 }
 
-locals {
-  managed_resource_group_name = var.managed_resource_group_name == "" ? "${var.databricks_workspace_name}-managed-rg" : var.managed_resource_group_name
-}
-
 resource "azurerm_databricks_workspace" "this" {
   name                        = var.databricks_workspace_name
-  resource_group_name         = var.spoke_resource_group_name
-  managed_resource_group_name = local.managed_resource_group_name
+  resource_group_name         = local.rg_name
+  managed_resource_group_name = var.managed_resource_group_name
   location                    = var.location
   sku                         = "premium"
 

modules/adb-uc-metastore/azure.tf

@@ -11,6 +11,7 @@ resource "azurerm_databricks_access_connector" "access_connector" {
   identity {
     type = "SystemAssigned"
   }
+  tags = var.tags
 }
 
 resource "azurerm_storage_account" "unity_catalog" {
@@ -25,7 +26,7 @@ resource "azurerm_storage_account" "unity_catalog" {
 
 resource "azurerm_storage_container" "unity_catalog" {
   name                  = "${var.metastore_storage_name}-container"
-  storage_account_name  = azurerm_storage_account.unity_catalog.name
+  storage_account_id    = azurerm_storage_account.unity_catalog.id
   container_access_type = "private"
 }