diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fe67ad44..74a8ba0f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -36,10 +36,7 @@ "ghcr.io/stuartleeks/dev-container-features/shell-history:0": {}, "ghcr.io/devcontainers-contrib/features/pre-commit:2": {}, "ghcr.io/lukewiwa/features/shellcheck:0": {}, - "ghcr.io/eitsupi/devcontainer-features/jq-likes:1": { - "jqVersion": "1.6", - "yqVersion": "4" - }, + "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}, "ghcr.io/jlaundry/devcontainer-features/mssql-odbc-driver:1": { "version": "18" }, diff --git a/apps/app/aad_app/.terraform.lock.hcl b/apps/app/aad_app/.terraform.lock.hcl index 016d85b8..483672ce 100644 --- a/apps/app/aad_app/.terraform.lock.hcl +++ b/apps/app/aad_app/.terraform.lock.hcl @@ -2,42 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azuread" { - version = "2.40.0" + version = "2.42.0" hashes = [ - "h1:Fcx8JQTk+sLqT1NWJ65/NqU94P1cEwRf2JskNBdxW/w=", - "h1:dCp1/MhTXZBOhTMT40casPdBVM4J1V6sRtRPJwv8r7E=", + "h1:5+ItCYcLIRXgdfBQhmcgYP8/q0WgQh6D9QZssGMcoqo=", + "h1:MQ6ms66PAdINphedcZUV023BXgRHoyNJx4nbJ8G1KK8=", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:2bfa5dfa9b7d1fd58c3cc92251b3d140e17bca8da4cd44f6b02da51709ceeb34", - "zh:5327aa0643dbb3e4387f1a41b25211ac562be908b95631ca81917cc90530ed9a", - "zh:6365ee93a131c3f1122155890121778198ba26cf01286aa568d7343ce746f1e8", - "zh:75c01bbb0a337f0a32ae11fb9b74440b12230027d184244d417c852ee0fe56cd", - "zh:894907e8b3d31efea4597ddea7217660259950eefba1b1a47dbde1b024577e08", - "zh:a29f2d8b112803ce30ca75f390a9c05b87846d17b8ac32730fa44ed00d8fbeca", - "zh:a35f40210d810e65e20c8a16d1cba10867225e1f45826c29eb03860aa7d5fabd", - "zh:b8dfb7a03547cae504fb060ca794b5b7ac139e03a098e8a9612488aa4023edc1", - "zh:c73b64a52d6c8ec816c073d8113cb9eb9ba99bb78af5d67423a70a127ac92e48", - "zh:e8687d575e9bb6a94bc593dd1a9b8e0529c391e398d877dff1a8f330f2862551", - "zh:ff6e70ad6146c5e3ff1aa90471d48eba67892ced5a5bde0946d1bd16b262c78c", + "zh:1ebf629ae485875bb80bf5752122ada01ee602cfb0fa01106621c7e730c10e0a", + "zh:33ac22d0c308fc3d8cf7fc35f4ee7b616069b6ea2a9f5692b438b8c9013b9664", + "zh:3f90b31f72c13b682221db47116411188bb38e91c6923d5268053817835873c1", + "zh:571585f46da32cbef79c2e57e06f243ede25a7677318ee748d8828910c42a95c", + "zh:6d4592c45916a3b0154251106c4ae7861f3735fa3524a9eda83eca353aa876a3", + "zh:98bd133d2580a63ab72a3043832f14f6a1ac173b5c6f558440bd8e7f01317c98", + "zh:b18fcfade0ba8ab73cd6fbc906d1f41676152754b06c945a2fa7ec60fb28f940", + "zh:d04fcd7076aaa01355cd85a01049101c9c02ad4804837f8755e9da92265d9d1f", + "zh:d2b041c135ed7b98e52306d4826a8d7a0d9ee5eb1821c1bf92258668c0a75188", + "zh:d370b2830438bd41217d7867843a2d90de4808604afe8215f1d2a4c301998b52", + "zh:e9388800ed433043e8707cd0f48caf9f24e274fd9caf24fb1323c15e974777a0", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.66.0" + version = "3.73.0" hashes = [ - "h1:2pgTU9lsnoKPnB3sJqFTYQhHFJJMTgreKtqM3ORHI6Q=", - "h1:sqdnyxWYjkRkc6/z+EWXo3Y+YclLQN2DXCXrHLttZHg=", - "zh:02f1b55836f3ca38d1203c0fb748c2f9de3436c429814b1d901143e32ca2e9fc", - "zh:32410ab954c3812c15419c2a5d54562bcd0aaaff72127e6077ed2db91c3329ea", - "zh:342c5e097f05d284933a64b5fb8e2c1ad44a33b3be045fcc66653014d2d43900", - "zh:498f4c3526a4564cb8c8d19fbecb82362691719c163bf5051c433abf34da20e6", - "zh:5f16dceafd3478ec53f426074585ff917a574995696ab6ca8562e584abc6b19d", - "zh:78574e96d88fe00a74d00fd4b3ee2f50ba9669ad2535e5133593ca6d63646e9c", - "zh:902a465eb925eb691ecdb91cde2ac0838146baa76b741d282ac222c1853c7cdd", - "zh:c6d48c1ad9c719e52ea036ed83ef1b6ed95d1601aa57b3f8531bdca44ff40eb4", - "zh:e5746a1eb89b659a407cb35375cfd1bde153d24b63ea3ebd10973b60dd345cbd", - "zh:e6dbf4ad979e1f95d942a50a6f49d38ade502a200c2bdc849e50503d6219a223", + "h1:+Z5ZcAQO4e6aWh1N7zX4JqyV/xnDkTRYoCa8pEtNR20=", + "h1:bmEo0rjSqcTjeYRcYWqvNTR48MNe4ILP6uFfX0clUac=", + "zh:068dfe743c9486d09eeaf97eb7817870b932ecb8132b92b8e0d96eadcf51b349", + "zh:2a16b0d50feb80919880d32cc12d636c37918bbc9133d7b3ff0d610bac1bee86", + "zh:2a77e0deabd3d0f83974125cedca7871add825bf4470688f117a35b6964916cf", + "zh:3ade6f3b9483746f168e7daf5223fd65d5d26313616bca37d9117d5b4fba2b66", + "zh:44554a1fc5f69a1069bbac3fbe1122794943692f81fc2aabda435740f5e10a67", + "zh:69d41ad1073f274548bca763a1ed14813388e5b9b702c15fdc78f2b22b082a09", + "zh:8cf5ce91432fc5ed1b9906bca14ab6f0d3b18e78a9f25e00b1de632ae7669645", + "zh:b70c294e7d55c3404c40ae18e54113e625ee975e80e3f7d558f3fedde89b038e", + "zh:cadab8bc17685a239f45438c555fba156baa709803da55f59cce8c7f1cb70fc1", + "zh:cb74e02e1495df938d464e233a41aa5ffab9f0fd79079016d0a630955ce92b6d", + "zh:cd7a68c03005116fe40542d312d0236ab5bfdd20a2bb6bdf6398d64945c25ef8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f5d4af4e0011e9fa9be055e6efee1cc8be10f0fc1092bab921de7ebbb26ed4c4", ] } diff --git a/infrastructure/core/locals.tf b/infrastructure/core/locals.tf index b5733ec2..1a4f1a5b 100644 --- a/infrastructure/core/locals.tf +++ b/infrastructure/core/locals.tf @@ -24,15 +24,16 @@ locals { databricks_container_address_space = local.subnet_address_spaces[2] serve_webapps_address_space = local.subnet_address_spaces[3] - create_dns_zones = var.private_dns_zones_rg == null - datalake_enabled = try(var.transform.datalake, null) != null + create_dns_zones = var.private_dns_zones_rg == null + datalake_enabled = try(var.transform.datalake, null) != null + unity_catalog_enabled = try(var.transform.unity_catalog, null) != null required_private_dns_zones = merge({ blob = "privatelink.blob.core.windows.net" keyvault = "privatelink.vaultcore.azure.net" cosmos = "privatelink.documents.azure.com" databricks = "privatelink.azuredatabricks.net" sql = "privatelink.database.windows.net" - }, local.datalake_enabled ? { + }, local.datalake_enabled || local.unity_catalog_enabled ? { dfs = "privatelink.dfs.core.windows.net" } : {}) } diff --git a/infrastructure/transform/.terraform.lock.hcl b/infrastructure/transform/.terraform.lock.hcl index 57ee4b70..24055ba7 100644 --- a/infrastructure/transform/.terraform.lock.hcl +++ b/infrastructure/transform/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/azure/azapi" { constraints = "1.5.0" hashes = [ "h1:wiX+oIlwttTKq6z3LGbrqmRCkN66C0YgqxM+jKQbejw=", + "h1:y8+jCfTmrUzyAYiy19v8OJMD8tXKiTCQY7lHml8clgE=", "zh:14109c169973e1b0d526131ca047e25f62700a44ecce4303aacb15793764be3e", "zh:19417f2bbbadd0a079d51646a929d43ae7a0293f0fc13c3fa369d32780c1c846", "zh:3254370d3304227ea0ec1352d98aa4a4a59e6a76ddede26454bdb55048101ec3", @@ -22,20 +23,17 @@ provider "registry.terraform.io/azure/azapi" { } provider "registry.terraform.io/databricks/databricks" { - version = "1.9.1" - constraints = "1.9.1" + version = "1.25.1" + constraints = "1.25.1" hashes = [ - "h1:0XIc4cNr+jEswewJQRpcqSmODBhJb5dSrxcpxhiTfFE=", - "zh:0abe153b02493780fc7bb6d6d6c817b4c1144b8850ceec4eb182ce7956521461", - "zh:37e374515f36486b5729fd43ba094816c448d405f7673da53857b28947987571", - "zh:441847508571125c9db8a30da32fa2344dbf6c00563fcd819a3e813e626c4b64", - "zh:5054b850575b5f79c1cdf5d616c290052f3bdb13029c034c6417bc05a3129d50", - "zh:52eab57817ee97ea5fd9e204f2dfaddcd19371e3353e9f96accd29f49811c3d1", - "zh:78c32ebcd6da7c6504574d636b1dc63b8a4954b3584989d64422ec8a704c3537", - "zh:a6bdb4ab8dae9a737d6b69b9aac706da2aadda159d021aee1bf1836774e0cce5", - "zh:dc416e45b6b6157192cde6a776bf4b98e88c5bf266216ab788ab0f51f1a90641", - "zh:e69c0c5e110a4b74804061d7e2a348e192a688faec67d4f2d60a600223313e9c", - "zh:fa4bdb0fd51d3710282ac04dc1b30ea813b446c1bbd7b901622612f47526906b", + "h1:CS0roEh3PuSFfwDvO3OQCzb7d4bvfaOiMzPFK7o52nY=", + "h1:GvzmeOGE4ZgPCv4lTf43zKpZZ+st/8IdhMfGSIrijnU=", + "zh:21243ef38dc20ad8c8dea80723d3089ddfa88fbd70f08e5225505f7149fb1471", + "zh:31095f7d06d9b3999774115cd7a79ddfa4fd4279d846d43a068cc15d5a279450", + "zh:96ee896cf7495886ca71a2c7a73c0305dc5583922ef9025e2cd1ee822daf6273", + "zh:9fb0f886d84b814f3d2f622ab717336480f6df473530daa6b114110d8949b689", + "zh:d2b05855abf9b4a155c7ac8b423db1d9b270a0a2d4d8e4dd8c32a3a62b5a616f", + "zh:d38a71ce23662257cd10d3a54396bdf10620a0c34143fd5d4db981190d63514a", ] } @@ -44,6 +42,7 @@ provider "registry.terraform.io/hashicorp/azuread" { constraints = "2.35.0" hashes = [ "h1:TpsHp9ELX3y2RV4EvyM/nuH48jMydEPMFNWhU+WLzMg=", + "h1:yxuDZvYzlE8j+O57ZwRBTVnQQVKY31Ov266wTSvPxDA=", "zh:186d97850249bdba95792592157191cbca0899001afc49aad966cd6bb428d035", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", "zh:60bc57c7aa4a906a90a1edd6093055c41db556a011a3eb64891864ddd623fcd7", @@ -63,6 +62,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.47.0" constraints = "3.47.0" hashes = [ + "h1:LzQtMKZcMT5GhQSHt5SS3aUFN3FTkyIindgj/dkJYWI=", "h1:gWdjrOUCdfRB5VrQ0qxJI/coNh5chWw9884qM/nTg0E=", "zh:099ffaec3ef0ef45a23aebd851fdf49a279f872632dd2e72fa3cb897621511ac", "zh:0a2c33eff74c8934a371cff9647edc59a35cd2810d63613e5de4f6f2e43ae014", @@ -84,6 +84,7 @@ provider "registry.terraform.io/hashicorp/null" { constraints = "3.2.1" hashes = [ "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", + "h1:wqgRvlyVIbkCeCQs+5jj6zVuQL0KDxZZtNofGqqlSdI=", "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", @@ -103,6 +104,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.4.3" constraints = "3.4.3" hashes = [ + "h1:hV66lcagXXRwwCW3Y542bI1JgPo8z/taYKT7K+a2Z5U=", "h1:xZGZf18JjMS06pFa4NErzANI98qi59SEcBsOcS2P2yQ=", "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", @@ -124,6 +126,7 @@ provider "registry.terraform.io/hashicorp/time" { constraints = "0.9.1" hashes = [ "h1:NUv/YtEytDQncBQ2mTxnUZEy/rmDlPYmE9h2iokR0vk=", + "h1:ZrIFtdifvwIr1JocYT311cvOgIUdislZuZ2MzZmxQQ0=", "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", diff --git a/infrastructure/transform/databricks.tf b/infrastructure/transform/databricks.tf index b5efc6a0..8c1f649b 100644 --- a/infrastructure/transform/databricks.tf +++ b/infrastructure/transform/databricks.tf @@ -127,6 +127,10 @@ resource "databricks_cluster" "cluster" { tomap({ for secret_name, secret_value in var.transform.databricks_secrets : "spark.secret.${secret_name}" => "{{secrets/${databricks_secret_scope.secrets.name}/${secret_name}}}" }), + local.unity_catalog_enabled ? tomap({ + "spark.secret.unity-catalog-catalog-name" = "{{secrets/${databricks_secret_scope.secrets.name}/${databricks_secret.unity_catalog_catalog_name[0].key}}}" + "spark.secret.unity-catalog-schema-name" = "{{secrets/${databricks_secret_scope.secrets.name}/${databricks_secret.unity_catalog_schema_name[0].key}}}" + }) : tomap({}), # Any values set in the config var.transform.spark_config, # Special config if in single node configuration diff --git a/infrastructure/transform/datalake/.terraform.lock.hcl b/infrastructure/transform/datalake/.terraform.lock.hcl index 12a79ec1..e21b55c2 100644 --- a/infrastructure/transform/datalake/.terraform.lock.hcl +++ b/infrastructure/transform/datalake/.terraform.lock.hcl @@ -2,21 +2,17 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/databricks/databricks" { - version = "1.9.1" - constraints = "1.9.1" + version = "1.25.1" + constraints = "1.25.1" hashes = [ - "h1:0XIc4cNr+jEswewJQRpcqSmODBhJb5dSrxcpxhiTfFE=", - "h1:A5oD/Qf6MQYDLoMjoJ86+mHo073OOMGA5gcQYLBwP9I=", - "zh:0abe153b02493780fc7bb6d6d6c817b4c1144b8850ceec4eb182ce7956521461", - "zh:37e374515f36486b5729fd43ba094816c448d405f7673da53857b28947987571", - "zh:441847508571125c9db8a30da32fa2344dbf6c00563fcd819a3e813e626c4b64", - "zh:5054b850575b5f79c1cdf5d616c290052f3bdb13029c034c6417bc05a3129d50", - "zh:52eab57817ee97ea5fd9e204f2dfaddcd19371e3353e9f96accd29f49811c3d1", - "zh:78c32ebcd6da7c6504574d636b1dc63b8a4954b3584989d64422ec8a704c3537", - "zh:a6bdb4ab8dae9a737d6b69b9aac706da2aadda159d021aee1bf1836774e0cce5", - "zh:dc416e45b6b6157192cde6a776bf4b98e88c5bf266216ab788ab0f51f1a90641", - "zh:e69c0c5e110a4b74804061d7e2a348e192a688faec67d4f2d60a600223313e9c", - "zh:fa4bdb0fd51d3710282ac04dc1b30ea813b446c1bbd7b901622612f47526906b", + "h1:CS0roEh3PuSFfwDvO3OQCzb7d4bvfaOiMzPFK7o52nY=", + "h1:GvzmeOGE4ZgPCv4lTf43zKpZZ+st/8IdhMfGSIrijnU=", + "zh:21243ef38dc20ad8c8dea80723d3089ddfa88fbd70f08e5225505f7149fb1471", + "zh:31095f7d06d9b3999774115cd7a79ddfa4fd4279d846d43a068cc15d5a279450", + "zh:96ee896cf7495886ca71a2c7a73c0305dc5583922ef9025e2cd1ee822daf6273", + "zh:9fb0f886d84b814f3d2f622ab717336480f6df473530daa6b114110d8949b689", + "zh:d2b05855abf9b4a155c7ac8b423db1d9b270a0a2d4d8e4dd8c32a3a62b5a616f", + "zh:d38a71ce23662257cd10d3a54396bdf10620a0c34143fd5d4db981190d63514a", ] } diff --git a/infrastructure/transform/pipeline.tf b/infrastructure/transform/pipeline.tf index 23a79390..3d4904fe 100644 --- a/infrastructure/transform/pipeline.tf +++ b/infrastructure/transform/pipeline.tf @@ -21,11 +21,7 @@ resource "azurerm_data_factory_pipeline" "pipeline" { parameters = merge( tomap({ for param_name, param in each.value.properties.parameters : param_name => param.defaultValue - }), - local.unity_catalog_enabled ? tomap({ - "catalog_name" = module.unity_catalog[0].catalog_name, - "schema_name" = module.unity_catalog[0].schema_name - }) : tomap({})) + })) depends_on = [ azurerm_data_factory_linked_service_azure_databricks.msi_linked diff --git a/infrastructure/transform/secrets.tf b/infrastructure/transform/secrets.tf index d5f12f38..b83b3746 100644 --- a/infrastructure/transform/secrets.tf +++ b/infrastructure/transform/secrets.tf @@ -92,3 +92,17 @@ resource "databricks_secret" "databricks_config_secret" { string_value = each.value scope = databricks_secret_scope.secrets.id } + +resource "databricks_secret" "unity_catalog_catalog_name" { + count = local.unity_catalog_enabled ? 1 : 0 + key = "unity-catalog-catalog-name" + string_value = module.unity_catalog[0].catalog_name + scope = databricks_secret_scope.secrets.id +} + +resource "databricks_secret" "unity_catalog_schema_name" { + count = local.unity_catalog_enabled ? 1 : 0 + key = "unity-catalog-schema-name" + string_value = module.unity_catalog[0].schema_name + scope = databricks_secret_scope.secrets.id +} diff --git a/infrastructure/transform/unity-catalog-metastore/.terraform.lock.hcl b/infrastructure/transform/unity-catalog-metastore/.terraform.lock.hcl index 117728db..4608419f 100644 --- a/infrastructure/transform/unity-catalog-metastore/.terraform.lock.hcl +++ b/infrastructure/transform/unity-catalog-metastore/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/azure/azapi" { constraints = "1.5.0" hashes = [ "h1:wiX+oIlwttTKq6z3LGbrqmRCkN66C0YgqxM+jKQbejw=", + "h1:y8+jCfTmrUzyAYiy19v8OJMD8tXKiTCQY7lHml8clgE=", "zh:14109c169973e1b0d526131ca047e25f62700a44ecce4303aacb15793764be3e", "zh:19417f2bbbadd0a079d51646a929d43ae7a0293f0fc13c3fa369d32780c1c846", "zh:3254370d3304227ea0ec1352d98aa4a4a59e6a76ddede26454bdb55048101ec3", @@ -22,20 +23,17 @@ provider "registry.terraform.io/azure/azapi" { } provider "registry.terraform.io/databricks/databricks" { - version = "1.9.1" - constraints = "1.9.1" + version = "1.25.1" + constraints = "1.25.1" hashes = [ - "h1:0XIc4cNr+jEswewJQRpcqSmODBhJb5dSrxcpxhiTfFE=", - "zh:0abe153b02493780fc7bb6d6d6c817b4c1144b8850ceec4eb182ce7956521461", - "zh:37e374515f36486b5729fd43ba094816c448d405f7673da53857b28947987571", - "zh:441847508571125c9db8a30da32fa2344dbf6c00563fcd819a3e813e626c4b64", - "zh:5054b850575b5f79c1cdf5d616c290052f3bdb13029c034c6417bc05a3129d50", - "zh:52eab57817ee97ea5fd9e204f2dfaddcd19371e3353e9f96accd29f49811c3d1", - "zh:78c32ebcd6da7c6504574d636b1dc63b8a4954b3584989d64422ec8a704c3537", - "zh:a6bdb4ab8dae9a737d6b69b9aac706da2aadda159d021aee1bf1836774e0cce5", - "zh:dc416e45b6b6157192cde6a776bf4b98e88c5bf266216ab788ab0f51f1a90641", - "zh:e69c0c5e110a4b74804061d7e2a348e192a688faec67d4f2d60a600223313e9c", - "zh:fa4bdb0fd51d3710282ac04dc1b30ea813b446c1bbd7b901622612f47526906b", + "h1:CS0roEh3PuSFfwDvO3OQCzb7d4bvfaOiMzPFK7o52nY=", + "h1:GvzmeOGE4ZgPCv4lTf43zKpZZ+st/8IdhMfGSIrijnU=", + "zh:21243ef38dc20ad8c8dea80723d3089ddfa88fbd70f08e5225505f7149fb1471", + "zh:31095f7d06d9b3999774115cd7a79ddfa4fd4279d846d43a068cc15d5a279450", + "zh:96ee896cf7495886ca71a2c7a73c0305dc5583922ef9025e2cd1ee822daf6273", + "zh:9fb0f886d84b814f3d2f622ab717336480f6df473530daa6b114110d8949b689", + "zh:d2b05855abf9b4a155c7ac8b423db1d9b270a0a2d4d8e4dd8c32a3a62b5a616f", + "zh:d38a71ce23662257cd10d3a54396bdf10620a0c34143fd5d4db981190d63514a", ] } @@ -43,6 +41,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.47.0" constraints = "3.47.0" hashes = [ + "h1:LzQtMKZcMT5GhQSHt5SS3aUFN3FTkyIindgj/dkJYWI=", "h1:gWdjrOUCdfRB5VrQ0qxJI/coNh5chWw9884qM/nTg0E=", "zh:099ffaec3ef0ef45a23aebd851fdf49a279f872632dd2e72fa3cb897621511ac", "zh:0a2c33eff74c8934a371cff9647edc59a35cd2810d63613e5de4f6f2e43ae014", diff --git a/infrastructure/transform/unity-catalog/.terraform.lock.hcl b/infrastructure/transform/unity-catalog/.terraform.lock.hcl index 117728db..4608419f 100644 --- a/infrastructure/transform/unity-catalog/.terraform.lock.hcl +++ b/infrastructure/transform/unity-catalog/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/azure/azapi" { constraints = "1.5.0" hashes = [ "h1:wiX+oIlwttTKq6z3LGbrqmRCkN66C0YgqxM+jKQbejw=", + "h1:y8+jCfTmrUzyAYiy19v8OJMD8tXKiTCQY7lHml8clgE=", "zh:14109c169973e1b0d526131ca047e25f62700a44ecce4303aacb15793764be3e", "zh:19417f2bbbadd0a079d51646a929d43ae7a0293f0fc13c3fa369d32780c1c846", "zh:3254370d3304227ea0ec1352d98aa4a4a59e6a76ddede26454bdb55048101ec3", @@ -22,20 +23,17 @@ provider "registry.terraform.io/azure/azapi" { } provider "registry.terraform.io/databricks/databricks" { - version = "1.9.1" - constraints = "1.9.1" + version = "1.25.1" + constraints = "1.25.1" hashes = [ - "h1:0XIc4cNr+jEswewJQRpcqSmODBhJb5dSrxcpxhiTfFE=", - "zh:0abe153b02493780fc7bb6d6d6c817b4c1144b8850ceec4eb182ce7956521461", - "zh:37e374515f36486b5729fd43ba094816c448d405f7673da53857b28947987571", - "zh:441847508571125c9db8a30da32fa2344dbf6c00563fcd819a3e813e626c4b64", - "zh:5054b850575b5f79c1cdf5d616c290052f3bdb13029c034c6417bc05a3129d50", - "zh:52eab57817ee97ea5fd9e204f2dfaddcd19371e3353e9f96accd29f49811c3d1", - "zh:78c32ebcd6da7c6504574d636b1dc63b8a4954b3584989d64422ec8a704c3537", - "zh:a6bdb4ab8dae9a737d6b69b9aac706da2aadda159d021aee1bf1836774e0cce5", - "zh:dc416e45b6b6157192cde6a776bf4b98e88c5bf266216ab788ab0f51f1a90641", - "zh:e69c0c5e110a4b74804061d7e2a348e192a688faec67d4f2d60a600223313e9c", - "zh:fa4bdb0fd51d3710282ac04dc1b30ea813b446c1bbd7b901622612f47526906b", + "h1:CS0roEh3PuSFfwDvO3OQCzb7d4bvfaOiMzPFK7o52nY=", + "h1:GvzmeOGE4ZgPCv4lTf43zKpZZ+st/8IdhMfGSIrijnU=", + "zh:21243ef38dc20ad8c8dea80723d3089ddfa88fbd70f08e5225505f7149fb1471", + "zh:31095f7d06d9b3999774115cd7a79ddfa4fd4279d846d43a068cc15d5a279450", + "zh:96ee896cf7495886ca71a2c7a73c0305dc5583922ef9025e2cd1ee822daf6273", + "zh:9fb0f886d84b814f3d2f622ab717336480f6df473530daa6b114110d8949b689", + "zh:d2b05855abf9b4a155c7ac8b423db1d9b270a0a2d4d8e4dd8c32a3a62b5a616f", + "zh:d38a71ce23662257cd10d3a54396bdf10620a0c34143fd5d4db981190d63514a", ] } @@ -43,6 +41,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.47.0" constraints = "3.47.0" hashes = [ + "h1:LzQtMKZcMT5GhQSHt5SS3aUFN3FTkyIindgj/dkJYWI=", "h1:gWdjrOUCdfRB5VrQ0qxJI/coNh5chWw9884qM/nTg0E=", "zh:099ffaec3ef0ef45a23aebd851fdf49a279f872632dd2e72fa3cb897621511ac", "zh:0a2c33eff74c8934a371cff9647edc59a35cd2810d63613e5de4f6f2e43ae014", diff --git a/infrastructure/transform/unity-catalog/workspace-assignment.tf b/infrastructure/transform/unity-catalog/workspace-assignment.tf index ebcca5ca..afa016b0 100644 --- a/infrastructure/transform/unity-catalog/workspace-assignment.tf +++ b/infrastructure/transform/unity-catalog/workspace-assignment.tf @@ -13,13 +13,13 @@ # limitations under the License. resource "databricks_metastore_assignment" "workspace_assignment" { + provider = databricks.accounts workspace_id = data.azurerm_databricks_workspace.workspace.workspace_id metastore_id = var.metastore_id - - depends_on = [databricks_metastore_data_access.metastore_data_access] } resource "databricks_metastore_data_access" "metastore_data_access" { + provider = databricks.accounts metastore_id = var.metastore_id name = "dbks-metastore-access-${var.naming_suffix}" @@ -28,4 +28,6 @@ resource "databricks_metastore_data_access" "metastore_data_access" { } is_default = var.metastore_created + + depends_on = [databricks_metastore_assignment.workspace_assignment] } diff --git a/providers.hcl b/providers.hcl index 451fee70..523ea044 100644 --- a/providers.hcl +++ b/providers.hcl @@ -60,7 +60,7 @@ EOF required_provider_databricks = <