Skip to content

Commit

Permalink
Merge pull request #33 from netascode/32-networks-wireless-ssid-nesting
Browse files Browse the repository at this point in the history
fix: change wireless module nesting to support schema changes (networ…
  • Loading branch information
jon-humphries authored Jan 17, 2025
2 parents 4c3cd37 + e3c0705 commit 99285ec
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions meraki_wireless.tf
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
key = format("${organization.name}/${network.name}/ssids/${try(wireless_ssid.name, "unknown")}") # Use "unknown" if name is missing
network_id = meraki_network.network["${organization.name}/${network.name}"].id
data = try(wireless_ssid, null)
Expand All @@ -162,7 +162,7 @@ locals {
secret = try(radius_accounting_server.secret, null)
}
]
} if try(network.wireless_ssids, null) != null
} if try(network.wireless.ssids, null) != null
] if try(organization.networks, null) != null
] if try(domain.organizations, null) != null
] if try(local.meraki.domains, null) != null
Expand Down Expand Up @@ -257,7 +257,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
eap_override = try(wireless_ssid.eap_override, null)
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
Expand Down Expand Up @@ -287,7 +287,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.device_type_group_policies, null)
Expand All @@ -314,7 +314,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.firewall_l3_firewall_rules, null)
Expand Down Expand Up @@ -342,7 +342,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.hotspot20, null)
Expand Down Expand Up @@ -376,7 +376,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : [
for wireless_ssid in try(network.wireless.ssids, []) : [
for identity_psk in try(wireless_ssid.identity_psks, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
Expand Down Expand Up @@ -408,7 +408,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.schedules, null)
Expand Down Expand Up @@ -436,7 +436,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.splash_settings, null)
Expand Down Expand Up @@ -494,7 +494,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.traffic_shaping_rules, null)
Expand Down Expand Up @@ -523,7 +523,7 @@ locals {
for domain in try(local.meraki.domains, []) : [
for organization in try(domain.organizations, []) : [
for network in try(organization.networks, []) : [
for wireless_ssid in try(network.wireless_ssids, []) : {
for wireless_ssid in try(network.wireless.ssids, []) : {
network_id = meraki_network.network["${organization.name}/${network.name}"].id
number = meraki_wireless_ssid.net_wireless_ssids["${organization.name}/${network.name}/ssids/${wireless_ssid.name}"].number
data = try(wireless_ssid.bonjour_forwarding, null)
Expand Down

0 comments on commit 99285ec

Please sign in to comment.