Merge pull request #42 from databricks/cyber

commit cyber module

Author: rportilla-databricks

Diff for: examples/test_aws_full_lakehouse_example/.terraform.lock.hcl

@@ -80,4 +80,5 @@ resource "azurerm_firewall" "this" {
     subnet_id            = azurerm_subnet.firewall.id
     public_ip_address_id = azurerm_public_ip.this.id
   }
+  depends_on = [azurerm_firewall_policy_rule_collection_group.this]
 }

Diff for: examples/test_azure_data_exfiltration_protection/firewall.tf

@@ -1,47 +1,14 @@
-resource "azurerm_resource_group" "this" {
-  name     = var.resource_group_name
-  location = var.location
-  tags     = local.tags
-}
-
-resource "azurerm_virtual_network" "this" {
-  name                = "${local.prefix}-vnet"
-  location            = azurerm_resource_group.this.location
-  resource_group_name = azurerm_resource_group.this.name
-  address_space       = ["10.2.1.0/24"]
-}
-
 data "azurerm_client_config" "current" {}
 
 data "external" "me" {
   program = ["az", "account", "show", "--query", "user"]
 }
 
-resource "azurerm_databricks_workspace" "this" {
-  name                        = "${local.prefix}-workspace"
-  resource_group_name         = azurerm_resource_group.this.name
-  location                    = azurerm_resource_group.this.location
-  sku                         = "premium"
-  managed_resource_group_name = "${local.prefix}-workspace-rg"
-  tags                        = local.tags
-}
-
-locals {
-  resource_regex            = "(?i)subscriptions/(.+)/resourceGroups/(.+)/providers/Microsoft.Databricks/workspaces/(.+)"
-  subscription_id           = regex(local.resource_regex, azurerm_databricks_workspace.this.id)[0]
-  resource_group            = regex(local.resource_regex, azurerm_databricks_workspace.this.id)[1]
-  databricks_workspace_name = regex(local.resource_regex, azurerm_databricks_workspace.this.id)[2]
-  tenant_id                 = data.azurerm_client_config.current.tenant_id
-  prefix                    = replace(replace(lower(azurerm_resource_group.this.name), "rg", ""), "-", "")
-  tags = {
-    Environment = "TF Demo"
-    Owner       = lookup(data.external.me.result, "name")
-  }
-}
-
 module "unity_catalog" {
   source = "../../modules/azure_uc"
-
-  resource_group_id       = azurerm_resource_group.this.id
-  workspaces_to_associate = [azurerm_databricks_workspace.this.workspace_id]
+  location = var.location
+  resource_group_id       = var.resource_group_name
+  workspaces_to_associate = var.workspaces_to_associate
+  databricks_resource_id = var.databricks_resource_id
+  workspace_url = var.workspace_url
 }

Diff for: examples/test_azure_uc/clusters.tf

@@ -3,5 +3,5 @@ provider "azurerm" {
 }
 
 provider "databricks" {
-  host = azurerm_databricks_workspace.this.workspace_url
+  host = var.workspace_url
 }

Diff for: examples/test_azure_uc/external_data.tf

@@ -7,3 +7,14 @@ variable "location" {
   type        = string
   description = "(Required) The location for the resources in this module"
 }
+
+variable "workspaces_to_associate" {
+  type        = list(string)
+  description = "(Optional) List of Databricks Workspace IDs to associate with Unity Catalog"
+  default     = []
+}
+
+variable "databricks_resource_id" {}
+
+variable "workspace_url" {}
+