Skip to content

Commit

Permalink
Merge pull request #31 from netascode/fix-all-modules-schema-1.53
Browse files Browse the repository at this point in the history 
Fix all modules schema 1.53
  • Loading branch information
@jon-humphries
jon-humphries authored Jan 14, 2025
2 parents 4dd6c9c + c776b5a commit 04e91fd
Show file tree
Hide file tree
Showing 6 changed files with 783 additions and 1,017 deletions.
317 changes: 126 additions & 191 deletions meraki_appliance.tf
View file

Large diffs are not rendered by default.

93 changes: 34 additions & 59 deletions meraki_devices.tf
View file

Large diffs are not rendered by default.

62 changes: 25 additions & 37 deletions meraki_networks.tf
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
locals {
networks_group_policies = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for group_policy in try(network.group_policies, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
data = try(group_policy, null)
rules = [
for rule in try(group_policy.firewall_and_traffic_shaping.l3_firewall_rules, []) : {
comment = try(rule.comment, null)
dest_cidr = try(rule.destination_cidr, null)
dest_port = try(rule.destination_port, null)
policy = try(rule.policy, null)
protocol = try(rule.protocol, null)
}
]
} if try(network.group_policies, null) != null
] if try(organization.networks, null) != null
] if try(domain.organizations, null) != null
Expand All @@ -15,9 +23,8 @@ locals {
}

resource "meraki_network_group_policy" "net_group_policies" {
for_each = { for i, v in local.networks_group_policies : i => v }
network_id = each.value.network_id

for_each = { for i, v in local.networks_group_policies : i => v }
network_id = each.value.network_id
name = try(each.value.data.name, local.defaults.meraki.networks.group_policies.name, null)
scheduling_enabled = try(each.value.data.scheduling.enabled, local.defaults.meraki.networks.group_policies.scheduling.enabled, null)
scheduling_monday_active = try(each.value.data.scheduling.monday.active, local.defaults.meraki.networks.group_policies.scheduling.monday.active, null)
Expand Down Expand Up @@ -46,7 +53,7 @@ resource "meraki_network_group_policy" "net_group_policies" {
bandwidth_limit_down = try(each.value.data.bandwidth.bandwidth_limits.limit_down, local.defaults.meraki.networks.group_policies.bandwidth.bandwidth_limits.limit_down, null)
firewall_and_traffic_shaping_settings = try(each.value.data.firewall_and_traffic_shaping.settings, local.defaults.meraki.networks.group_policies.firewall_and_traffic_shaping.settings, null)
traffic_shaping_rules = try(each.value.data.firewall_and_traffic_shaping.traffic_shaping_rules, local.defaults.meraki.networks.group_policies.firewall_and_traffic_shaping.traffic_shaping_rules, null)
l3_firewall_rules = try(each.value.data.firewall_and_traffic_shaping.l3_firewall_rules, local.defaults.meraki.networks.group_policies.firewall_and_traffic_shaping.l3_firewall_rules, null)
l3_firewall_rules = try(length(each.value.rules) > 0 ? each.value.rules : null, local.defaults.meraki.networks.group_policies.firewall_and_traffic_shaping.l3_firewall_rules, null)
l7_firewall_rules = try(each.value.data.firewall_and_traffic_shaping.l7_firewall_rules, local.defaults.meraki.networks.group_policies.firewall_and_traffic_shaping.l7_firewall_rules, null)
content_filtering_allowed_url_patterns_settings = try(each.value.data.content_filtering.allowed_url_patterns.settings, local.defaults.meraki.networks.group_policies.content_filtering.allowed_url_patterns.settings, null)
content_filtering_allowed_url_patterns = try(each.value.data.content_filtering.allowed_url_patterns.patterns, local.defaults.meraki.networks.group_policies.content_filtering.allowed_url_patterns.patterns, null)
Expand All @@ -62,10 +69,8 @@ resource "meraki_network_group_policy" "net_group_policies" {

}


locals {
networks_settings = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : {
Expand All @@ -82,48 +87,41 @@ resource "meraki_network_settings" "net_settings" {
for_each = { for i, v in local.networks_settings : i => v }
network_id = each.value.network_id
local_status_page_enabled = try(each.value.data.local_status_page_enabled, local.defaults.meraki.networks.settings.local_status_page_enabled, null)
remote_status_page_enabled = try(each.value.data.remote_status_page_enabled, local.defaults.meraki.networks.settings.remote_status_page_enabled, null)
remote_status_page_enabled = try(each.value.data.remote_status_page, local.defaults.meraki.networks.settings.remote_status_page, null)
local_status_page_authentication_enabled = try(each.value.data.local_status_page.authentication.enabled, local.defaults.meraki.networks.settings.local_status_page.authentication.enabled, null)
local_status_page_authentication_password = try(each.value.data.local_status_page.authentication.password, local.defaults.meraki.networks.settings.local_status_page.authentication.password, null)
secure_port_enabled = try(each.value.data.secure_port.enabled, local.defaults.meraki.networks.settings.secure_port.enabled, null)
named_vlans_enabled = try(each.value.data.named_vlans.enabled, local.defaults.meraki.networks.settings.named_vlans.enabled, null)

}

locals {
networks_snmp = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id

data = try(network.snmp, null)
data = try(network.snmp, null)
} if try(network.snmp, null) != null
] if try(domain.organizations, null) != null
] if try(local.meraki.domains, null) != null
])
}

resource "meraki_network_snmp" "net_snmp" {
for_each = { for i, v in local.networks_snmp : i => v }
network_id = each.value.network_id

for_each = { for i, v in local.networks_snmp : i => v }
network_id = each.value.network_id
access = try(each.value.data.access, local.defaults.meraki.networks.snmp.access, null)
community_string = try(each.value.data.community_string, local.defaults.meraki.networks.snmp.community_string, null)
users = try(each.value.data.users, local.defaults.meraki.networks.snmp.users, null)

}

locals {
networks_syslog_servers = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id

data = try(network.syslog_servers, null)
data = try(network.syslog_servers, null)
} if try(network.syslog_servers, null) != null
] if try(domain.organizations, null) != null
] if try(local.meraki.domains, null) != null
Expand All @@ -133,21 +131,17 @@ locals {
resource "meraki_network_syslog_servers" "net_syslog_servers" {
for_each = { for i, v in local.networks_syslog_servers : i => v }
network_id = each.value.network_id

servers = try(each.value.data.servers, local.defaults.meraki.networks.syslog_servers.servers, [])

servers = try(each.value.data.servers, local.defaults.meraki.networks.syslog_servers.servers, [])
}

locals {
networks_vlan_profiles = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for vlan_profile in try(network.vlan_profiles, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id

data = try(vlan_profile, null)
data = try(vlan_profile, null)
} if try(network.vlan_profiles, null) != null
] if try(organization.networks, null) != null
] if try(domain.organizations, null) != null
Expand All @@ -156,24 +150,20 @@ locals {
}

resource "meraki_network_vlan_profile" "net_vlan_profiles" {
for_each = { for i, v in local.networks_vlan_profiles : i => v }
network_id = each.value.network_id

for_each = { for i, v in local.networks_vlan_profiles : i => v }
network_id = each.value.network_id
iname = each.value.data.iname
name = try(each.value.data.name, local.defaults.meraki.networks.vlan_profiles.name, null)
vlan_names = try(each.value.data.vlan_names, local.defaults.meraki.networks.vlan_profiles.vlan_names, [])
vlan_groups = try(each.value.data.vlan_groups, local.defaults.meraki.networks.vlan_profiles.vlan_groups, [])

}
locals {
networks_devices_claim = flatten([

for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id

serials = [for d in network.devices : d.serial]
serials = [for d in network.devices : d.serial]
} if try(network.devices, null) != null
] if try(domain.organizations, null) != null
] if try(local.meraki.domains, null) != null
Expand All @@ -183,8 +173,7 @@ locals {
resource "meraki_network_device_claim" "net_device_claim" {
for_each = { for i, v in local.networks_devices_claim : i => v }
network_id = each.value.network_id

serials = each.value.serials
serials = each.value.serials
}

locals {
Expand Down Expand Up @@ -213,9 +202,8 @@ locals {
])
}
resource "meraki_network_floor_plan" "net_floor_plans" {
for_each = { for i, v in local.networks_floor_plans : i => v }
network_id = each.value.network_id

for_each = { for i, v in local.networks_floor_plans : i => v }
network_id = each.value.network_id
name = each.value.data.name
bottom_left_corner_lat = each.value.data.bottom_left_corner_lat
bottom_left_corner_lng = each.value.data.bottom_left_corner_lng
Expand Down
Loading

0 comments on commit 04e91fd

Please sign in to comment.