From 69095849604dded0167dca56413b8e602f220788 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Thu, 27 Jun 2024 12:22:22 +0100 Subject: [PATCH 1/2] Databricks ips (#3964) --- CHANGELOG.md | 1 + .../databricks/terraform/.terraform.lock.hcl | 108 ++-- .../databricks/terraform/databricks-udr.json | 470 +++++++++++++++--- .../databricks/terraform/providers.tf | 8 +- 4 files changed, 446 insertions(+), 141 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e83998c24..d24a717e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ FEATURES: ENHANCEMENTS: +* Additional DataBrick IPs added ([#3901](https://github.com/microsoft/AzureTRE/issues/3901)) * Add KeyVault Purge Protection Variable ([#3922](https://github.com/microsoft/AzureTRE/issues/3922)) * Update Guacamole Windows 11 VM Image to 2Win11-23h2-pro ([#3995](https://github.com/microsoft/AzureTRE/issues/3995)) * Make check for email addresses prior to an airlock request being created optional. ([#3904](https://github.com/microsoft/AzureTRE/issues/3904)) diff --git a/templates/workspace_services/databricks/terraform/.terraform.lock.hcl b/templates/workspace_services/databricks/terraform/.terraform.lock.hcl index a5d87419ff..450f2307b5 100644 --- a/templates/workspace_services/databricks/terraform/.terraform.lock.hcl +++ b/templates/workspace_services/databricks/terraform/.terraform.lock.hcl @@ -2,79 +2,75 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/azure/azapi" { - version = "1.1.0" - constraints = "1.1.0" + version = "1.13.1" + constraints = "1.13.1" hashes = [ - "h1:IR+AHCwfjl1c0baWwfOwZ6QZtHj41H2syTgHkJtAr/M=", - "zh:2a25df6325a49f9e821f0b02c7da86167fc19a3bac647cd1edf231300f29d077", - "zh:2b443a836a39724663fe455d4deee408ff3a2d9a8b86f8408aa7db2e8aa743f8", - "zh:364ed09ddfc50d9bed8d930f7de489cb654a9908feb139413a097823a50075fd", - "zh:523bc005f56ae785867d230d55c29f59db4b599dbc6c38b4d03ea55a79458916", - "zh:60ded375fdb305b60bcb4d9e596dbb222cab166bad1b4958199b05a72aaeacfd", - "zh:61e69c58642fead6814e511c872b7c0a6478ec6af4ab758b4512607d910ac078", - "zh:823b2154ae2262dabcbd11aac992e3cc29eae0f7baa96bee1e3e2fe1ece8730b", - "zh:870ea9cc24807ef5142e4cad0281dac7173f7b6bf818a79762b6c690d12d4c4b", - "zh:9094ae76ed66cb328a4f35bd18b9140fb6fc6859c2e46431ec73c018bcb58d96", - "zh:d89149cfd01cb70012459536b4d36490b58e43312440562e5910bd5160537858", - "zh:dba7ec06171ca062fc423ba5b4776a5600444e45e57f4d1cb043bdc3eee538b7", - "zh:ff5bd6883d9ac8334e043434246357a55107411e9a962856c1d17e47ee15ac37", + "h1:xDZG4lbtQJeyJa3Gzo8qecYxyw+AIXYcdDRlkaSLNz8=", + "zh:1f2aceddd67ceeb82a75c2f15dc01e54781e9aed5968507dbc29590c165b2e2b", + "zh:397f0bfbac899d48e23cecf38d362c27562150aa20b19157b5bd370b8e6801ee", + "zh:652263b7d00623684e29ef7b8ff285a17c5bd7cc8ba7d22967c66d0b3a3c568a", + "zh:652c53320a41434942877515780296a1509be03f32d54e60178f39200f960a67", + "zh:666426faf686401e54ec09fe06e9d7c06a6455ec398764f70558440c73aeb7f9", + "zh:6aa91ae8ba78f2494f99b4c99e66d15ed0b14d735cd1f77adc12ff9dfa075807", + "zh:a529e5a13c37d1805c469227f08cdbe7527d04dd64d18709d26627c6a0b588b1", + "zh:a589c049205e8e5bf94a13d56b28f400d908ad27e13e16df64408ee82eb8a0ff", + "zh:a9a50defdee230f315f74be6c77ff104fe2610a1b3ad6b87326f555e80d13b18", + "zh:ba49ef70d96e13795e2dbffd6cb2ff976dfe84e0373a5971ebe3b4c9c9b7af60", + "zh:d3ed50efe5f8c80d3d7d464ab9a13ccf82440d871c9ce3032ce476845364c6b9", + "zh:e3eb48ee8c36ee4f81850d8a21fc59b81886c729d7c3b7adece4a25f355bed2f", ] } provider "registry.terraform.io/databricks/databricks" { - version = "1.5.0" - constraints = "1.5.0" + version = "1.48.0" + constraints = "1.48.0" hashes = [ - "h1:UJe5L/BteOU7M5ewRLzuUjiewYFLF695eLp3hMKVR6M=", - "zh:0fa9ca13d977a8dcb46254f07c9be731891468f5b423f09cb51da97eaace8e2b", - "zh:3a648e4f8ece8aab05acfc7759b4e4cd153ecd29b3ed0e00d7f1a3a19911f7d8", - "zh:3b052b98b5e22ae4e81e4b667ae5cee9a68bb1750d22546ae9eff16c8d6a294a", - "zh:4320b165218cb39f0ad313d483bba20d0de9e48db0c1467fd0e3a0afb2c02012", - "zh:588c9fdbf35ca9c430cafb5dbd90f34a165744e3514212d0f2c07a3387d8b339", - "zh:b50f8eb38b556ddfa24a76b4113e8a84b778a9a0bb4b4ba5fdc3edca59198d2a", - "zh:ca5186443ac672f5566d9c9b5727f55124a8642dd3949e973790b9195e6b306a", - "zh:db817409b94c34c9b9b5e109751eff7fbca90d08b407a099630c8ec79b6c6d4b", - "zh:edf04424c68db603bf2473e2f14f3e3ad217feb84fc2c7debb6641d15886f8e3", - "zh:ef374f84c41fe529bff1ec3274eb7fe5dd8184c5e71f3e6d99a6adaff6eab82e", + "h1:o1tNRClUSRi0luylRIJEZWkXTcAWj3okW4UzZxyLj+c=", + "zh:2f754ee98cc6779cc989363156fee3a094c3e3b42f5fc7725058b76a2dcc8672", + "zh:8e328c079117a274815f4e4c7c456e4dd4c3bcf72547bf96e7ccd873e6dde73a", + "zh:9d5ae7428e2a12c13138a360b51195a7d76cffd86c2b3587a6a8a931b26cb560", + "zh:c4067270ae9639261493b36200bce767c3546351e3ad1198bc4b909efef98400", + "zh:d93a9ff998e27f6db70a0ffb37cd31c3e6c9c42291ef69030581c8ed7a133ee5", + "zh:f154f5c0331f23fc3a2f2afb9ad6ebc3f32546a9370171259e344a11aeada7f6", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.40.0" - constraints = "3.40.0" + version = "3.108.0" + constraints = "3.108.0" hashes = [ - "h1:/Jbhw/zNAsDYDoASaG6w+0KZyay9BkUVOpR8b7m0CsA=", - "zh:00fa6dc05bf2643c6a3c741edb7d88263698086835a8a613f1d7bd76d1b918fd", - "zh:0da9b788e773272a7aa9d59bd9e3d5842edd4acc8c3895bea469e66dc14205a0", - "zh:25a8c39d1f042fc7c83ba9dd745c3569ea9e577fadb57563a575fb115ac2b9f1", - "zh:4423666dbeae8bc22c6e8898ffbb88745681dc27668ca9104b665dd7f3d7292c", - "zh:78c07308e7407b558d15737a98fb5eaf15529d297fc3798de6a7d61e0466e2e3", - "zh:894aca7e6f4f331ee8eb51957a180dc03d399d2b1727e0d7842e9b3f022a8c6a", - "zh:bb0e620c2161b4c4892a6f50b1c4c69ed70f66bb5e92543a03d79d0e4b1d9441", - "zh:c7d8e6a791159ca63b30908c9efe72ab65f60d64b30f0c1eb5a64972f4994844", - "zh:d04c11bfd346c1ac34d16bbdca70b23b006e822f6beb236b85375e8343888eb4", - "zh:f4edea9660327c7c70a823d786fd1b1c1b186c8759770447f63da72f23e1a73c", + "h1:RIFBFTXz4X48JDHjbQHX4y400ax1/uEzMVFZgX3/z3w=", + "zh:2afecf948fd702bc08c87d9114595809d011f99a70a12dbf6bc67a12d0bee5fc", + "zh:395b6d1384a579867064e62d49b0b91e15919c33b03ea8b5031c2779bfa16b3d", + "zh:3e5594c59b6b02bc6e0f4c3de71aa2ab992494c53725fb3c64d36745f3814ef3", + "zh:4613e190609377309f6a4ac44f631c9469efab3ae148dbb09e73718201dc4f42", + "zh:624f01cb7604d58100068401bd07ab09a141e7bd318f8214127838cf202e4868", + "zh:65709950c9933e38704e2075a2339951e1259a6e882f35d390be36e1844ebc72", + "zh:af82657fad4e3a177f2ebb8035b45bda40f8856eb999288533321028794d03e5", + "zh:c40b331eba08830d16c0e6795fa7cbf08231073df2cfdb0f34e9d908a915981a", + "zh:d6ccd533a0bd984ca7ed1ae860e057e9e2f88468745be9712236d2d240353de4", + "zh:f361fd398e8772f8554a010331d161d6f7284a43238fd28bfa7b41795a5538b8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f986e268949cf445ff53a66af48a87c6f6dba5964e8a5b1dc0ea02afabdd71f7", + "zh:f8c2132c77d35930203ec66f1bf9bbf633a2406e9f7b572ff425d65b8aa8c492", ] } provider "registry.terraform.io/hashicorp/dns" { - version = "3.2.3" - constraints = "3.2.3" + version = "3.4.1" + constraints = "3.4.1" hashes = [ - "h1:ODcR+vWOhCAJ2iCChZMVdRglNCx07VNr67OPLRPZyDY=", - "zh:03a304f4b76ac6c8bebffddcdf555bf77578a7f638948a681589def32e140cb8", - "zh:08c7d2498b747054e9c9df7838bfa4e4a6b5d63e2d29f0457247e384f792d56c", - "zh:20adf489819ba51ba9d9d15da2dbe1fecb92491b3d0dd80096873e5e84d8b4bd", - "zh:2959ff209d2578456ca490672b82864d483b9e9db9efc8e4ffada06e23017609", - "zh:3ecd0b22db79550fb1108ff7bd00c4066825e8c23bb64e3cc8d9b8102e8caa45", - "zh:6e53a9232245b4be52b56b078f15f270b89afe6abb9c9b8baab4a282fe0cf9f8", + "h1:6VWKyyb75bXOvm+jFNyOfu/cj0SdcDru7seMblWRBfc=", + "zh:00fc9ba46d66a35c0f4cb66d19b402280f5d074a5652b6a378aac9b11b93d069", + "zh:0d612631e82f246d1e7ee20d3dff29ad1c328d1cec0a3b030719e6246676737b", + "zh:29b847c53ea307acf7ed923c751f3051aae3308a23ba376ad86b120c0f6b978b", + "zh:4b5612e01d369ba56abe87daaea12e65114da9befdd080bf26269dfcbd1c07fa", + "zh:5a2e3af49eabe6592bc24ff6c718872cc8a3fbc3b7be152b00d124ef1dd5d0bd", + "zh:6570128aa7cb71390f78b9aa918c937f1ab0d695e8d7a0b38b84713d2cc92893", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:80437bdfa08eb90f70105b52cb06799a8f7967313654b43d28d7f654fcd4edc1", - "zh:816ddaca0ecc29e287376e5b0b8b0729ee13f23a9d74bfad5b14b7983e1a1775", - "zh:82d8ac7ad00c1a71d0a7c1aca03bb59a6b51128f895242df80b1f3d016c3c51a", - "zh:ec9243b8bd80693a6eeeea5d4f7f4e6f57bd44ae796d6d5b1a91790e359f8a61", - "zh:fd821adbfb03a2c9eac111ff27a32b3a5523b18f80333008de85482d3bbea645", + "zh:874cbc34ef9973e4b1f894d910e7f853cc317ee6b5208179d41c1bfa51831425", + "zh:946d5fbe75d4fc0fdc1d2deea85a5e02ec46f6830731f9414884276b7c3ec4bc", + "zh:b1cde393e83634c733649caea76ef6f4f14f01f2b04e8c90926ccbb49ac6c53d", + "zh:b803d82cf6fc8ae6660f896144e065d6ed032273a3eb418e62b39a7dec73f734", + "zh:e8d8b93b1c13b199c929819b2b049627a6d3874fd3f16e05b3f594d526233dd6", ] } diff --git a/templates/workspace_services/databricks/terraform/databricks-udr.json b/templates/workspace_services/databricks/terraform/databricks-udr.json index c8454c7352..4cabb84df9 100644 --- a/templates/workspace_services/databricks/terraform/databricks-udr.json +++ b/templates/workspace_services/databricks/terraform/databricks-udr.json @@ -1,9 +1,21 @@ { "australiacentral": { - "webappDestinationAddresses": ["13.75.218.172/32"], + "webappDestinationAddresses": [ + "13.75.218.172/32", + "20.70.34.64/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.75.164.249/32"], "sccRelayDomains": ["tunnel.australiaeast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.70.105.50/32"], + "controlPlaneNatDestinationAddresses": [ + "13.70.105.50/32", + "20.211.147.64/29", + "20.28.138.72/29", + "20.11.26.96/29", + "20.40.72.88/29", + "20.5.1.136/29", + "20.5.170.240/29" + ], "extendedInfrastructureDestinationAddresses": ["20.53.145.128/28"], " ": ["dblogprodausteast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -20,10 +32,22 @@ ] }, "australiacentral2": { - "webappDestinationAddresses": ["13.75.218.172/32"], + "webappDestinationAddresses": [ + "13.75.218.172/32", + "20.193.110.128/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.75.164.249/32"], "sccRelayDomains": ["tunnel.australiaeast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.70.105.50/32"], + "controlPlaneNatDestinationAddresses": [ + "13.70.105.50/32", + "20.211.147.64/29", + "20.28.138.72/29", + "20.11.26.96/29", + "20.40.72.88/29", + "20.5.1.136/29", + "20.5.170.240/29" + ], "extendedInfrastructureDestinationAddresses": ["20.53.145.128/28"], "logBlobStorageDomains": ["dblogprodausteast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -40,10 +64,22 @@ ] }, "australiaeast": { - "webappDestinationAddresses": ["13.75.218.172/32"], + "webappDestinationAddresses": [ + "13.75.218.172/32", + "4.147.241.0/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.75.164.249/32"], "sccRelayDomains": ["tunnel.australiaeast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.70.105.50/32"], + "controlPlaneNatDestinationAddresses": [ + "13.70.105.50/32", + "20.211.147.64/29", + "20.28.138.72/29", + "20.11.26.96/29", + "20.40.72.88/29", + "20.5.1.136/29", + "20.5.170.240/29" + ], "extendedInfrastructureDestinationAddresses": ["20.53.145.128/28"], "logBlobStorageDomains": ["dblogprodausteast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -76,10 +112,22 @@ ] }, "australiasoutheast": { - "webappDestinationAddresses": ["13.75.218.172/32"], + "webappDestinationAddresses": [ + "13.75.218.172/32", + "4.198.113.16/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.75.164.249/32"], "sccRelayDomains": ["tunnel.australiaeast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.70.105.50/32"], + "controlPlaneNatDestinationAddresses": [ + "13.70.105.50/32", + "20.211.147.64/29", + "20.28.138.72/29", + "20.11.26.96/29", + "20.40.72.88/29", + "20.5.1.136/29", + "20.5.170.240/29" + ], "extendedInfrastructureDestinationAddresses": ["20.53.145.128/28"], "logBlobStorageDomains": ["dblogprodausteast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -96,10 +144,22 @@ ] }, "brazilsouth": { - "webappDestinationAddresses": ["104.41.54.118/32"], + "webappDestinationAddresses": [ + "104.41.54.118/32", + "20.201.68.160/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["23.97.106.142/32"], "sccRelayDomains": ["tunnel.brazilsouth.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["191.232.53.223/32"], + "controlPlaneNatDestinationAddresses": [ + "191.232.53.223/32", + "20.206.205.232/29", + "20.201.127.40/29", + "191.233.243.72/29", + "20.206.144.56/29", + "191.233.243.64/29", + "20.206.205.224/29" + ], "extendedInfrastructureDestinationAddresses": ["20.197.222.144/28"], "logBlobStorageDomains": ["dblogprodbrazilsou.blob.core.windows.net."], "artifactBlobStoragePrimaryDomains": [ @@ -116,10 +176,22 @@ ] }, "canadacentral": { - "webappDestinationAddresses": ["13.71.184.74/32"], + "webappDestinationAddresses": [ + "13.71.184.74/32", + "20.220.50.240/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.88.249.244/32"], "sccRelayDomains": ["tunnel.canadacentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.85.223.25/32"], + "controlPlaneNatDestinationAddresses": [ + "40.85.223.25/32", + "4.229.241.184/29", + "20.151.153.184/29", + "4.239.251.152/29", + "20.151.145.208/29", + "4.239.251.160/29", + "4.229.241.192/29" + ], "extendedInfrastructureDestinationAddresses": ["52.139.4.160/28"], "logBlobStorageDomains": ["dblogprodcacentral.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -142,10 +214,22 @@ ] }, "canadaeast": { - "webappDestinationAddresses": ["13.71.184.74/32"], + "webappDestinationAddresses": [ + "13.71.184.74/32", + "20.220.99.176/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.88.249.244/32"], "sccRelayDomains": ["tunnel.canadacentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.85.223.25/32"], + "controlPlaneNatDestinationAddresses": [ + "40.85.223.25/32", + "4.229.241.184/29", + "20.151.153.184/29", + "4.239.251.152/29", + "20.151.145.208/29", + "4.239.251.160/29", + "4.229.241.192/29" + ], "extendedInfrastructureDestinationAddresses": ["52.139.4.160/28"], "logBlobStorageDomains": ["dblogprodcacentral.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -165,10 +249,22 @@ ] }, "centralindia": { - "webappDestinationAddresses": ["104.211.89.81/32"], + "webappDestinationAddresses": [ + "104.211.89.81/32", + "20.235.199.64/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.172.133.58/32"], "sccRelayDomains": ["tunnel.centralindia.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["104.211.101.14/32"], + "controlPlaneNatDestinationAddresses": [ + "104.211.101.14/32", + "20.244.88.56/29", + "98.70.76.16/29", + "20.198.25.0/29", + "98.70.75.40/29", + "20.198.9.224/29", + "98.70.91.64/29" + ], "extendedInfrastructureDestinationAddresses": ["20.193.246.208/28"], "logBlobStorageDomains": ["dblogprodcindia.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -191,7 +287,12 @@ ] }, "centralus": { - "webappDestinationAddresses": ["40.70.58.221/32", "20.37.156.209/32"], + "webappDestinationAddresses": [ + "40.70.58.221/32", + "20.37.156.209/32", + "4.249.192.240/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["13.86.58.215/32", "52.247.0.200/32"], "sccRelayDomains": [ "tunnel.eastus2.azuredatabricks.net", @@ -199,7 +300,19 @@ ], "controlPlaneNatDestinationAddresses": [ "23.101.152.95/32", - "20.37.156.208/32" + "20.37.156.208/32", + "52.180.139.48/29", + "172.202.121.240/29", + "20.186.233.208/29", + "74.249.107.232/29", + "20.161.82.48/29", + "20.161.68.208/29", + "4.150.177.120/29", + "52.165.98.248/29", + "20.15.235.192/29", + "20.161.81.88/29", + "20.161.68.200/29", + "68.154.4.136/29" ], "extendedInfrastructureDestinationAddresses": ["20.57.106.0/28"], "logBlobStorageDomains": [ @@ -322,10 +435,22 @@ }, "eastasia": { - "webappDestinationAddresses": ["52.187.145.107/32"], + "webappDestinationAddresses": [ + "20.189.106.192/32", + "20.239.211.144/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["102.37.41.3/32"], "sccRelayDomains": ["tunnel.southeastasia.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["52.187.0.85/32"], + "controlPlaneNatDestinationAddresses": [ + "20.189.106.194/32", + "20.2.226.184/29", + "20.2.234.144/29", + "52.184.83.208/29", + "20.205.24.128/29", + "20.189.126.232/29", + "20.6.233.184/29" + ], "extendedInfrastructureDestinationAddresses": ["20.195.104.64/28"], "logBlobStorageDomains": [ "dblogprodseasia.blob.core.windows.net", @@ -350,7 +475,9 @@ "webappDestinationAddresses": [ "40.70.58.221/32", "20.42.4.209/32", - "20.42.4.211/32" + "20.42.4.211/32", + "52.234.168.240/28", + "4.150.168.160/28" ], "sccRelayDestinationAddresses": ["52.247.0.200/32", "52.146.50.16/32"], "sccRelayDomains": [ @@ -360,7 +487,19 @@ "controlPlaneNatDestinationAddresses": [ "23.101.152.95/32", "20.42.4.208/32", - "20.42.4.210/32" + "20.42.4.210/32", + "57.151.106.192/29", + "57.151.124.96/29", + "57.151.82.88/29", + "74.249.107.232/29", + "20.161.82.48/29", + "20.161.68.208/29", + "57.151.124.56/29", + "57.151.84.240/29", + "172.203.186.112/29", + "20.161.81.88/29", + "20.161.68.200/29", + "68.154.4.136/29" ], "extendedInfrastructureDestinationAddresses": ["20.57.106.0/28"], "logBlobStorageDomains": [ @@ -399,7 +538,6 @@ "consolidated-eastus-prod-metastore-addl-2.mysql.database.azure.com", "consolidated-eastus-prod-metastore-addl-3.mysql.database.azure.com", "consolidated-eastus-prod-metastore-addl-4.mysql.database.azure.com", - "consolidated-eastusc2-prod-metastore-0.mysql.database.azure.com", "consolidated-eastusc3-prod-metastore-0.mysql.database.azure.com", "consolidated-eastusc3-prod-metastore-1.mysql.database.azure.com", "consolidated-eastusc3-prod-metastore-2.mysql.database.azure.com", @@ -407,15 +545,35 @@ ] }, "eastus2": { - "webappDestinationAddresses": ["40.70.58.221/32", "20.41.4.113/32"], + "webappDestinationAddresses": [ + "40.70.58.221/32", + "20.41.4.113/32", + "20.41.4.116/32", + "52.254.24.96/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.247.0.200/32", "20.186.83.56/32"], "sccRelayDomains": [ "tunnel.eastus2.azuredatabricks.net", - "tunnel.eastus2c2.azuredatabricks.net" + "tunnel.eastus2c2.azuredatabricks.net", + "tunnel.eastus2c3.azuredatabricks.net" ], "controlPlaneNatDestinationAddresses": [ "23.101.152.95/32", - "20.41.4.112/32" + "20.41.4.112/32", + "20.41.4.114/32", + "74.249.107.232/29", + "20.161.82.48/29", + "20.161.68.208/29", + "74.249.108.56/29", + "20.161.82.56/29", + "20.161.68.216/29", + "74.249.108.120/29", + "20.161.82.64/29", + "20.161.68.224/29", + "20.161.81.88/29", + "20.161.68.200/29", + "68.154.4.136/29" ], "extendedInfrastructureDestinationAddresses": ["20.57.106.0/28"], "logBlobStorageDomains": [ @@ -460,7 +618,6 @@ "consolidated-eastus2c3-prod-metastore-0.mysql.database.azure.com" ] }, - "eastus2euap": { "webappDestinationAddresses": [""], "sccRelayDestinationAddresses": [""], @@ -473,12 +630,15 @@ "eventHubEndpointDomains": [""], "metastoreDomains": [""] }, - "francecentral": { - "webappDestinationAddresses": ["40.89.168.225/32"], + "webappDestinationAddresses": [ + "40.89.168.225/32", + "20.19.113.192/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.103.18.111/32"], "sccRelayDomains": ["tunnel.francecentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.89.171.101/32"], + "controlPlaneNatDestinationAddresses": ["40.89.171.101/32", "98.66.170.152/29", "4.233.185.56/29", "20.19.35.8/29", "4.233.193.64/29", "20.19.34.168/29", "4.178.122.232/29"], "extendedInfrastructureDestinationAddresses": ["20.74.69.128/28"], "logBlobStorageDomains": ["dblogprodfrcentral.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -495,10 +655,14 @@ ] }, "germanywestcentral": { - "webappDestinationAddresses": ["20.52.93.41/32"], + "webappDestinationAddresses": [ + "20.52.93.41/32", + "98.67.225.0/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["20.52.93.40/32"], "sccRelayDomains": ["tunnel.germanywestcentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["20.52.93.42/32"], + "controlPlaneNatDestinationAddresses": ["20.52.93.42/32", "20.218.169.48/29", "98.67.186.40/29", "51.116.120.104/29", "98.67.186.32/29", "51.116.120.96/29", "20.218.169.40/29"], "extendedInfrastructureDestinationAddresses": ["20.52.93.40/29"], "logBlobStorageDomains": ["dblogprodgerwescen.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -515,10 +679,14 @@ ] }, "japaneast": { - "webappDestinationAddresses": ["52.246.160.72/32"], + "webappDestinationAddresses": [ + "52.246.160.72/32", + "4.189.194.16/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["20.46.121.76/32"], "sccRelayDomains": ["tunnel.japaneast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.78.19.235/32"], + "controlPlaneNatDestinationAddresses": ["13.78.19.235/32", "20.210.195.88/29", "20.40.91.88/29", "4.216.211.0/29", "20.222.179.176/29", "20.243.34.72/29", "20.210.194.80/29"], "extendedInfrastructureDestinationAddresses": ["20.78.226.176/28"], "logBlobStorageDomains": ["dblogprodjapaneast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -535,10 +703,14 @@ ] }, "japanwest": { - "webappDestinationAddresses": ["52.246.160.72/32"], + "webappDestinationAddresses": [ + "52.246.160.72/32", + "138.91.16.64/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["20.46.121.76/32"], "sccRelayDomains": ["tunnel.japaneast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["13.78.19.235/32"], + "controlPlaneNatDestinationAddresses": ["13.78.19.235/32", "20.210.195.88/29", "20.40.91.88/29", "4.216.211.0/29", "20.222.179.176/29", "20.243.34.72/29", "20.210.194.80/29"], "extendedInfrastructureDestinationAddresses": ["20.78.226.176/28"], "logBlobStorageDomains": ["dblogprodjapaneast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -555,10 +727,14 @@ ] }, "koreacentral": { - "webappDestinationAddresses": ["52.141.22.164/32"], + "webappDestinationAddresses": [ + "52.141.22.164/32", + "20.214.117.160/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["20.194.4.102/32"], "sccRelayDomains": ["tunnel.koreacentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["52.141.6.181/32"], + "controlPlaneNatDestinationAddresses": ["52.141.6.181/32", "20.39.199.24/29", "20.41.120.112/29", "52.141.26.136/29", "20.41.105.232/29", "52.141.26.120/29", "20.39.198.216/29"], "extendedInfrastructureDestinationAddresses": ["20.194.107.48/28"], "logBlobStorageDomains": ["dblogprodkoreacentral.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -575,15 +751,19 @@ ] }, "northcentralus": { - "webappDestinationAddresses": ["40.70.58.221/32", "40.80.188.0/32"], + "webappDestinationAddresses": [ + "40.70.58.221/32", + "40.80.188.0/32", + "172.214.168.112/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.247.0.200/32", "23.100.226.13/32"], "sccRelayDomains": [ "tunnel.eastus2.azuredatabricks.net", "tunnel.northcentralusc2.azuredatabricks.net" ], "controlPlaneNatDestinationAddresses": [ - "23.101.152.95/32", - "40.80.188.1/32" + "23.101.152.95/32", "40.80.188.1/32", "74.249.107.232/29", "20.161.82.48/29", "20.161.68.208/29", "52.240.210.16/28", "20.161.81.88/29", "20.161.68.200/29", "68.154.4.136/29" ], "extendedInfrastructureDestinationAddresses": ["20.57.106.0/28"], "logBlobStorageDomains": [ @@ -606,15 +786,19 @@ ] }, "northeurope": { - "webappDestinationAddresses": ["52.232.19.246/32", "20.38.84.81/32"], + "webappDestinationAddresses": [ + "52.232.19.246/32", + "20.38.84.81/32", + "4.209.165.0/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["23.97.201.41/32", "40.127.147.196/32"], "sccRelayDomains": [ "tunnel.westeurope.azuredatabricks.net", "tunnel.northeuropec2.azuredatabricks.net" ], "controlPlaneNatDestinationAddresses": [ - "23.100.0.135/32", - "20.38.84.80/32" + "23.100.0.135/32", "20.38.84.80/32", "98.71.25.152/29", "4.245.219.224/29", "20.123.51.88/29", "172.201.83.192/29", "172.211.2.248/29", "172.205.204.120/29", "4.245.227.208/29", "68.219.252.224/29", "74.234.43.80/29", "172.211.67.168/29", "172.201.244.200/29", "172.211.58.192/29" ], "extendedInfrastructureDestinationAddresses": ["20.73.215.48/28"], "logBlobStorageDomains": ["dblogprodwesteurope.blob.core.windows.net"], @@ -646,10 +830,22 @@ ] }, "norwayeast": { - "webappDestinationAddresses": ["51.120.40.120/32"], + "webappDestinationAddresses": [ + "51.120.40.120/32", + "20.100.214.208/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.120.40.122/32"], "sccRelayDomains": ["tunnel.norwayeast.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.120.40.121/32"], + "controlPlaneNatDestinationAddresses": [ + "51.120.40.121/32", + "51.120.246.120/29", + "4.235.113.232/29", + "51.120.8.208/29", + "20.251.169.232/29", + "51.120.8.32/29", + "51.120.246.96/29" + ], "extendedInfrastructureDestinationAddresses": ["51.13.86.224/28"], "logBlobStorageDomains": ["dblogprodnweast.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -665,11 +861,47 @@ "consolidated-norwayeast-prod-metastore-0.mysql.database.azure.com" ] }, + "qatarcentral": { + "webappDestinationAddresses": [ + "20.21.32.32/32", + "20.173.17.128/28", + "4.150.168.160/28" + ], + "sccRelayDestinationAddresses": [""], + "sccRelayDomains": ["tunnel.qatarcentral.azuredatabricks.net"], + "controlPlaneNatDestinationAddresses": [ + "20.21.32.34/32", + "20.173.105.240/29", + "20.173.97.224/29", + "20.173.50.48/29", + "20.21.129.232/29", + "20.173.50.40/29", + "20.173.105.232/29" + ], + "extendedInfrastructureDestinationAddresses": [""], + "logBlobStorageDomains": ["dblogprodqcentral.blob.core.windows.net"], + "artifactBlobStoragePrimaryDomains": [ + "dbartifactsprodqcentral.blob.core.windows.net" + ], + "artifactBlobStorageSecondaryDomains": [ + "dbartifactsprodwestus.blob.core.windows.net" + ], + "eventHubEndpointDomains": [ + "prod-qatarcentral-observabilityeventhubs.servicebus.windows.net" + ], + "metastoreDomains": [ + "consolidated-qatarcentral-prod-metastore-0.mysql.database.azure.com" + ] + }, "southafricanorth": { - "webappDestinationAddresses": ["102.133.224.24/32"], + "webappDestinationAddresses": [ + "102.133.224.24/32", + "20.87.238.224/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["102.37.41.3/32"], "sccRelayDomains": ["tunnel.southafricanorth.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.127.5.82/32"], + "controlPlaneNatDestinationAddresses": ["40.127.5.82/32", "40.127.8.136/29", "102.37.214.112/29", "20.164.16.120/29", "102.37.214.88/29", "20.164.16.48/29", "40.127.8.48/29"], "extendedInfrastructureDestinationAddresses": ["102.133.192.48/28"], "logBlobStorageDomains": ["dblogprodsafrican.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -686,12 +918,16 @@ ] }, "southcentralus": { - "webappDestinationAddresses": ["40.118.174.12/32", "40.119.9.208/32"], + "webappDestinationAddresses": [ + "40.118.174.12/32", + "40.119.9.208/32", + "52.185.215.96/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["40.86.167.110/32"], "sccRelayDomains": ["tunnel.westus.azuredatabricks.net"], "controlPlaneNatDestinationAddresses": [ - "40.83.178.242/32", - "40.119.9.209/32" + "40.83.178.242/32", "40.119.9.209/32", "20.65.137.224/29", "40.124.140.48/29", "4.151.11.48/29", "52.157.9.208/28" ], "extendedInfrastructureDestinationAddresses": ["13.91.84.96/28"], "logBlobStorageDomains": [ @@ -721,10 +957,22 @@ ] }, "southindia": { - "webappDestinationAddresses": ["104.211.89.81/32"], + "webappDestinationAddresses": [ + "104.211.89.81/32", + "52.140.35.224/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.172.133.58/32"], "sccRelayDomains": ["tunnel.centralindia.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["104.211.101.14/32"], + "controlPlaneNatDestinationAddresses": [ + "104.211.101.14/32", + "20.244.88.56/29", + "98.70.76.16/29", + "20.198.25.0/29", + "98.70.75.40/29", + "20.198.9.224/29", + "98.70.91.64/29" + ], "extendedInfrastructureDestinationAddresses": ["20.193.246.208/28"], "logBlobStorageDomains": ["dblogprodcindia.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -741,10 +989,14 @@ ] }, "southeastasia": { - "webappDestinationAddresses": ["52.187.145.107/32"], + "webappDestinationAddresses": [ + "52.187.145.107/32", + "20.247.134.0/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.230.27.216/32"], "sccRelayDomains": ["tunnel.southeastasia.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["52.187.0.85/32"], + "controlPlaneNatDestinationAddresses": ["52.187.0.85/32", "52.237.98.24/29", "20.6.34.248/29", "20.6.83.136/29", "172.188.66.64/29", "20.6.82.208/29", "172.188.123.176/29"], "extendedInfrastructureDestinationAddresses": ["20.195.104.64/28"], "logBlobStorageDomains": ["dblogprodseasia.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -765,10 +1017,14 @@ ] }, "swedencentral": { - "webappDestinationAddresses": ["51.12.41.16/32"], + "webappDestinationAddresses": [ + "51.12.41.16/32", + "4.225.21.224/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.12.41.18/32"], "sccRelayDomains": ["tunnel.swedencentral.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.12.41.17/32"], + "controlPlaneNatDestinationAddresses": ["51.12.41.17/32", "51.12.251.232/29", "20.240.203.248/29", "20.240.218.136/29", "172.160.244.40/29", "51.12.59.200/29", "51.12.250.248/29"], "extendedInfrastructureDestinationAddresses": ["20.91.164.16/28"], "logBlobStorageDomains": ["dblogprodswissnor.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -785,10 +1041,14 @@ ] }, "switzerlandnorth": { - "webappDestinationAddresses": ["51.107.48.120/32"], + "webappDestinationAddresses": [ + "51.107.48.120/32", + "20.208.63.112/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.107.203.195/32"], "sccRelayDomains": ["tunnel.switzerlandnorth.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.107.48.121/32"], + "controlPlaneNatDestinationAddresses": ["51.107.48.121/32", "20.250.160.184/29", "51.103.214.248/29", "51.107.12.216/29", "20.250.144.32/29", "51.107.12.208/29", "74.242.170.224/29"], "extendedInfrastructureDestinationAddresses": ["51.103.172.176/28"], "logBlobStorageDomains": [""], "artifactBlobStoragePrimaryDomains": [""], @@ -797,10 +1057,14 @@ "metastoreDomains": [""] }, "switzerlandwest": { - "webappDestinationAddresses": ["51.107.144.68/32"], + "webappDestinationAddresses": [ + "51.107.144.68/32", + "20.199.198.240/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.107.144.70/32"], "sccRelayDomains": ["tunnel.switzerlandwest.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.107.144.69/32"], + "controlPlaneNatDestinationAddresses": ["51.107.144.69/32", "20.199.199.32/28"], "extendedInfrastructureDestinationAddresses": ["51.107.233.80/28"], "logBlobStorageDomains": ["dblogprodswisswest.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -818,10 +1082,14 @@ ] }, "uaenorth": { - "webappDestinationAddresses": ["40.123.212.253/32"], + "webappDestinationAddresses": [ + "40.123.212.253/32", + "20.233.156.224/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["40.123.225.135/32"], "sccRelayDomains": ["tunnel.uaenorth.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.123.218.63/32"], + "controlPlaneNatDestinationAddresses": ["40.123.218.63/32", "20.174.35.40/29", "20.174.162.32/29", "20.46.193.88/29", "20.174.162.24/29", "20.46.193.40/29", "20.174.35.32/29"], "extendedInfrastructureDestinationAddresses": ["40.120.89.0/28"], "logBlobStorageDomains": ["dblogproduaenorth.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -844,10 +1112,14 @@ ] }, "uksouth": { - "webappDestinationAddresses": ["51.140.204.4/32"], + "webappDestinationAddresses": [ + "51.140.204.4/32", + "4.158.9.160/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.141.103.193/32"], "sccRelayDomains": ["tunnel.ukwest.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.140.203.27/32"], + "controlPlaneNatDestinationAddresses": ["51.140.203.27/32", "51.141.67.0/28"], "extendedInfrastructureDestinationAddresses": ["51.141.64.128/28"], "logBlobStorageDomains": ["dblogprodukwest.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -871,10 +1143,14 @@ ] }, "ukwest": { - "webappDestinationAddresses": ["51.140.204.4/32"], + "webappDestinationAddresses": [ + "51.140.204.4/32", + "20.254.183.0/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["51.141.103.193/32"], "sccRelayDomains": ["tunnel.ukwest.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["51.140.203.27/32"], + "controlPlaneNatDestinationAddresses": ["51.140.203.27/32", "51.141.67.0/28"], "extendedInfrastructureDestinationAddresses": ["51.141.64.128/28"], "logBlobStorageDomains": ["dblogprodukwest.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -937,10 +1213,14 @@ ] }, "westcentralus": { - "webappDestinationAddresses": ["52.150.136.68/32"], + "webappDestinationAddresses": [ + "52.150.136.68/32", + "13.78.197.48/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.150.136.70/32"], "sccRelayDomains": ["tunnel.westcentralus.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["52.150.136.69/32"], + "controlPlaneNatDestinationAddresses": ["52.150.136.69/32", "13.78.197.240/28"], "extendedInfrastructureDestinationAddresses": ["52.161.34.0/28"], "logBlobStorageDomains": ["dblogprodwcentus.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -957,15 +1237,19 @@ ] }, "westeurope": { - "webappDestinationAddresses": ["52.232.19.246/32", "40.74.30.80/32"], + "webappDestinationAddresses": [ + "52.232.19.246/32", + "40.74.30.80/32", + "20.103.219.240/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["23.97.201.41/32", "51.138.96.158/32"], "sccRelayDomains": [ "tunnel.westeurope.azuredatabricks.net", "tunnel.westeuropec2.azuredatabricks.net" ], "controlPlaneNatDestinationAddresses": [ - "23.100.0.135/32", - "40.74.30.81/32" + "23.100.0.135/32", "40.74.30.81/32", "172.201.83.192/29", "172.211.2.248/29", "172.205.204.120/29", "172.201.84.24/29", "172.211.3.72/29", "172.205.204.128/29", "172.211.67.168/29", "172.201.244.200/29", "172.211.58.192/29" ], "extendedInfrastructureDestinationAddresses": ["20.73.215.48/28"], "logBlobStorageDomains": ["dblogprodwesteurope.blob.core.windows.net"], @@ -1015,10 +1299,22 @@ ] }, "westindia": { - "webappDestinationAddresses": ["104.211.89.81/32"], + "webappDestinationAddresses": [ + "104.211.89.81/32", + "104.211.190.96/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["52.172.133.58/32"], "sccRelayDomains": ["tunnel.centralindia.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["104.211.101.14/32"], + "controlPlaneNatDestinationAddresses": [ + "104.211.101.14/32", + "20.244.88.56/29", + "98.70.76.16/29", + "20.198.25.0/29", + "98.70.75.40/29", + "20.198.9.224/29", + "98.70.91.64/29" + ], "extendedInfrastructureDestinationAddresses": ["20.193.246.208/28"], "logBlobStorageDomains": ["dblogprodcindia.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ @@ -1035,12 +1331,15 @@ ] }, "westus": { - "webappDestinationAddresses": ["40.118.174.12/32", "20.42.129.160/32"], + "webappDestinationAddresses": [ + "40.118.174.12/32", + "13.91.180.32/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["40.86.167.110/32"], "sccRelayDomains": ["tunnel.westus.azuredatabricks.net"], "controlPlaneNatDestinationAddresses": [ - "40.83.178.242/32", - "20.42.129.161/32" + "40.83.178.242/32", "52.157.9.208/28", "52.157.9.208/28" ], "extendedInfrastructureDestinationAddresses": ["13.91.84.96/28"], "logBlobStorageDomains": ["dblogprodwestus.blob.core.windows.net"], @@ -1078,10 +1377,15 @@ ] }, "westus2": { - "webappDestinationAddresses": ["40.118.174.12/32"], + "webappDestinationAddresses": [ + "40.118.174.12/32", + "20.42.129.160/32", + "20.59.51.96/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["40.86.167.110/32"], "sccRelayDomains": ["tunnel.westus.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["40.83.178.242/32"], + "controlPlaneNatDestinationAddresses": ["40.83.178.242/32", "4.149.240.248/29", "20.42.129.161/32", "4.242.19.240/29", "20.115.219.72/29"], "extendedInfrastructureDestinationAddresses": ["13.91.84.96/28"], "logBlobStorageDomains": [ "dblogprodwestus.blob.core.windows.net", @@ -1109,10 +1413,14 @@ ] }, "westus3": { - "webappDestinationAddresses": ["20.150.160.106"], + "webappDestinationAddresses": [ + "20.150.160.106", + "4.227.68.192/28", + "4.150.168.160/28" + ], "sccRelayDestinationAddresses": ["40.86.167.110/32"], "sccRelayDomains": ["tunnel.westus3.azuredatabricks.net"], - "controlPlaneNatDestinationAddresses": ["20.150.160.104"], + "controlPlaneNatDestinationAddresses": ["20.150.160.104", "20.163.31.104/29", "20.168.96.112/29", "20.163.3.56/29", "20.168.96.96/29", "20.163.2.88/29", "20.169.49.96/29"], "extendedInfrastructureDestinationAddresses": ["20.125.82.0/28"], "logBlobStorageDomains": ["dblogprodwestus3.blob.core.windows.net"], "artifactBlobStoragePrimaryDomains": [ diff --git a/templates/workspace_services/databricks/terraform/providers.tf b/templates/workspace_services/databricks/terraform/providers.tf index b3699a76da..e0fd9fc550 100644 --- a/templates/workspace_services/databricks/terraform/providers.tf +++ b/templates/workspace_services/databricks/terraform/providers.tf @@ -2,19 +2,19 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "=3.40.0" + version = "=3.108.0" } azapi = { source = "Azure/azapi" - version = "=1.1.0" + version = "=1.13.1" } databricks = { source = "databricks/databricks" - version = "=1.5.0" + version = "=1.48.0" } dns = { source = "hashicorp/dns" - version = "=3.2.3" + version = "=3.4.1" } } From fc4abe1e6fefa110a07ce70eb491fd241ac13ebd Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Thu, 27 Jun 2024 12:24:20 +0100 Subject: [PATCH 2/2] Fix hash issue with builds (#4013) * Fix hash issue with builds * Update build.test.js --- .github/scripts/build.js | 6 ++++-- .github/scripts/build.test.js | 32 ++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/scripts/build.js b/.github/scripts/build.js index 9a144926ed..1014402991 100644 --- a/.github/scripts/build.js +++ b/.github/scripts/build.js @@ -5,6 +5,7 @@ // These tests can be run from the dev container using the run-tests.sh script // const { createHash } = require('crypto'); +const { create } = require('domain'); async function getCommandFromComment({ core, context, github }) { const commentUsername = context.payload.comment.user.login; @@ -292,11 +293,12 @@ function getRefIdForBranch(branchName) { return createShortHash(`refs/heads/${branchName}\n`); } function createShortHash(ref) { - const hash = createHash('sha2').update(ref, 'utf8').digest('hex') + const hash = createHash('sha512').update(ref, 'utf8').digest('hex'); return hash.substring(0, 8); } module.exports = { getCommandFromComment, - labelAsExternalIfAuthorDoesNotHaveWriteAccess + labelAsExternalIfAuthorDoesNotHaveWriteAccess, + createShortHash } diff --git a/.github/scripts/build.test.js b/.github/scripts/build.test.js index 73a5b0d632..5a9cd8456b 100644 --- a/.github/scripts/build.test.js +++ b/.github/scripts/build.test.js @@ -1,4 +1,4 @@ -const { getCommandFromComment, labelAsExternalIfAuthorDoesNotHaveWriteAccess } = require('./build.js') +const { getCommandFromComment, labelAsExternalIfAuthorDoesNotHaveWriteAccess, createShortHash } = require('./build.js') const { createGitHubContext, PR_NUMBER, outputFor, toHaveComment } = require('./test-helpers.js') expect.extend({ @@ -146,7 +146,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES, - bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `cbce50da`\)/, + bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `291ae84f`\)/, }); }); }); @@ -326,7 +326,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.FORK_NON_DOCS_CHANGES, - bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `6db070b1`\)/, + bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `607c7437`\)/, }); }); }) @@ -355,7 +355,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.FORK_NON_DOCS_CHANGES, - bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `6db070b1`\)/, + bodyMatcher: /Running tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `607c7437`\)/, }); }); }) @@ -381,7 +381,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES, - bodyMatcher: /Running extended tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `cbce50da`\)/, + bodyMatcher: /Running extended tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `291ae84f`\)/, }); }); }); @@ -407,7 +407,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES, - bodyMatcher: /Running extended AAD tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `cbce50da`\)/, + bodyMatcher: /Running extended AAD tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `291ae84f`\)/, }); }); }); @@ -433,7 +433,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES, - bodyMatcher: /Running shared service tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `cbce50da`\)/, + bodyMatcher: /Running shared service tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `291ae84f`\)/, }); }); }); @@ -549,7 +549,7 @@ describe('getCommandFromComment', () => { owner: 'someOwner', repo: 'someRepo', issue_number: PR_NUMBER.FORK_NON_DOCS_CHANGES, - bodyMatcher: /Running extended tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `6db070b1`\)/, + bodyMatcher: /Running extended tests: https:\/\/github.com\/someOwner\/someRepo\/actions\/runs\/11112222 \(with refid `607c7437`\)/, }); }); }) @@ -679,13 +679,13 @@ goes here`, }); test('should set prRefId output', async () => { - // Using a PR number of 123 should give a refid of 'cbce50da' + // Using a PR number of 123 should give a refid of '291ae84f' // Based on running `echo "refs/pull/123/merge" | shasum | cut -c1-8` (as per the original bash scripts) const context = createCommentContext({ pullRequestNumber: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES }); await getCommandFromComment({ core, context, github }); - expect(outputFor(mockCoreSetOutput, 'prRefId')).toBe('cbce50da'); + expect(outputFor(mockCoreSetOutput, 'prRefId')).toBe('291ae84f'); }); test('should not set branchRefId output for PR from forked repo', async () => { @@ -701,13 +701,13 @@ goes here`, test('should set branchRefId for PR from upstream repo', async () => { // Using PR 123 which is faked as a PR from the upstream repo - // The Using a PR number of 123 should give a refid of '71f7c907' + // The Using a PR number of 123 should give a refid of '6b751c8f' // Based on running `echo "refs/heads/pr-head-ref" | shasum | cut -c1-8` (as per the original bash scripts) const context = createCommentContext({ pullRequestNumber: PR_NUMBER.UPSTREAM_NON_DOCS_CHANGES }); await getCommandFromComment({ core, context, github }); - expect(outputFor(mockCoreSetOutput, 'branchRefId')).toBe('71f7c907'); + expect(outputFor(mockCoreSetOutput, 'branchRefId')).toBe('6b751c8f'); }); test('should set prHeadSha output', async () => { @@ -770,4 +770,12 @@ goes here`, }); }); + describe('createShortHash creates a short hash from a long hash', () => { + test('should return the first 8 characters of the hash', () => { + const longHash = '0123456789abcdef'; + const shortHash = '1c043fbe'; + expect(createShortHash(longHash)).toBe(shortHash); + } + ); + }); });