From cb2c299cc2eb05dfba3dbe5ebcbdfda8f72e237a Mon Sep 17 00:00:00 2001 From: Manuel Romero Date: Mon, 24 Oct 2022 17:02:21 +0200 Subject: [PATCH] fixes for synapse --- databases/synapse-ws/firewall.tf | 4 ++-- databases/synapse-ws/main.tf | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/databases/synapse-ws/firewall.tf b/databases/synapse-ws/firewall.tf index 3e84f54..00934f3 100644 --- a/databases/synapse-ws/firewall.tf +++ b/databases/synapse-ws/firewall.tf @@ -1,10 +1,10 @@ -resource "azurerm_synapse_firewall_rule" "azureservices" { +/*resource "azurerm_synapse_firewall_rule" "azureservices" { name = "AllowAllWindowsAzureIps" synapse_workspace_id = azurerm_synapse_workspace.synapsews.id // https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/synapse_firewall_rule start_ip_address = "0.0.0.0" end_ip_address = "0.0.0.0" -} +}*/ resource "azurerm_synapse_firewall_rule" "fw-a-rule1" { diff --git a/databases/synapse-ws/main.tf b/databases/synapse-ws/main.tf index 408220d..d4d021a 100644 --- a/databases/synapse-ws/main.tf +++ b/databases/synapse-ws/main.tf @@ -33,6 +33,8 @@ resource "azurerm_synapse_workspace" "synapsews" { sql_administrator_login = var.sql_administrator_login sql_administrator_login_password = var.sql_administrator_login_password + managed_virtual_network_enabled = true + identity { type = "SystemAssigned" } @@ -65,7 +67,7 @@ resource "azurerm_synapse_sql_pool" "db" { resource "azurerm_synapse_role_assignment" "sqladministrator_aor" { depends_on = [ - azurerm_synapse_firewall_rule.azureservices, + //azurerm_synapse_firewall_rule.azureservices, azurerm_synapse_firewall_rule.fw-a-rule1, azurerm_synapse_firewall_rule.fw-a-rule2, @@ -83,7 +85,7 @@ resource "azurerm_synapse_role_assignment" "sqladministrator" { count = (var.user_oid != null && var.user_oid != "c583b5aa-2844-4baf-b8bf-b6a1ae0b1520") ? 1 : 0 depends_on = [ - azurerm_synapse_firewall_rule.azureservices, + //azurerm_synapse_firewall_rule.azureservices, azurerm_synapse_firewall_rule.fw-a-rule1, azurerm_synapse_firewall_rule.fw-a-rule2,