Fix incorrect use of location in adb-lakehouse module (#182)

When `create_resource_group` is set to `false` we trued to use the location of existing
resource group, but it wasn't complete as some resources still used `location` passed as
variable.

With these changes we can omit `location` when we don't create a resource group, so we'll
use default location from resource group itself.  But if we don't create a resource group
and `location` is set to non-empty value, then all resources will be created in that
location.

Also fixed specification of managed resource group for Databricks workspace.

Resolves #181

Author: alexott

modules/adb-lakehouse/README.md

@@ -81,7 +81,7 @@ No modules.
 | <a name="input_databricks_workspace_name"></a> [databricks\_workspace\_name](#input\_databricks\_workspace\_name)                     | Name of Databricks workspace                                                                                 | `string`       | n/a     |   yes    |
 | <a name="input_environment_name"></a> [environment\_name](#input\_environment\_name)                                                  | (Required) The name of the project environment associated with the infrastructure to be managed by Terraform | `string`       | n/a     |   yes    |
 | <a name="input_key_vault_name"></a> [key\_vault\_name](#input\_key\_vault\_name)                                                      | The name of the Azure Key Vault to deploy. Won't be created if not specified                                 | `string`       | `""`    |    no    |
-| <a name="input_location"></a> [location](#input\_location)                                                                            | (Required) The location for the resources in this module                                                     | `string`       | n/a     |   yes    |
+| <a name="input_location"></a> [location](#input\_location)                                                                            | (Optional if `create_resource_group` is set to `false`) The location for the resources in this module                                                     | `string`       | n/a     |   yes    |
 | <a name="input_managed_resource_group_name"></a> [managed\_resource\_group\_name](#input\_managed\_resource\_group\_name)             | (Optional) The name of the resource group where Azure should place the managed Databricks resources          | `string`       | `""`    |    no    |
 | <a name="input_private_subnet_address_prefixes"></a> [private\_subnet\_address\_prefixes](#input\_private\_subnet\_address\_prefixes) | Address space for private Databricks subnet                                                                  | `list(string)` | n/a     |   yes    |
 | <a name="input_project_name"></a> [project\_name](#input\_project\_name)                                                              | (Required) The name of the project associated with the infrastructure to be managed by Terraform             | `string`       | n/a     |   yes    |
@@ -95,7 +95,8 @@ No modules.
 
 | Name                                                                                                            | Description                                            |
 |-----------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|
-| <a name="output_azure_resource_group_id"></a> [azure\_resource\_group\_id](#output\_azure\_resource\_group\_id) | ID of the created Azure resource group                 |
+| <a name="output_azure_resource_group_id"></a> [azure\_resource\_group\_id](#output\_azure\_resource\_group\_id) | ID of the created or existing Azure resource group                 |
+| <a name="output_azure_resource_group_location"></a> [azure\_resource\_group\_location](#output\_azure\_resource\_group\_location) | Location of the created or existing Azure resource group                 |
 | <a name="output_nsg_id"></a> [nsg\_id](#output\_nsg\_id)                                                        | **Depricated** ID of the new NSG                       |
 | <a name="output_rg_id"></a> [rg\_id](#output\_rg\_id)                                                           | **Depricated** ID of the resource group                |
 | <a name="output_rg_name"></a> [rg\_name](#output\_rg\_name)                                                     | **Depricated** Name of the resource group              |
@@ -105,4 +106,4 @@ No modules.
 | <a name="output_workspace_name"></a> [workspace\_name](#output\_workspace\_name)                                | **Depricated** Name of the Databricks workspace        |
 | <a name="output_workspace_resource_id"></a> [workspace\_resource\_id](#output\_workspace\_resource\_id)         | **Depricated** ID of the Databricks workspace resource |
 | <a name="output_workspace_url"></a> [workspace\_url](#output\_workspace\_url)                                   | URL of the Databricks workspace                        |
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->

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                    = var.location
+  location                    = local.rg_location
   resource_group_name         = local.rg_name
   enabled_for_disk_encryption = true
   tenant_id                   = data.azurerm_client_config.current.tenant_id

modules/adb-lakehouse/main.tf

@@ -13,7 +13,7 @@ data "azurerm_resource_group" "this" {
 locals {
   rg_name     = var.create_resource_group ? azurerm_resource_group.this[0].name : data.azurerm_resource_group.this[0].name
   rg_id       = var.create_resource_group ? azurerm_resource_group.this[0].id : data.azurerm_resource_group.this[0].id
-  rg_location = var.create_resource_group ? azurerm_resource_group.this[0].location : data.azurerm_resource_group.this[0].location
+  rg_location = var.create_resource_group ? azurerm_resource_group.this[0].location : (var.location == "" ? data.azurerm_resource_group.this[0].location : var.location)
 }
 
 data "azurerm_client_config" "current" {

modules/adb-lakehouse/network.tf

@@ -1,22 +1,22 @@
 resource "azurerm_virtual_network" "this" {
   name                = "VNET-${var.project_name}-${var.environment_name}"
-  location            = var.location
+  location            = local.rg_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            = var.location
+  location            = local.rg_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            = var.location
+  location            = local.rg_location
   resource_group_name = local.rg_name
   tags                = var.tags
 }

modules/adb-lakehouse/outputs.tf

@@ -44,6 +44,11 @@ output "workspace_url" {
 }
 
 output "azure_resource_group_id" {
-  description = "ID of the created Azure resource group"
+  description = "ID of the created or existing Azure resource group"
+  value       = local.rg_id
+}
+
+output "azure_resource_group_location" {
+  description = "Location of the created or existing Azure resource group"
   value       = local.rg_id
 }

modules/adb-lakehouse/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
+      source  = "hashicorp/azurerm"
       version = ">=4.0.0"
     }
   }

modules/adb-lakehouse/storage.tf

@@ -1,7 +1,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
+  location                 = local.rg_location
   resource_group_name      = local.rg_name
   account_tier             = "Standard"
   account_replication_type = "GRS"

modules/adb-lakehouse/variables.tf

@@ -1,6 +1,7 @@
 variable "location" {
   type        = string
-  description = "(Required) The location for the resources in this module"
+  description = "(Optional if `create_resource_group` is set to `false`) The location for the resources in this module"
+  default     = ""
 }
 
 variable "spoke_resource_group_name" {

modules/adb-lakehouse/vnet_injected_databricks_workspace.tf

@@ -65,8 +65,8 @@ resource "azurerm_subnet_route_table_association" "public" {
 resource "azurerm_databricks_workspace" "this" {
   name                        = var.databricks_workspace_name
   resource_group_name         = local.rg_name
-  managed_resource_group_name = var.managed_resource_group_name
-  location                    = var.location
+  managed_resource_group_name = local.managed_resource_group_name
+  location                    = local.rg_location
   sku                         = "premium"
 
   custom_parameters {