Fix networking and database connection from API

Author: russdaygh

.gitignore

@@ -357,3 +357,4 @@ MigrationBackup/
 *.tfstate
 *.tfstate.backup
 terraform/.terraform.lock.hcl
+terraform/.terraform.tfstate.lock.info

terraform/api_server.tf

@@ -24,6 +24,4 @@ resource "azurerm_linux_web_app" "api_server_web_app" {
     type  = "SQLAzure"
     value = local.db_connection_string
   }
-
-  virtual_network_subnet_id = azurerm_subnet.subnet.id
 }

terraform/database.tf

@@ -25,8 +25,9 @@ resource "azurerm_mssql_database" "sqldb" {
   }
 }
 
-resource "azurerm_mssql_virtual_network_rule" "sqlserver_subnet_rule" {
-  name      = "sql-vnet-rule"
-  server_id = azurerm_mssql_server.sqlserver.id
-  subnet_id = azurerm_subnet.subnet.id
+resource "azurerm_mssql_firewall_rule" "firewall_rule" {
+  name             = "AllowAllAzureServices"
+  server_id        = azurerm_mssql_server.sqlserver.id
+  start_ip_address = "0.0.0.0"
+  end_ip_address   = "0.0.0.0"
 }

terraform/keyvault.tf

@@ -38,4 +38,10 @@ resource "azurerm_key_vault_secret" "sqldb_connectionstring" {
   name         = "${local.resource_prefix}-db-connection-string"
   value        = local.db_connection_string
   key_vault_id = azurerm_key_vault.key_vault.id
-}
+}
+
+resource "azurerm_key_vault_secret" "sqldb_admin_password" {
+  name         = "${local.resource_prefix}-db-admin-password"
+  value        = random_password.admin_password.result
+  key_vault_id = azurerm_key_vault.key_vault.id
+}

terraform/main.tf

@@ -14,7 +14,7 @@ resource "random_password" "admin_password" {
 }
 
 locals {
-  db_connection_string = "Server=tcp:${local.sql_server_name}.database.windows.net,1433;Persist Security Info=False;User ID=${random_string.admin_login.result};Password=${random_password.admin_password.result};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  db_connection_string = "Server=tcp:${local.sql_server_name}.database.windows.net,1433;Initial Catalog=pocketddd-dev-sqldatabase;Persist Security Info=False;User ID=${random_string.admin_login.result};Password=${random_password.admin_password.result};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
 }
 
 resource "azurerm_virtual_network" "vnet" {
@@ -40,7 +40,7 @@ resource "azurerm_subnet" "subnet" {
 
     service_delegation {
       name    = "Microsoft.Web/serverFarms"
-      actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
+      actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
     }
   }
 

terraform/outputs.tf

@@ -1,3 +1,3 @@
 output "api_server_url" {
   value = "https://${azurerm_linux_web_app.api_server_web_app.default_hostname}/"
-}
+}