PerfectThymeTech · marvinbuss · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025
diff --git a/README.md b/README.md
@@ -168,21 +168,15 @@ Source: ./modules/dataapplication
 
 Version:
 
-### <a name="module_databricks_account_configuration"></a> [databricks\_account\_configuration](#module\_databricks\_account\_configuration)
+### <a name="module_databricks_core"></a> [databricks\_core](#module\_databricks\_core)
 
-Source: ./modules/databricksaccountconfiguration
+Source: ./modules/databrickscore
 
 Version:
 
-### <a name="module_databricks_workspace_configuration"></a> [databricks\_workspace\_configuration](#module\_databricks\_workspace\_configuration)
+### <a name="module_databricks_data_application"></a> [databricks\_data\_application](#module\_databricks\_data\_application)
 
-Source: ./modules/databricksworkspaceconfiguration
-
-Version:
-
-### <a name="module_databricksworkspaceapplication"></a> [databricksworkspaceapplication](#module\_databricksworkspaceapplication)
-
-Source: ./modules/databricksworkspaceapplication
+Source: ./modules/databricksdataapplication
 
 Version:
 

diff --git a/databricksconfiguration.tf b/databricksconfiguration.tf
@@ -1,9 +1,10 @@
-module "databricks_account_configuration" {
-  source = "./modules/databricksaccountconfiguration"
+module "databricks_core" {
+  source = "./modules/databrickscore"
 
   providers = {
-    databricks = databricks
-    null       = null
+    databricks         = databricks.engineering
+    databricks.account = databricks
+    null               = null
   }
 
   # General variables
@@ -15,30 +16,14 @@ module "databricks_account_configuration" {
   # Service variables
   databricks_workspace_details      = local.databricks_workspace_details
   databricks_private_endpoint_rules = local.databricks_private_endpoint_rules
+  databricks_ip_access_list_allow   = []
+  databricks_ip_access_list_deny    = []
 }
 
-module "databricks_workspace_configuration" {
-  source = "./modules/databricksworkspaceconfiguration"
-
-  providers = {
-    databricks = databricks.engineering
-  }
-
-  # General variables
-  location    = var.location
-  environment = var.environment
-  prefix      = var.prefix
-  tags        = var.tags
-
-  # Service variables
-  databricks_ip_access_list_allow = []
-  databricks_ip_access_list_deny  = []
-}
-
-module "databricksworkspaceapplication" {
+module "databricks_data_application" {
   for_each = local.data_application_definitions
 
-  source = "./modules/databricksworkspaceapplication"
+  source = "./modules/databricksdataapplication"
 
   providers = {
     databricks         = databricks.engineering

diff --git a/modules/databricksaccountconfiguration/locals.tf b/modules/databricksaccountconfiguration/locals.tf
diff --git a/modules/databricksaccountconfiguration/terraform.tf b/modules/databricksaccountconfiguration/terraform.tf
diff --git a/...iguration/databricksconnectivityconfig.tf → ...rickscore/databricksconnectivityconfig.tf b/...iguration/databricksconnectivityconfig.tf → ...rickscore/databricksconnectivityconfig.tf
@@ -1,9 +1,13 @@
 resource "databricks_mws_network_connectivity_config" "network_connectivity_config" {
+  provider = databricks.account
+
   name   = "${local.prefix}-connectivity"
   region = var.location
 }
 
 resource "databricks_mws_ncc_private_endpoint_rule" "ncc_private_endpoint_rule" {
+  provider = databricks.account
+
   for_each = var.databricks_private_endpoint_rules
 
   network_connectivity_config_id = databricks_mws_network_connectivity_config.network_connectivity_config.network_connectivity_config_id
@@ -13,6 +17,8 @@ resource "databricks_mws_ncc_private_endpoint_rule" "ncc_private_endpoint_rule"
 }
 
 resource "databricks_mws_ncc_binding" "ncc_binding" {
+  provider = databricks.account
+
   for_each = var.databricks_workspace_details
 
   network_connectivity_config_id = databricks_mws_network_connectivity_config.network_connectivity_config.network_connectivity_config_id

diff --git a/...ceconfiguration/databricksipaccesslist.tf → .../databrickscore/databricksipaccesslist.tf b/...ceconfiguration/databricksipaccesslist.tf → .../databrickscore/databricksipaccesslist.tf
diff --git a/...ceconfiguration/databrickssystemschema.tf → .../databrickscore/databrickssystemschema.tf b/...ceconfiguration/databrickssystemschema.tf → .../databrickscore/databrickssystemschema.tf
diff --git a/...onfiguration/databricksworkspaceconfig.tf → ...tabrickscore/databricksworkspaceconfig.tf b/...onfiguration/databricksworkspaceconfig.tf → ...tabrickscore/databricksworkspaceconfig.tf
diff --git a/...atabricksworkspaceconfiguration/locals.tf → modules/databrickscore/locals.tf b/...atabricksworkspaceconfiguration/locals.tf → modules/databrickscore/locals.tf
@@ -1,4 +1,6 @@
 locals {
+  # General locals
+  prefix = "${lower(var.prefix)}-core-${var.environment}"
   system_schema_names = [
     "access",
     "billing",

diff --git a/.../databricksaccountconfiguration/output.tf → modules/databrickscore/output.tf b/.../databricksaccountconfiguration/output.tf → modules/databrickscore/output.tf
diff --git a/...tabricksworkspaceapplication/terraform.tf → modules/databrickscore/terraform.tf b/...tabricksworkspaceapplication/terraform.tf → modules/databrickscore/terraform.tf
diff --git a/...tabricksaccountconfiguration/variables.tf → modules/databrickscore/variables.tf b/...tabricksaccountconfiguration/variables.tf → modules/databrickscore/variables.tf
@@ -57,3 +57,17 @@ variable "databricks_private_endpoint_rules" {
   nullable  = false
   default   = {}
 }
+
+variable "databricks_ip_access_list_allow" {
+  description = "Specifies the ip access allow-list for the databricks workspace."
+  type        = list(string)
+  sensitive   = false
+  default     = []
+}
+
+variable "databricks_ip_access_list_deny" {
+  description = "Specifies the ip access deny-list for the databricks workspace."
+  type        = list(string)
+  sensitive   = false
+  default     = []
+}
diff --git a/...es/databricksworkspaceapplication/data.tf → modules/databricksdataapplication/data.tf b/...es/databricksworkspaceapplication/data.tf → modules/databricksdataapplication/data.tf
diff --git a/...kspaceapplication/databickssecretscope.tf → ...ksdataapplication/databickssecretscope.tf b/...kspaceapplication/databickssecretscope.tf → ...ksdataapplication/databickssecretscope.tf
diff --git a/...sworkspaceapplication/databricksbudget.tf → ...bricksdataapplication/databricksbudget.tf b/...sworkspaceapplication/databricksbudget.tf → ...bricksdataapplication/databricksbudget.tf
diff --git a/...workspaceapplication/databrickscatalog.tf → ...ricksdataapplication/databrickscatalog.tf b/...workspaceapplication/databrickscatalog.tf → ...ricksdataapplication/databrickscatalog.tf
diff --git a/...aceapplication/databricksclusterpolicy.tf → ...ataapplication/databricksclusterpolicy.tf b/...aceapplication/databricksclusterpolicy.tf → ...ataapplication/databricksclusterpolicy.tf
diff --git a/...rkspaceapplication/databricksdirectory.tf → ...cksdataapplication/databricksdirectory.tf b/...rkspaceapplication/databricksdirectory.tf → ...cksdataapplication/databricksdirectory.tf
diff --git a/...application/databricksexternallocation.tf → ...application/databricksexternallocation.tf b/...application/databricksexternallocation.tf → ...application/databricksexternallocation.tf
diff --git a/...application/databricksserviceprincipal.tf → ...application/databricksserviceprincipal.tf b/...application/databricksserviceprincipal.tf → ...application/databricksserviceprincipal.tf
diff --git a/...pplication/databricksstoragecredential.tf → ...pplication/databricksstoragecredential.tf b/...pplication/databricksstoragecredential.tf → ...pplication/databricksstoragecredential.tf
diff --git a/.../databricksworkspaceapplication/locals.tf → modules/databricksdataapplication/locals.tf b/.../databricksworkspaceapplication/locals.tf → modules/databricksdataapplication/locals.tf
diff --git a/...kspaceapplication/roleassignment_admin.tf → ...ksdataapplication/roleassignment_admin.tf b/...kspaceapplication/roleassignment_admin.tf → ...ksdataapplication/roleassignment_admin.tf
diff --git a/...ceapplication/roleassignment_developer.tf → ...taapplication/roleassignment_developer.tf b/...ceapplication/roleassignment_developer.tf → ...taapplication/roleassignment_developer.tf
diff --git a/...spaceapplication/roleassignment_reader.tf → ...sdataapplication/roleassignment_reader.tf b/...spaceapplication/roleassignment_reader.tf → ...sdataapplication/roleassignment_reader.tf
diff --git a/...ation/roleassignment_service_principal.tf → ...ation/roleassignment_service_principal.tf b/...ation/roleassignment_service_principal.tf → ...ation/roleassignment_service_principal.tf
diff --git a/...paceapplication/roleassignments_common.tf → ...dataapplication/roleassignments_common.tf b/...paceapplication/roleassignments_common.tf → ...dataapplication/roleassignments_common.tf
diff --git a/...bricksworkspaceconfiguration/terraform.tf → ...es/databricksdataapplication/terraform.tf b/...bricksworkspaceconfiguration/terraform.tf → ...es/databricksdataapplication/terraform.tf
@@ -3,6 +3,9 @@ terraform {
     databricks = {
       source  = "databricks/databricks"
       version = "~> 1.59"
+      configuration_aliases = [
+        databricks.account
+      ]
     }
   }
 }
diff --git a/...tabricksworkspaceapplication/variables.tf → ...es/databricksdataapplication/variables.tf b/...tabricksworkspaceapplication/variables.tf → ...es/databricksdataapplication/variables.tf
diff --git a/modules/databricksworkspaceconfiguration/variables.tf b/modules/databricksworkspaceconfiguration/variables.tf
diff --git a/output.tf b/output.tf
@@ -6,6 +6,6 @@ output "databricks_account_id" {
 
 output "databricks_network_connectivity_config_id" {
   description = "Specifies the id of the network connectivity config."
-  value       = module.databricks_account_configuration.databricks_network_connectivity_config_id
+  value       = module.databricks_core.databricks_network_connectivity_config_id
   sensitive   = false
 }