refactor(all): key format changes (#99)

rwcrowe · rocrowe · web-flow · commit 2c8c1835d948 · 2025-10-27T18:22:46.000-04:00
* refactor(all): update key formatting for consistency

* domain fix

---------

Co-authored-by: rocrowe &lt;rocrowe@cisco.com&gt;
diff --git a/iosxr_as_path_set.tf b/iosxr_as_path_set.tf
@@ -2,7 +2,7 @@ locals {
   as_path_sets = flatten([
     for device in local.devices : [
       for as_path_set in try(local.device_config[device.name].as_path_sets, []) : {
-        key         = "${device.name}-${as_path_set.set_name}"
+        key         = format("%s/%s", device.name, as_path_set.set_name)
         device_name = device.name
         set_name    = try(as_path_set.set_name, local.defaults.iosxr.devices.configuration.as_path_sets.set_name, null)
         rpl         = try(as_path_set.rpl, local.defaults.iosxr.devices.configuration.as_path_sets.rpl, null)
diff --git a/iosxr_banner.tf b/iosxr_banner.tf
@@ -2,7 +2,7 @@ locals {
   banners = flatten([
     for device in local.devices : [
       for banner in try(local.device_config[device.name].banners, []) : {
-        key         = "${device.name}-${banner.banner_type}"
+        key         = format("%s/%s", device.name, banner.banner_type)
         device_name = device.name
         banner_type = try(banner.banner_type, local.defaults.iosxr.devices.configuration.banners.banner_type, null)
         line        = try(banner.line, local.defaults.iosxr.devices.configuration.banners.line, null)
diff --git a/iosxr_class_map_qos.tf b/iosxr_class_map_qos.tf
@@ -2,7 +2,7 @@ locals {
   class_map_qos = flatten([
     for device in local.devices : [
       for class_map_qos in try(local.device_config[device.name].class_map_qos, []) : {
-        key                             = "${device.name}-${class_map_qos.class_map_name}"
+        key                             = format("%s/%s", device.name, class_map_qos.class_map_name)
         device_name                     = device.name
         class_map_name                  = try(class_map_qos.class_map_name, null)
         description                     = try(class_map_qos.description, local.defaults.iosxr.devices.configuration.class_map_qos.description, null)
diff --git a/iosxr_community_set.tf b/iosxr_community_set.tf
@@ -2,7 +2,7 @@ locals {
   community_sets = flatten([
     for device in local.devices : [
       for community_set in try(local.device_config[device.name].community_sets, []) : {
-        key         = "${device.name}-${community_set.set_name}"
+        key         = format("%s/%s", device.name, community_set.set_name)
         device_name = device.name
         set_name    = try(community_set.set_name, local.defaults.iosxr.devices.configuration.community_sets.set_name, null)
         rpl         = try(community_set.rpl, local.defaults.iosxr.devices.configuration.community_sets.rpl, null)
diff --git a/iosxr_domain_vrf.tf b/iosxr_domain_vrf.tf
@@ -2,7 +2,7 @@ locals {
   domain_vrfs = flatten([
     for device in local.devices : [
       for domain_vrf in try(local.device_config[device.name].domain_vrfs, []) : {
-        key                     = "${device.name}-${domain_vrf.vrf_name}"
+        key                     = format("%s/%s", device.name, domain_vrf.vrf_name)
         device_name             = device.name
         vrf_name                = try(domain_vrf.vrf_name, null)
         name                    = try(domain_vrf.name, local.defaults.iosxr.devices.configuration.domain_vrfs.name, null)
diff --git a/iosxr_esi_set.tf b/iosxr_esi_set.tf
@@ -2,7 +2,7 @@ locals {
   esi_sets = flatten([
     for device in local.devices : [
       for esi_set in try(local.device_config[device.name].esi_sets, []) : {
-        key         = "${device.name}-${esi_set.set_name}"
+        key         = format("%s/%s", device.name, esi_set.set_name)
         device_name = device.name
         set_name    = try(esi_set.set_name, local.defaults.iosxr.devices.configuration.esi_sets.set_name, null)
         rpl         = try(esi_set.rpl, local.defaults.iosxr.devices.configuration.esi_sets.rpl, null)
diff --git a/iosxr_evpn_evi.tf b/iosxr_evpn_evi.tf
@@ -2,7 +2,7 @@ locals {
   evpn_evis = flatten([
     for device in local.devices : [
       for evi in try(local.device_config[device.name].evpn_evis, []) : {
-        key                                 = "${device.name}-${evi.vpn_id}"
+        key                                 = format("%s/%s", device.name, evi.vpn_id)
         device_name                         = device.name
         vpn_id                              = try(evi.vpn_id, local.defaults.iosxr.devices.configuration.evpn_evis.vpn_id, null)
         description                         = try(evi.description, local.defaults.iosxr.devices.configuration.evpn_evis.description, null)
diff --git a/iosxr_evpn_group.tf b/iosxr_evpn_group.tf
@@ -2,7 +2,7 @@ locals {
   evpn_groups = flatten([
     for device in local.devices : [
       for evpn_group in try(local.device_config[device.name].evpn_groups, []) : {
-        key         = "${device.name}-${evpn_group.group_id}"
+        key         = format("%s/%s", device.name, evpn_group.group_id)
         device_name = device.name
         group_id    = try(evpn_group.group_id, local.defaults.iosxr.devices.configuration.evpn_groups.group_id, null)
         core_interfaces = try(length(evpn_group.core_interfaces) == 0, true) ? null : [for core_interface in evpn_group.core_interfaces : {
diff --git a/iosxr_extcommunity_cost_set.tf b/iosxr_extcommunity_cost_set.tf
@@ -2,7 +2,7 @@ locals {
   extcommunity_cost_sets = flatten([
     for device in local.devices : [
       for extcommunity_cost_set in try(local.device_config[device.name].extcommunity_cost_sets, []) : {
-        key         = "${device.name}-${extcommunity_cost_set.set_name}"
+        key         = format("%s/%s", device.name, extcommunity_cost_set.set_name)
         device_name = device.name
         set_name    = try(extcommunity_cost_set.set_name, local.defaults.iosxr.devices.configuration.extcommunity_cost_sets.set_name, null)
         rpl         = try(extcommunity_cost_set.rpl, local.defaults.iosxr.devices.configuration.extcommunity_cost_sets.rpl, null)
diff --git a/iosxr_extcommunity_opaque_set.tf b/iosxr_extcommunity_opaque_set.tf
@@ -2,7 +2,7 @@ locals {
   extcommunity_opaque_sets = flatten([
     for device in local.devices : [
       for extcommunity_opaque_set in try(local.device_config[device.name].extcommunity_opaque_sets, []) : {
-        key         = "${device.name}-${extcommunity_opaque_set.set_name}"
+        key         = format("%s/%s", device.name, extcommunity_opaque_set.set_name)
         device_name = device.name
         set_name    = try(extcommunity_opaque_set.set_name, local.defaults.iosxr.devices.configuration.extcommunity_opaque_sets.set_name, null)
         rpl         = try(extcommunity_opaque_set.rpl, local.defaults.iosxr.devices.configuration.extcommunity_opaque_sets.rpl, null)
diff --git a/iosxr_flow_monitor_map.tf b/iosxr_flow_monitor_map.tf
@@ -2,7 +2,7 @@ locals {
   flow_monitor_maps = flatten([
     for device in local.devices : [
       for flow_monitor_map in try(local.device_config[device.name].flow_monitor_maps, []) : {
-        key  = "${device.name}-${flow_monitor_map.name}"
+        key  = format("%s/%s", device.name, flow_monitor_map.name)
         name = try(flow_monitor_map.name, local.defaults.iosxr.devices.configuration.flow_monitor_maps.name, null)
         exporters = try(length(flow_monitor_map.exporters) == 0, true) ? null : [for exporter in flow_monitor_map.exporters : {
           name = try(exporter.name, local.defaults.iosxr.devices.configuration.flow_monitor_maps.exporters.name, null)
diff --git a/iosxr_flow_sampler_map.tf b/iosxr_flow_sampler_map.tf
@@ -2,7 +2,7 @@ locals {
   flow_sampler_maps = flatten([
     for device in local.devices : [
       for sampler_map in try(local.device_config[device.name].flow_sampler_maps, []) : {
-        key         = "${device.name}-${sampler_map.name}"
+        key         = format("%s/%s", device.name, sampler_map.name)
         device_name = device.name
         name        = try(sampler_map.name, local.defaults.iosxr.devices.configuration.flow_sampler_maps.name, null)
         random      = try(sampler_map.random, local.defaults.iosxr.devices.configuration.flow_sampler_maps.random, null)
diff --git a/iosxr_gnmi.tf b/iosxr_gnmi.tf
@@ -2,7 +2,7 @@ locals {
   gnmi = flatten([
     for device in local.devices : [
       for gnmi_name, gnmi in try(local.device_config[device.name].gnmi, {}) : {
-        key         = "${device.name}-${gnmi_name}"
+        key         = format("%s/%s", device.name, gnmi_name)
         device_name = device.name
         path        = try(gnmi.path, null)
         attributes  = try(gnmi.attributes, null)
diff --git a/iosxr_interface.tf b/iosxr_interface.tf
@@ -2,7 +2,7 @@ locals {
   interfaces_groups = flatten([
     for device in local.devices : [
       for interface in try(local.device_config[device.name].interfaces, []) : {
-        key             = "${device.name}-${interface.interface_name}"
+        key             = format("%s/%s", device.name, interface.interface_name)
         device_name     = device.name
         interface_name  = interface.interface_name
         is_subinterface = can(regex("\\.", interface.interface_name))
diff --git a/iosxr_ipv4_prefix_list.tf b/iosxr_ipv4_prefix_list.tf
@@ -2,7 +2,7 @@ locals {
   ipv4_prefix_lists = flatten([
     for device in local.devices : [
       for prefix_list in try(local.device_config[device.name].ipv4_prefix_lists, []) : {
-        key              = "${device.name}-${prefix_list.prefix_list_name}"
+        key              = format("%s/%s", device.name, prefix_list.prefix_list_name)
         device_name      = device.name
         prefix_list_name = try(prefix_list.prefix_list_name, local.defaults.iosxr.devices.configuration.ipv4_prefix_lists.prefix_list_name, null)
         sequences = try(length(prefix_list.sequences) == 0, true) ? null : [for sequence in prefix_list.sequences : {
diff --git a/iosxr_key_chain.tf b/iosxr_key_chain.tf
@@ -2,7 +2,7 @@ locals {
   key_chains = flatten([
     for device in local.devices : [
       for key_chain in try(local.device_config[device.name].key_chains, []) : {
-        key         = "${device.name}-${key_chain.name}"
+        key         = format("%s/%s", device.name, key_chain.name)
         device_name = device.name
         name        = try(key_chain.name, local.defaults.iosxr.devices.configuration.key_chains.name, null)
         keys = try(length(key_chain.keys) == 0, true) ? null : [for key in key_chain.keys : {
diff --git a/iosxr_l2vpn_bridge_group.tf b/iosxr_l2vpn_bridge_group.tf
@@ -2,7 +2,7 @@ locals {
   l2vpn_bridge_groups = flatten([
     for device in local.devices : [
       for bg in try(local.device_config[device.name].l2vpn_bridge_group, []) : {
-        key         = "${device.name}-${bg.group_name}"
+        key         = format("%s/%s", device.name, bg.group_name)
         device_name = device.name
         group_name  = try(bg.group_name, local.defaults.iosxr.devices.configuration.l2vpn_bridge_group_name, null)
       }
diff --git a/iosxr_l2vpn_bridge_group_bridge_domain.tf b/iosxr_l2vpn_bridge_group_bridge_domain.tf
@@ -2,7 +2,7 @@ locals {
   l2vpn_bridge_group_bridge_domain = flatten([
     for device in local.devices : [
       for bridge_domain in try(local.device_config[device.name].l2vpn_bridge_group_bridge_domain, []) : {
-        key                                = "${device.name}-${bridge_domain.bridge_group_name}-${bridge_domain.bridge_domain_name}"
+        key                                = format("%s/%s/%s", device.name, bridge_domain.bridge_group_name, bridge_domain.bridge_domain_name)
         device_name                        = device.name
         bridge_group_name                  = bridge_domain.bridge_group_name
         bridge_domain_name                 = bridge_domain.bridge_domain_name
diff --git a/iosxr_l2vpn_pw_class.tf b/iosxr_l2vpn_pw_class.tf
@@ -2,7 +2,7 @@ locals {
   l2vpn_pw_class = flatten([
     for device in local.devices : [
       for pw_class in try(local.device_config[device.name].l2vpn_pw_class, []) : {
-        key                                                            = "${device.name}-${pw_class.name}"
+        key                                                            = format("%s/%s", device.name, pw_class.name)
         device_name                                                    = device.name
         name                                                           = try(pw_class.name, local.defaults.iosxr.devices.configuration.l2vpn_pw_class.name, null)
         encapsulation_mpls                                             = try(pw_class.encapsulation_mpls, local.defaults.iosxr.devices.configuration.l2vpn_pw_class.encapsulation_mpls, null)
diff --git a/iosxr_logging_source_interface.tf b/iosxr_logging_source_interface.tf
@@ -2,7 +2,7 @@ locals {
   logging_source_interfaces = flatten([
     for device in local.devices : [
       for logging_source_interface in try(local.device_config[device.name].logging_source_interface, []) : {
-        key         = "${device.name}-${logging_source_interface.name}"
+        key         = format("%s/%s", device.name, logging_source_interface.name)
         device_name = device.name
         name        = try(logging_source_interface.name, local.defaults.iosxr.devices.configuration.logging_source_interface.name, null)
         vrfs = try(length(logging_source_interface.vrfs) == 0, true) ? null : [for vrf in logging_source_interface.vrfs : {
diff --git a/iosxr_logging_vrf.tf b/iosxr_logging_vrf.tf
@@ -2,7 +2,7 @@ locals {
   logging_vrfs = flatten([
     for device in local.devices : [
       for logging_vrf in try(local.device_config[device.name].logging_vrf, []) : {
-        key         = "${device.name}-${logging_vrf.vrf_name}"
+        key         = format("%s/%s", device.name, logging_vrf.vrf_name)
         device_name = device.name
         vrf_name    = try(logging_vrf.vrf_name, local.defaults.iosxr.devices.configuration.logging_vrf.vrf_name, null)
         host_ipv4_addresses = try(length(logging_vrf.host_ipv4_addresses) == 0, true) ? null : [for host in logging_vrf.host_ipv4_addresses : {
diff --git a/iosxr_policy_map_qos.tf b/iosxr_policy_map_qos.tf
@@ -2,7 +2,7 @@ locals {
   policy_map_qos = flatten([
     for device in local.devices : [
       for policy_map_qos in try(local.device_config[device.name].policy_map_qos, []) : {
-        key             = "${device.name}-${policy_map_qos.policy_map_name}"
+        key             = format("%s/%s", device.name, policy_map_qos.policy_map_name)
         device_name     = device.name
         policy_map_name = try(policy_map_qos.policy_map_name, local.defaults.iosxr.devices.configuration.policy_map_qos.policy_map_name, null)
         description     = try(policy_map_qos.description, local.defaults.iosxr.devices.configuration.policy_map_qos.description, null)
diff --git a/iosxr_prefix_set.tf b/iosxr_prefix_set.tf
@@ -2,7 +2,7 @@ locals {
   prefix_sets = flatten([
     for device in local.devices : [
       for prefix_set in try(local.device_config[device.name].prefix_sets, []) : {
-        key         = "${device.name}-${prefix_set.set_name}"
+        key         = format("%s/%s", device.name, prefix_set.set_name)
         device_name = device.name
         set_name    = try(prefix_set.set_name, local.defaults.iosxr.devices.configuration.prefix_sets.set_name, null)
         rpl         = try(prefix_set.rpl, local.defaults.iosxr.devices.configuration.prefix_sets.rpl, null)
diff --git a/iosxr_rd_set.tf b/iosxr_rd_set.tf
@@ -2,7 +2,7 @@ locals {
   rd_sets = flatten([
     for device in local.devices : [
       for rd_set in try(local.device_config[device.name].rd_sets, []) : {
-        key         = "${device.name}-${rd_set.set_name}"
+        key         = format("%s/%s", device.name, rd_set.set_name)
         device_name = device.name
         set_name    = try(rd_set.set_name, local.defaults.iosxr.devices.configuration.rd_sets.set_name, null)
         rpl         = try(rd_set.rpl, local.defaults.iosxr.devices.configuration.rd_sets.rpl, null)
diff --git a/iosxr_route_policy.tf b/iosxr_route_policy.tf
@@ -2,7 +2,7 @@ locals {
   route_policies = flatten([
     for device in local.devices : [
       for route_policy in try(local.device_config[device.name].route_policy, []) : {
-        key               = "${device.name}-${route_policy.route_policy_name}"
+        key               = format("%s/%s", device.name, route_policy.route_policy_name)
         device_name       = device.name
         route_policy_name = try(route_policy.route_policy_name, local.defaults.iosxr.devices.configuration.route_policy.route_policy_name, null)
         rpl               = try(route_policy.rpl, local.defaults.iosxr.devices.configuration.route_policy.rpl, null)
diff --git a/iosxr_router_hsrp_interface.tf b/iosxr_router_hsrp_interface.tf
@@ -2,7 +2,7 @@ locals {
   router_hsrp_interfaces = flatten([
     for device in local.devices : [
       for hsrp_interface in try(local.device_config[device.name].router_hsrp_interface, []) : {
-        key                       = "${device.name}-${hsrp_interface.interface_name}"
+        key                       = format("%s/%s", device.name, hsrp_interface.interface_name)
         device_name               = device.name
         interface_name            = try(hsrp_interface.interface_name, local.defaults.iosxr.devices.configuration.router_hsrp_interface.interface_name, null)
         hsrp_use_bia              = try(hsrp_interface.hsrp_use_bia, local.defaults.iosxr.devices.configuration.router_hsrp_interface.hsrp_use_bia, null)
diff --git a/iosxr_router_ospf.tf b/iosxr_router_ospf.tf
@@ -2,7 +2,7 @@ locals {
   router_ospf = flatten([
     for device in local.devices : [
       for ospf_process in try(local.device_config[device.name].router_ospf, []) : {
-        key                                       = "${device.name}-${ospf_process.process_name}"
+        key                                       = format("%s/%s", device.name, ospf_process.process_name)
         device_name                               = device.name
         process_name                              = try(ospf_process.process_name, local.defaults.iosxr.devices.configuration.router_ospf.process_name, null)
         mpls_ldp_sync                             = try(ospf_process.mpls_ldp_sync, local.defaults.iosxr.devices.configuration.router_ospf.mpls_ldp_sync, null)
diff --git a/iosxr_router_static_ipv4_unicast.tf b/iosxr_router_static_ipv4_unicast.tf
@@ -2,7 +2,7 @@ locals {
   router_static_ipv4_unicast = flatten([
     for device in local.devices : [
       for route in try(local.device_config[device.name].router_static_ipv4_unicast, []) : {
-        key            = "${device.name}-${route.prefix_address}-${route.prefix_length}"
+        key            = format("%s/%s/%s", device.name, route.prefix_address, route.prefix_length)
         device_name    = device.name
         prefix_address = try(route.prefix_address, local.defaults.iosxr.devices.configuration.router_static_ipv4_unicast.prefix_address, null)
         prefix_length  = try(route.prefix_length, local.defaults.iosxr.devices.configuration.router_static_ipv4_unicast.prefix_length, null)
diff --git a/iosxr_snmp_server_view.tf b/iosxr_snmp_server_view.tf
@@ -2,7 +2,7 @@ locals {
   snmp_server_views = flatten([
     for device in local.devices : [
       for view in try(local.device_config[device.name].snmp_server_views, []) : {
-        key         = "${device.name}-${view.view_name}"
+        key         = format("%s/%s", device.name, view.view_name)
         device_name = device.name
         view_name   = try(view.view_name, local.defaults.iosxr.devices.configuration.snmp_server_views.view_name, null)
         mib_view_families = try(length(view.mib_view_families) == 0, true) ? null : [for family in view.mib_view_families : {
diff --git a/iosxr_tag_set.tf b/iosxr_tag_set.tf
@@ -2,7 +2,7 @@ locals {
   tag_sets = flatten([
     for device in local.devices : [
       for tag_set in try(local.device_config[device.name].tag_sets, []) : {
-        key         = "${device.name}-${tag_set.set_name}"
+        key         = format("%s/%s", device.name, tag_set.set_name)
         device_name = device.name
         set_name    = try(tag_set.set_name, local.defaults.iosxr.devices.configuration.tag_sets.set_name, null)
         rpl_tag_set = try(tag_set.rpl, local.defaults.iosxr.devices.configuration.tag_sets.rpl, null)
