Skip to content

Commit 99b8177

Browse files
author
vittoria salim
committed
revert testing files
1 parent 65edaed commit 99b8177

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎modules/terraform/azure/firewall/main.tf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ locals {
1010
)
1111
})
1212
}
13-
13+
1414
firewall_config_map = local.resolved_firewall_config_map
1515
}
1616

@@ -41,9 +41,9 @@ resource "azurerm_firewall_nat_rule_collection" "nat_rules" {
4141
for item in flatten([
4242
for fw_name, fw_config in local.firewall_config_map : [
4343
for collection in coalesce(fw_config.nat_rule_collections, []) : {
44-
fw_name = fw_name
45-
fw_name_col = "${fw_name}-${collection.name}"
46-
collection = collection
44+
fw_name = fw_name
45+
fw_name_col = "${fw_name}-${collection.name}"
46+
collection = collection
4747
}
4848
]
4949
]) : item.fw_name_col => item
@@ -75,9 +75,9 @@ resource "azurerm_firewall_network_rule_collection" "network_rules" {
7575
for item in flatten([
7676
for fw_name, fw_config in local.firewall_config_map : [
7777
for collection in coalesce(fw_config.network_rule_collections, []) : {
78-
fw_name = fw_name
79-
fw_name_col = "${fw_name}-${collection.name}"
80-
collection = collection
78+
fw_name = fw_name
79+
fw_name_col = "${fw_name}-${collection.name}"
80+
collection = collection
8181
}
8282
]
8383
]) : item.fw_name_col => item
@@ -109,9 +109,9 @@ resource "azurerm_firewall_application_rule_collection" "application_rules" {
109109
for item in flatten([
110110
for fw_name, fw_config in local.firewall_config_map : [
111111
for collection in coalesce(fw_config.application_rule_collections, []) : {
112-
fw_name = fw_name
113-
fw_name_col = "${fw_name}-${collection.name}"
114-
collection = collection
112+
fw_name = fw_name
113+
fw_name_col = "${fw_name}-${collection.name}"
114+
collection = collection
115115
}
116116
]
117117
]) : item.fw_name_col => item

‎modules/terraform/azure/firewall/output.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
output "firewall_private_ips" {
22
description = "Map of firewall names to their private IP addresses"
3-
value = { for fw in azurerm_firewall.firewall : fw.name => fw.ip_configuration[0].private_ip_address }
3+
value = { for fw in azurerm_firewall.firewall : fw.name => fw.ip_configuration[0].private_ip_address }
44
}

‎modules/terraform/azure/main.tf‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ module "dns_zones" {
100100
module "firewall" {
101101
source = "./firewall"
102102

103-
firewall_config_list = var.firewall_config_list
104-
subnets_map = local.all_subnets
105-
public_ips_map = module.public_ips.pip_ids
106-
resource_group_name = local.run_id
107-
location = local.region
108-
tags = local.tags
103+
firewall_config_list = var.firewall_config_list
104+
subnets_map = local.all_subnets
105+
public_ips_map = module.public_ips.pip_ids
106+
resource_group_name = local.run_id
107+
location = local.region
108+
tags = local.tags
109109

110110
depends_on = [module.virtual_network]
111111
}
@@ -115,13 +115,13 @@ module "route_table" {
115115

116116
source = "./route-table"
117117

118-
route_table_config = each.value
119-
resource_group_name = local.run_id
120-
location = local.region
121-
subnets_ids = local.all_subnets
118+
route_table_config = each.value
119+
resource_group_name = local.run_id
120+
location = local.region
121+
subnets_ids = local.all_subnets
122122
firewall_private_ips = module.firewall.firewall_private_ips
123-
public_ip_addresses = module.public_ips.pip_addresses
124-
tags = local.tags
123+
public_ip_addresses = module.public_ips.pip_addresses
124+
tags = local.tags
125125

126126
depends_on = [module.virtual_network, module.firewall]
127127
}
@@ -154,7 +154,7 @@ module "aks" {
154154
dns_zones = try(module.dns_zones.dns_zone_ids, null)
155155
aks_aad_enabled = local.aks_aad_enabled
156156
key_vaults = local.all_key_vaults
157-
depends_on = [module.route_table, module.virtual_network]
157+
depends_on = [module.route_table, module.virtual_network]
158158
}
159159

160160
module "aks-cli" {
@@ -168,7 +168,7 @@ module "aks-cli" {
168168
subnets_map = local.all_subnets
169169
aks_cli_custom_config_path = local.aks_cli_custom_config_path
170170
key_vaults = local.all_key_vaults
171-
aks_aad_enabled = local.aks_aad_enabled
172-
depends_on = [module.route_table, module.virtual_network]
171+
aks_aad_enabled = local.aks_aad_enabled
172+
depends_on = [module.route_table, module.virtual_network]
173173
}
174174

‎modules/terraform/azure/route-table/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resource "azurerm_route" "routes" {
2929
resource "azurerm_subnet_route_table_association" "subnet_associations" {
3030
for_each = { for assoc in var.route_table_config.subnet_associations : assoc.subnet_name => assoc }
3131

32-
subnet_id = var.subnets_ids[each.value.subnet_name]
32+
subnet_id = var.subnets_ids[each.value.subnet_name]
3333
route_table_id = azurerm_route_table.route_table.id
34-
depends_on = [azurerm_route.routes]
34+
depends_on = [azurerm_route.routes]
3535
}

‎modules/terraform/azure/route-table/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ variable "tags" {
4848
description = "Tags to apply to the route table"
4949
type = map(string)
5050
default = {}
51-
}
51+
}

‎modules/terraform/azure/variables.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ variable "route_table_config_list" {
135135
name = string
136136
bgp_route_propagation_enabled = optional(bool, true)
137137
routes = list(object({
138-
name = string
139-
address_prefix = optional(string, null)
138+
name = string
139+
address_prefix = optional(string, null)
140140
address_prefix_publicip_name = optional(string, null)
141-
next_hop_type = string
142-
next_hop_in_ip_address = optional(string, null)
143-
next_hop_firewall_name = optional(string, null)
141+
next_hop_type = string
142+
next_hop_in_ip_address = optional(string, null)
143+
next_hop_firewall_name = optional(string, null)
144144
}))
145145
subnet_associations = list(object({
146146
subnet_name = string

0 commit comments

Comments
 (0)