Merge branch 'domain_renaming'

netascode · Nov 26, 2024 · 00a6263 · 00a6263
2 parents cf57d87 + 80d7060
commit 00a6263
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 123 deletions.
diff --git a/meraki_appliance.tf b/meraki_appliance.tf
@@ -4,7 +4,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_content_filtering, null)
         } if try(network.appliance_content_filtering, null) != null
@@ -31,7 +31,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for appliance_firewall_firewalled_service in try(network.appliance_firewall_firewalled_services, []) : {
-            network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+            network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
             data = try(appliance_firewall_firewalled_service, null)
           }
@@ -57,7 +57,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_inbound_firewall_rules, null)
         } if try(network.appliance_firewall_inbound_firewall_rules, null) != null
@@ -81,7 +81,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_l3_firewall_rules, null)
         } if try(network.appliance_firewall_l3_firewall_rules, null) != null
@@ -105,7 +105,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_l7_firewall_rules, null)
         } if try(network.appliance_firewall_l7_firewall_rules, null) != null
@@ -128,7 +128,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_one_to_many_nat_rules, null)
         } if try(network.appliance_firewall_one_to_many_nat_rules, null) != null
@@ -151,7 +151,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_one_to_one_nat_rules, null)
         } if try(network.appliance_firewall_one_to_one_nat_rules, null) != null
@@ -174,7 +174,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_port_forwarding_rules, null)
         } if try(network.appliance_firewall_port_forwarding_rules, null) != null
@@ -197,7 +197,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_firewall_settings, null)
         } if try(network.appliance_firewall_settings, null) != null
@@ -221,7 +221,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for appliance_port in try(network.appliance_ports, []) : {
-            network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+            network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
             data = try(appliance_port, null)
           } if try(network.appliance_ports, null) != null
@@ -250,7 +250,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_security_intrusion, null)
         } if try(network.appliance_security_intrusion, null) != null
@@ -276,7 +276,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_security_malware, null)
         } if try(network.appliance_security_malware, null) != null
@@ -301,7 +301,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_settings, null)
         } if try(network.appliance_settings, null) != null
@@ -326,7 +326,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_single_lan, null)
         } if try(network.appliance_single_lan, null) != null
@@ -353,7 +353,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for appliance_vlan in try(network.appliance_vlans, []) : {
-            network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+            network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
             data = try(appliance_vlan, null)
           } if try(network.appliance_vlans, null) != null
@@ -396,7 +396,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_vlans_settings, null)
         } if try(network.appliance_vlans_settings, null) != null
@@ -419,7 +419,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_vpn_bgp, null)
         } if try(network.appliance_vpn_bgp, null) != null
@@ -444,12 +444,12 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_vpn_site_to_site_vpn, null)
           hubs = [for h in try(network.appliance_vpn_site_to_site_vpn.hubs, []) : {
             use_default_route = try(h.use_default_route, null)
-            hub_id            = meraki_network.network["${domain.name}/${organization.name}/${h.hub_network_name}"].id
+            hub_id            = meraki_network.network["${organization.name}/${h.hub_network_name}"].id
           }]
         } if try(network.appliance_vpn_site_to_site_vpn, null) != null
       ] if try(domain.organizations, null) != null
@@ -472,7 +472,7 @@ locals {
     for domain in try(local.meraki.domains, []) : [
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : {
-          network_id = meraki_network.network["${domain.name}/${organization.name}/${network.name}"].id
+          network_id = meraki_network.network["${organization.name}/${network.name}"].id
 
           data = try(network.appliance_warm_spare, null)
         } if try(network.appliance_warm_spare, null) != null

diff --git a/meraki_devices.tf b/meraki_devices.tf
@@ -5,7 +5,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : {
-            key  = format("%s/%s/%s/devices/%s", domain.name, organization.name, network.name, device.name)
+            key  = format("%s/%s/devices/%s", organization.name, network.name, device.name)
             data = device
           }
         ]
@@ -37,7 +37,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : {
-            device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+            device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
 
             data = try(device.appliance_uplinks_settings, null)
           } if try(device.appliance_uplinks_settings, null) != null
@@ -90,7 +90,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : {
-            device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+            device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
 
             data = try(device.management_interface, null)
           } if try(device.management_interface, null) != null
@@ -130,11 +130,11 @@ locals {
           for device in try(network.devices, []) : [
             for switch_port in try(device.switch_ports, []) : [
               for port_id in split(",", switch_port.port_ids) : {
-                device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+                device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
 
                 data                     = merge(switch_port, { port_id = port_id })
-                port_schedule_id         = meraki_switch_port_schedule.net_switch_port_schedules["${domain.name}/${organization.name}/${network.name}/port_schedules/${switch_port.port_schedule_name}"].id
-                adaptive_policy_group_id = try(meraki_organization_adaptive_policy_group.organizations_adaptive_policy_group[format("%s/%s/adaptive_policy_groups/%s", domain.name, organization.name, switch_port.adaptive_policy_group_name)].id, null)
+                port_schedule_id         = meraki_switch_port_schedule.net_switch_port_schedules["${organization.name}/${network.name}/port_schedules/${switch_port.port_schedule_name}"].id
+                adaptive_policy_group_id = try(meraki_organization_adaptive_policy_group.organizations_adaptive_policy_group[format("%s/adaptive_policy_groups/%s", organization.name, switch_port.adaptive_policy_group_name)].id, null)
               } if replace(port_id, "-", "") == port_id
             ]
           ]
@@ -150,11 +150,11 @@ locals {
               for switch_port in try(device.switch_ports, []) : [
                 for port_range in split(",", switch_port.port_ids) : [
                   for p in range(split("-", port_range)[0], split("-", port_range)[1]) : {
-                    device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+                    device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
 
                     data                     = merge(switch_port, { port_id = p })
-                    port_schedule_id         = meraki_switch_port_schedule.net_switch_port_schedules["${domain.name}/${organization.name}/${network.name}/port_schedules/${switch_port.port_schedule_name}"].id
-                    adaptive_policy_group_id = try(meraki_organization_adaptive_policy_group.organizations_adaptive_policy_group[format("%s/%s/adaptive_policy_groups/%s", domain.name, organization.name, switch_port.adaptive_policy_group_name)].id, null)
+                    port_schedule_id         = meraki_switch_port_schedule.net_switch_port_schedules["${organization.name}/${network.name}/port_schedules/${switch_port.port_schedule_name}"].id
+                    adaptive_policy_group_id = try(meraki_organization_adaptive_policy_group.organizations_adaptive_policy_group[format("%s/adaptive_policy_groups/%s", organization.name, switch_port.adaptive_policy_group_name)].id, null)
                   }
                 ] if replace(port_range, "-", "") != port_range
               ]
@@ -210,8 +210,8 @@ locals {
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : [
             for switch_routing_interface in try(device.switch_routing_interfaces, []) : {
-              device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
-              interface_key = format("%s/%s/%s/switch_routing_interfaces/%s", domain.name, organization.name, network.name, switch_routing_interface.name)
+              device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
+              interface_key = format("%s/%s/switch_routing_interfaces/%s", organization.name, network.name, switch_routing_interface.name)
               data          = switch_routing_interface
             }
           ] if try(device.switch_routing_interfaces, null) != null
@@ -249,8 +249,8 @@ locals {
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : [
             for switch_routing_interface in try(device.switch_routing_interfaces, []) : {
-              device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
-              interface_id  = meraki_switch_routing_interface.devices_switch_routing_interface["${domain.name}/${organization.name}/${network.name}/switch_routing_interfaces/${switch_routing_interface.name}"].id
+              device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
+              interface_id  = meraki_switch_routing_interface.devices_switch_routing_interface["${organization.name}/${network.name}/switch_routing_interfaces/${switch_routing_interface.name}"].id
               data          = try(switch_routing_interface.dhcp, null)
             } if try(switch_routing_interface.dhcp, null) != null
           ]
@@ -288,7 +288,7 @@ locals {
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : [
             for switch_routing_static_route in try(device.switch_routing_static_routes, []) : {
-              device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+              device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
               data          = switch_routing_static_route
             }
           ] if try(device.switch_routing_static_routes, null) != null
@@ -318,7 +318,7 @@ locals {
       for organization in try(domain.organizations, []) : [
         for network in try(organization.networks, []) : [
           for device in try(network.devices, []) : {
-            device_serial = meraki_device.device["${domain.name}/${organization.name}/${network.name}/devices/${device.name}"].serial
+            device_serial = meraki_device.device["${organization.name}/${network.name}/devices/${device.name}"].serial
             data          = device.wireless_bluetooth_settings
           } if try(device.wireless_bluetooth_settings, null) != null
         ]