Skip to content

Commit c8385fa

Browse files
jsonar-cpapkejsonar-cpapke
committed
actually use passed in networking
1 parent 66f6a9c commit c8385fa

6 files changed

Lines changed: 64 additions & 30 deletions

File tree

‎examples/azure/poc/dsf_deployment/agent_sources.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "db_with_agent" {
1616
ssh_public_key = tls_private_key.ssh_key.public_key_openssh
1717
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
1818
}
19-
allowed_ssh_cidrs = concat([format("%s/32", module.mx[0].private_ip)], module.network[0].vnet_address_space)
19+
allowed_ssh_cidrs = concat([format("%s/32", module.mx[0].private_ip)], local.all_subnet_address_spaces)
2020

2121
registration_params = {
2222
agent_gateway_host = module.agent_gw[0].private_ip

‎examples/azure/poc/dsf_deployment/dam.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ module "mx" {
2020
}
2121
mx_password = local.password
2222
allowed_web_console_and_api_cidrs = var.web_console_cidr
23-
allowed_agent_gw_cidrs = module.network[0].vnet_address_space
23+
allowed_agent_gw_cidrs = local.all_subnet_address_spaces
2424
allowed_ssh_cidrs = concat(local.workstation_cidr, var.allowed_ssh_cidrs)
25-
allowed_hub_cidrs = module.network[0].vnet_address_space
25+
allowed_hub_cidrs = local.all_subnet_address_spaces
2626

2727
hub_details = var.enable_sonar ? {
2828
address = coalesce(module.hub_main[0].public_ip, module.hub_main[0].private_ip)
@@ -53,10 +53,10 @@ module "agent_gw" {
5353
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
5454
}
5555
mx_password = local.password
56-
allowed_agent_cidrs = module.network[0].vnet_address_space
57-
allowed_mx_cidrs = module.network[0].vnet_address_space
58-
allowed_ssh_cidrs = concat(module.network[0].vnet_address_space, var.allowed_ssh_cidrs)
59-
allowed_gw_clusters_cidrs = module.network[0].vnet_address_space
56+
allowed_agent_cidrs = local.all_subnet_address_spaces
57+
allowed_mx_cidrs = local.all_subnet_address_spaces
58+
allowed_ssh_cidrs = concat(local.all_subnet_address_spaces, var.allowed_ssh_cidrs)
59+
allowed_gw_clusters_cidrs = local.all_subnet_address_spaces
6060
management_server_host_for_registration = module.mx[0].private_ip
6161
management_server_host_for_api_access = module.mx[0].public_ip
6262
large_scale_mode = var.large_scale_mode.agent_gw

‎examples/azure/poc/dsf_deployment/dra.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ locals {
22
dra_analytics_count = var.enable_dra ? var.dra_analytics_count : 0
33

44
dra_admin_public_ip = var.enable_dra ? [format("%s/32", module.dra_admin[0].public_ip)] : []
5-
dra_admin_cidr_list = concat(module.network[0].vnet_address_space, local.dra_admin_public_ip)
5+
dra_admin_cidr_list = concat(local.all_subnet_address_spaces, local.dra_admin_public_ip)
66

77
dra_admin_image_exits = var.dra_admin_image_details != null ? true : false
88
dra_admin_vhd_exits = var.dra_admin_vhd_details != null ? true : false
@@ -24,7 +24,7 @@ module "dra_admin" {
2424
admin_ssh_password = local.password
2525

2626
allowed_web_console_cidrs = var.web_console_cidr
27-
allowed_analytics_cidrs = module.network[0].vnet_address_space
27+
allowed_analytics_cidrs = local.all_subnet_address_spaces
2828
allowed_hub_cidrs = local.hub_cidr_list
2929
allowed_ssh_cidrs = concat(local.workstation_cidr, var.allowed_ssh_cidrs)
3030

@@ -62,7 +62,7 @@ module "dra_analytics" {
6262
analytics_ssh_password = local.password
6363
archiver_password = local.password
6464

65-
allowed_admin_cidrs = module.network[0].vnet_address_space
65+
allowed_admin_cidrs = local.all_subnet_address_spaces
6666
allowed_ssh_cidrs = concat(local.workstation_cidr, local.hub_cidr_list)
6767
#allowed_ssh_cidrs = concat(var.allowed_ssh_cidrs, local.hub_cidr_list, local.workstation_cidr)
6868

‎examples/azure/poc/dsf_deployment/networking.tf‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,55 @@
11
locals {
22
create_network = var.subnet_ids == null && var.subnet_id == null
33

4-
hub_subnet_id = coalesce(try(var.subnet_ids.hub_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[0])
5-
hub_dr_subnet_id = coalesce(try(var.subnet_ids.hub_dr_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[1])
4+
hub_subnet_id = coalesce(try(var.subnet_ids.hub_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[0], null))
5+
hub_dr_subnet_id = coalesce(try(var.subnet_ids.hub_dr_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[1], null))
66

7-
agentless_gw_subnet_id = coalesce(try(var.subnet_ids.agentless_gw_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[0])
8-
agentless_gw_dr_subnet_id = coalesce(try(var.subnet_ids.agentless_gw_dr_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[1])
7+
agentless_gw_subnet_id = coalesce(try(var.subnet_ids.agentless_gw_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[0], null))
8+
agentless_gw_dr_subnet_id = coalesce(try(var.subnet_ids.agentless_gw_dr_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[1], null))
99

10-
db_subnet_ids = coalescelist(try(var.subnet_ids.db_subnet_ids, []), compact([var.subnet_id]), module.network[0].vnet_subnets)
10+
db_subnet_ids = coalescelist(try(var.subnet_ids.db_subnet_ids, []), compact([var.subnet_id]), try(module.network[0].vnet_subnets, []))
1111

12-
mx_subnet_id = coalesce(try(var.subnet_ids.mx_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[0])
13-
agent_gw_subnet_id = coalesce(try(var.subnet_ids.agent_gw_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[0])
12+
mx_subnet_id = coalesce(try(var.subnet_ids.mx_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[0], null))
13+
agent_gw_subnet_id = coalesce(try(var.subnet_ids.agent_gw_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[0], null))
1414

15-
dra_admin_subnet_id = coalesce(try(var.subnet_ids.dra_admin_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[0])
16-
dra_analytics_subnet_id = coalesce(try(var.subnet_ids.dra_analytics_subnet_id, null), var.subnet_id, module.network[0].vnet_subnets[1])
15+
dra_admin_subnet_id = coalesce(try(var.subnet_ids.dra_admin_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[0], null))
16+
dra_analytics_subnet_id = coalesce(try(var.subnet_ids.dra_analytics_subnet_id, null), var.subnet_id, try(module.network[0].vnet_subnets[1], null))
17+
18+
all_subnet_ids = concat([
19+
local.hub_subnet_id,
20+
local.hub_dr_subnet_id,
21+
local.agent_gw_subnet_id,
22+
local.agentless_gw_dr_subnet_id,
23+
local.mx_subnet_id,
24+
local.agent_gw_subnet_id,
25+
local.dra_admin_subnet_id,
26+
local.dra_analytics_subnet_id,
27+
], local.db_subnet_ids)
1728

1829
subnet_prefixes = cidrsubnets(var.vnet_ip_range, 8, 8)
30+
31+
ipv4_regex = "([0-9]{1,3}\\.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?"
32+
33+
_all_subnet_address_spaces = distinct(sort(
34+
concat([for subnet in data.azurerm_subnet.all_subnets : subnet.address_prefixes]...)
35+
))
36+
37+
# we can't currently use ipv6 IPs
38+
all_subnet_address_spaces = [
39+
for cidr in local._all_subnet_address_spaces: cidr
40+
if can(regex(local.ipv4_regex, cidr))
41+
]
42+
}
43+
44+
data "azurerm_subnet" "all_subnets" {
45+
for_each = {
46+
for index, id in local.all_subnet_ids :
47+
index => id
48+
}
49+
50+
resource_group_name = split("/", each.value)[4]
51+
virtual_network_name = split("/", each.value)[8]
52+
name = split("/", each.value)[10]
1953
}
2054

2155
# network

‎examples/azure/poc/dsf_deployment/outputs.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ output "generated_network" {
1515
value = try({
1616
vnet = module.network[0].vnet_id
1717
subnets = module.network[0].vnet_subnets
18-
address_space = module.network[0].vnet_address_space
18+
address_space = local.all_subnet_address_spaces
1919
}, null)
2020
}
2121

‎examples/azure/poc/dsf_deployment/sonar.tf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ locals {
33

44
hub_public_ip = var.enable_sonar ? (length(module.hub_main[0].public_ip) > 0 ? format("%s/32", module.hub_main[0].public_ip) : null) : null
55
hub_dr_public_ip = var.enable_sonar && var.hub_hadr ? (length(module.hub_dr[0].public_ip) > 0 ? format("%s/32", module.hub_dr[0].public_ip) : null) : null
6-
# WA since the following doesn't work: hub_cidr_list = concat(module.network[0].vnet_address_space, compact([local.hub_public_ip, local.hub_dr_public_ip]))
7-
hub_cidr_list = var.enable_sonar ? (var.hub_hadr ? concat(module.network[0].vnet_address_space, [local.hub_public_ip, local.hub_dr_public_ip]) : concat(module.network[0].vnet_address_space, [local.hub_public_ip])) : module.network[0].vnet_address_space
6+
# WA since the following doesn't work: hub_cidr_list = concat(local.all_subnet_address_spaces, compact([local.hub_public_ip, local.hub_dr_public_ip]))
7+
hub_cidr_list = var.enable_sonar ? (var.hub_hadr ? concat(local.all_subnet_address_spaces, [local.hub_public_ip, local.hub_dr_public_ip]) : concat(local.all_subnet_address_spaces, [local.hub_public_ip])) : local.all_subnet_address_spaces
88
}
99

1010
module "hub_main" {
@@ -29,8 +29,8 @@ module "hub_main" {
2929
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
3030
}
3131
allowed_web_console_and_api_cidrs = var.web_console_cidr
32-
allowed_hub_cidrs = module.network[0].vnet_address_space
33-
allowed_agentless_gw_cidrs = module.network[0].vnet_address_space
32+
allowed_hub_cidrs = local.all_subnet_address_spaces
33+
allowed_agentless_gw_cidrs = local.all_subnet_address_spaces
3434
allowed_dra_admin_cidrs = local.dra_admin_cidr_list
3535
allowed_all_cidrs = local.workstation_cidr
3636
allowed_ssh_cidrs = var.allowed_ssh_cidrs
@@ -79,8 +79,8 @@ module "hub_dr" {
7979
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
8080
}
8181
allowed_web_console_and_api_cidrs = var.web_console_cidr
82-
allowed_hub_cidrs = module.network[0].vnet_address_space
83-
allowed_agentless_gw_cidrs = module.network[0].vnet_address_space
82+
allowed_hub_cidrs = local.all_subnet_address_spaces
83+
allowed_agentless_gw_cidrs = local.all_subnet_address_spaces
8484
allowed_dra_admin_cidrs = local.dra_admin_cidr_list
8585
allowed_all_cidrs = local.workstation_cidr
8686
allowed_ssh_cidrs = var.allowed_ssh_cidrs
@@ -127,8 +127,8 @@ module "agentless_gw_main" {
127127
ssh_public_key = tls_private_key.ssh_key.public_key_openssh
128128
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
129129
}
130-
allowed_agentless_gw_cidrs = module.network[0].vnet_address_space
131-
allowed_hub_cidrs = module.network[0].vnet_address_space
130+
allowed_agentless_gw_cidrs = local.all_subnet_address_spaces
131+
allowed_hub_cidrs = local.all_subnet_address_spaces
132132
allowed_all_cidrs = local.workstation_cidr
133133
allowed_ssh_cidrs = var.allowed_ssh_cidrs
134134
ingress_communication_via_proxy = {
@@ -164,8 +164,8 @@ module "agentless_gw_dr" {
164164
ssh_public_key = tls_private_key.ssh_key.public_key_openssh
165165
ssh_private_key_file_path = local_sensitive_file.ssh_key.filename
166166
}
167-
allowed_agentless_gw_cidrs = module.network[0].vnet_address_space
168-
allowed_hub_cidrs = module.network[0].vnet_address_space
167+
allowed_agentless_gw_cidrs = local.all_subnet_address_spaces
168+
allowed_hub_cidrs = local.all_subnet_address_spaces
169169
allowed_all_cidrs = local.workstation_cidr
170170
allowed_ssh_cidrs = var.allowed_ssh_cidrs
171171
ingress_communication_via_proxy = {

0 commit comments

Comments
 (0)