Skip to content

Commit 195e6ea

Browse files
committed
Sort out networking
1 parent 5918a7d commit 195e6ea

6 files changed

Lines changed: 45 additions & 21 deletions

File tree

terraform/api_server.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ resource "azurerm_linux_web_app" "api_server_web_app" {
2020
}
2121

2222
connection_string {
23-
name = "PocketDDDContext"
24-
type = "SQLAzure"
23+
name = "PocketDDDContext"
24+
type = "SQLAzure"
2525
value = local.db_connection_string
2626
}
27+
28+
virtual_network_subnet_id = azurerm_subnet.subnet.id
2729
}

terraform/database.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ resource "azurerm_mssql_database" "sqldb" {
2424
prevent_destroy = false
2525
}
2626
}
27+
28+
resource "azurerm_mssql_virtual_network_rule" "sqlserver_subnet_rule" {
29+
name = "sql-vnet-rule"
30+
server_id = azurerm_mssql_server.sqlserver.id
31+
subnet_id = azurerm_subnet.subnet.id
32+
}

terraform/keyvault.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ resource "azurerm_key_vault" "key_vault" {
2323
"Get",
2424
"Set",
2525
"List",
26-
"Delete"
26+
"Delete",
27+
"Purge",
28+
"Recover"
2729
]
2830

2931
storage_permissions = [

terraform/main.tf

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,34 @@ resource "random_password" "admin_password" {
1515

1616
locals {
1717
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;"
18-
}
18+
}
19+
20+
resource "azurerm_virtual_network" "vnet" {
21+
name = "${local.resource_prefix}-vnet"
22+
location = azurerm_resource_group.rg.location
23+
resource_group_name = azurerm_resource_group.rg.name
24+
address_space = ["10.0.0.0/16"]
25+
dns_servers = ["10.0.0.4", "10.0.0.5"]
26+
27+
tags = {
28+
environment = var.env
29+
}
30+
}
31+
32+
resource "azurerm_subnet" "subnet" {
33+
name = "default-subnet"
34+
resource_group_name = azurerm_resource_group.rg.name
35+
virtual_network_name = azurerm_virtual_network.vnet.name
36+
address_prefixes = ["10.0.1.0/24"]
37+
38+
delegation {
39+
name = "delegation"
40+
41+
service_delegation {
42+
name = "Microsoft.Web/serverFarms"
43+
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action", "Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action"]
44+
}
45+
}
46+
47+
service_endpoints = ["Microsoft.Sql"]
48+
}

terraform/network.tf

Lines changed: 0 additions & 16 deletions
This file was deleted.

terraform/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
output "api_server_url" {
2-
value = azurerm_linux_web_app.api_server_web_app.default_hostname
2+
value = "https://${azurerm_linux_web_app.api_server_web_app.default_hostname}/"
33
}

0 commit comments

Comments
 (0)