From ed9318af4e0ded182d6b86b957fbe6886bc0b0b0 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Peters Date: Thu, 28 Mar 2024 08:26:40 +0100 Subject: [PATCH] Add Databricks Private Link Add OpenAI Private Link --- README.md | 3 +++ modules/connectivity/README.md | 2 ++ modules/connectivity/locals.tf | 2 ++ modules/connectivity/variables.tf | 2 ++ tests/modules/settings/settings.connectivity.tf | 2 ++ variables.tf | 2 ++ 6 files changed, 13 insertions(+) diff --git a/README.md b/README.md index d9507eedf..dbef07ca2 100644 --- a/README.md +++ b/README.md @@ -534,6 +534,7 @@ object({ azure_database_for_mariadb_server = optional(bool, true) azure_database_for_mysql_server = optional(bool, true) azure_database_for_postgresql_server = optional(bool, true) + azure_databricks = optional(bool, true) azure_digital_twins = optional(bool, true) azure_event_grid_domain = optional(bool, true) azure_event_grid_topic = optional(bool, true) @@ -550,6 +551,7 @@ object({ azure_media_services = optional(bool, true) azure_migrate = optional(bool, true) azure_monitor = optional(bool, true) + azure_openai_service = optional(bool, true) azure_purview_account = optional(bool, true) azure_purview_studio = optional(bool, true) azure_relay_namespace = optional(bool, true) @@ -1107,6 +1109,7 @@ The following resources are used by this module: - [time_sleep.after_azurerm_policy_set_definition](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) (resource) - [time_sleep.after_azurerm_role_assignment](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) (resource) - [time_sleep.after_azurerm_role_definition](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) (resource) +- [azapi_resource.user_msi](https://registry.terraform.io/providers/Azure/azapi/latest/docs/data-sources/resource) (data source) - [azurerm_policy_definition.external_lookup](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/policy_definition) (data source) - [azurerm_policy_set_definition.external_lookup](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/policy_set_definition) (data source) diff --git a/modules/connectivity/README.md b/modules/connectivity/README.md index bc61e119c..a746f9d1d 100644 --- a/modules/connectivity/README.md +++ b/modules/connectivity/README.md @@ -328,6 +328,7 @@ object({ azure_database_for_mariadb_server = optional(bool, true) azure_database_for_mysql_server = optional(bool, true) azure_database_for_postgresql_server = optional(bool, true) + azure_databricks = optional(bool, true) azure_digital_twins = optional(bool, true) azure_event_grid_domain = optional(bool, true) azure_event_grid_topic = optional(bool, true) @@ -344,6 +345,7 @@ object({ azure_media_services = optional(bool, true) azure_migrate = optional(bool, true) azure_monitor = optional(bool, true) + azure_openai_service = optional(bool, true) azure_purview_account = optional(bool, true) azure_purview_studio = optional(bool, true) azure_relay_namespace = optional(bool, true) diff --git a/modules/connectivity/locals.tf b/modules/connectivity/locals.tf index 7a4e9eeec..cef3ea8e1 100644 --- a/modules/connectivity/locals.tf +++ b/modules/connectivity/locals.tf @@ -1457,6 +1457,7 @@ locals { azure_database_for_mariadb_server = ["privatelink.mariadb.database.azure.com"] azure_database_for_mysql_server = ["privatelink.mysql.database.azure.com"] azure_database_for_postgresql_server = ["privatelink.postgres.database.azure.com"] + azure_databricks = ["privatelink.azuredatabricks.net"] azure_digital_twins = ["privatelink.digitaltwins.azure.net"] azure_event_grid_domain = ["privatelink.eventgrid.azure.net"] azure_event_grid_topic = ["privatelink.eventgrid.azure.net"] @@ -1472,6 +1473,7 @@ locals { azure_media_services = ["privatelink.media.azure.net"] azure_migrate = ["privatelink.prod.migration.windowsazure.com"] azure_monitor = ["privatelink.monitor.azure.com", "privatelink.oms.opinsights.azure.com", "privatelink.ods.opinsights.azure.com", "privatelink.agentsvc.azure-automation.net", "privatelink.blob.core.windows.net"] + azure_openai_service = ["privatelink.openai.azure.com"] azure_purview_account = ["privatelink.purview.azure.com"] azure_purview_studio = ["privatelink.purviewstudio.azure.com"] azure_relay_namespace = ["privatelink.servicebus.windows.net"] diff --git a/modules/connectivity/variables.tf b/modules/connectivity/variables.tf index e31e4f976..fdcf84945 100644 --- a/modules/connectivity/variables.tf +++ b/modules/connectivity/variables.tf @@ -250,6 +250,7 @@ variable "settings" { azure_database_for_mariadb_server = optional(bool, true) azure_database_for_mysql_server = optional(bool, true) azure_database_for_postgresql_server = optional(bool, true) + azure_databricks = optional(bool, true) azure_digital_twins = optional(bool, true) azure_event_grid_domain = optional(bool, true) azure_event_grid_topic = optional(bool, true) @@ -266,6 +267,7 @@ variable "settings" { azure_media_services = optional(bool, true) azure_migrate = optional(bool, true) azure_monitor = optional(bool, true) + azure_openai_service = optional(bool, true) azure_purview_account = optional(bool, true) azure_purview_studio = optional(bool, true) azure_relay_namespace = optional(bool, true) diff --git a/tests/modules/settings/settings.connectivity.tf b/tests/modules/settings/settings.connectivity.tf index 935133ef3..0bbd7adcb 100644 --- a/tests/modules/settings/settings.connectivity.tf +++ b/tests/modules/settings/settings.connectivity.tf @@ -222,9 +222,11 @@ locals { azure_database_for_mariadb_server = false azure_database_for_mysql_server = false azure_database_for_postgresql_server = false + azure_databricks = false azure_digital_twins = false azure_key_vault_managed_hsm = false azure_kubernetes_service_management = false + azure_openai_service = false azure_purview_account = false azure_purview_studio = false azure_relay_namespace = false diff --git a/variables.tf b/variables.tf index 01febda8f..14615e13b 100644 --- a/variables.tf +++ b/variables.tf @@ -363,6 +363,7 @@ variable "configure_connectivity_resources" { azure_database_for_mariadb_server = optional(bool, true) azure_database_for_mysql_server = optional(bool, true) azure_database_for_postgresql_server = optional(bool, true) + azure_databricks = optional(bool, true) azure_digital_twins = optional(bool, true) azure_event_grid_domain = optional(bool, true) azure_event_grid_topic = optional(bool, true) @@ -379,6 +380,7 @@ variable "configure_connectivity_resources" { azure_media_services = optional(bool, true) azure_migrate = optional(bool, true) azure_monitor = optional(bool, true) + azure_openai_service = optional(bool, true) azure_purview_account = optional(bool, true) azure_purview_studio = optional(bool, true) azure_relay_namespace = optional(bool, true)