From a8d31b42009eae9628a26fbf055059c55fb1e7ac Mon Sep 17 00:00:00 2001 From: tzarski0 <92273798+tzarski0@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:51:33 +0200 Subject: [PATCH 1/2] Update sdwan_feature_templates.tf dependencies --- sdwan_feature_templates.tf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sdwan_feature_templates.tf b/sdwan_feature_templates.tf index a00ddfb..0c2c09d 100644 --- a/sdwan_feature_templates.tf +++ b/sdwan_feature_templates.tf @@ -97,6 +97,7 @@ resource "sdwan_cedge_aaa_feature_template" "cedge_aaa_feature_template" { groups = join(",", rule.groups) authenticated = try(rule.authenticated, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cedge_global_feature_template" "cedge_global_feature_template" { @@ -150,6 +151,7 @@ resource "sdwan_cedge_global_feature_template" "cedge_global_feature_template" { udp_small_servers_variable = try(each.value.udp_small_servers_variable, null) vty_logging = try(each.value.vty_logging, null) vty_logging_variable = try(each.value.vty_logging_variable, null) + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_banner_feature_template" "cisco_banner_feature_template" { @@ -161,6 +163,7 @@ resource "sdwan_cisco_banner_feature_template" "cisco_banner_feature_template" { login_variable = try(each.value.login_variable, null) motd = try(each.value.motd, null) motd_variable = try(each.value.motd_variable, null) + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_bfd_feature_template" "cisco_bfd_feature_template" { @@ -186,6 +189,7 @@ resource "sdwan_cisco_bfd_feature_template" "cisco_bfd_feature_template" { dscp = try(color.default_dscp, null) dscp_variable = try(color.dscp_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_bgp_feature_template" "cisco_bgp_feature_template" { @@ -441,6 +445,7 @@ resource "sdwan_cisco_bgp_feature_template" "cisco_bgp_feature_template" { interface_name = try(m.interface_name, null) interface_name_variable = try(m.interface_name_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_dhcp_server_feature_template" "cisco_dhcp_server_feature_template" { @@ -483,6 +488,7 @@ resource "sdwan_cisco_dhcp_server_feature_template" "cisco_dhcp_server_feature_t hostname_variable = try(lease.hostname_variable, null) optional = try(lease.optional, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_logging_feature_template" "cisco_logging_feature_template" { @@ -538,6 +544,7 @@ resource "sdwan_cisco_logging_feature_template" "cisco_logging_feature_template" ciphersuite_list = try(prof.ciphersuites, null) ciphersuite_list_variable = try(prof.version_ciphersuites_variablevariable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_ntp_feature_template" "cisco_ntp_feature_template" { @@ -575,6 +582,7 @@ resource "sdwan_cisco_ntp_feature_template" "cisco_ntp_feature_template" { }] trusted_keys = try(each.value.trusted_keys, null) trusted_keys_variable = try(each.value.trusted_keys_variable, null) + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_omp_feature_template" "cisco_omp_feature_template" { @@ -615,6 +623,7 @@ resource "sdwan_cisco_omp_feature_template" "cisco_omp_feature_template" { advertise_ipv6_routes = try(length(each.value.ipv6_advertise_protocols) == 0, true) ? null : [for a in each.value.ipv6_advertise_protocols : { protocol = a }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_ospf_feature_template" "cisco_ospf_feature_template" { @@ -705,6 +714,7 @@ resource "sdwan_cisco_ospf_feature_template" "cisco_ospf_feature_template" { policy_name = try(each.value.route_policy, null) policy_name_variable = try(each.value.route_policy_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_secure_internet_gateway_feature_template" "cisco_secure_internet_gateway_feature_template" { @@ -814,6 +824,7 @@ resource "sdwan_cisco_secure_internet_gateway_feature_template" "cisco_secure_in backup_interface_weight = try(pair.backup_interface_weight, null) }] }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_security_feature_template" "cisco_security_feature_template" { @@ -869,6 +880,7 @@ resource "sdwan_cisco_security_feature_template" "cisco_security_feature_templat send_lifetime_infinite = try(key.send_lifetime_end_time_format, null) == "infinite" ? true : null send_lifetime_start_time = try(key.send_lifetime_start_time_epoch, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_sig_credentials_feature_template" "cisco_sig_credentials_feature_template" { @@ -893,6 +905,7 @@ resource "sdwan_cisco_sig_credentials_feature_template" "cisco_sig_credentials_f zscaler_password_variable = try(each.value.zscaler_password_variable, null) zscaler_username = try(each.value.zscaler_username, null) zscaler_username_variable = try(each.value.zscaler_username_variable, null) + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_snmp_feature_template" "cisco_snmp_feature_template" { @@ -955,6 +968,7 @@ resource "sdwan_cisco_snmp_feature_template" "cisco_snmp_feature_template" { exclude_variable = try(o.exclude_variable, null) }] }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_system_feature_template" "cisco_system_feature_template" { @@ -1077,6 +1091,7 @@ resource "sdwan_cisco_system_feature_template" "cisco_system_feature_template" { type = try(obj.type, can(obj.type_variable) ? null : local.defaults.sdwan.edge_feature_templates.system_templates.endpoint_trackers.type) type_variable = try(obj.type_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_thousandeyes_feature_template" "cisco_thousandeyes_feature_template" { @@ -1107,6 +1122,7 @@ resource "sdwan_cisco_thousandeyes_feature_template" "cisco_thousandeyes_feature te_vpn_variable = try(each.value.vpn_id_variable, null) te_web_proxy_type = try(each.value.proxy_type, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_vpn_feature_template" "cisco_vpn_feature_template" { @@ -1346,6 +1362,7 @@ resource "sdwan_cisco_vpn_feature_template" "cisco_vpn_feature_template" { translate_ip_subnet = try(rule.translate_ip_subnet, null) translate_ip_subnet_variable = try(rule.translate_ip_subnet_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_vpn_interface_feature_template" "cisco_vpn_interface_feature_template" { @@ -1678,6 +1695,7 @@ resource "sdwan_cisco_vpn_interface_feature_template" "cisco_vpn_interface_featu translate_port_variable = try(entry.translate_port_variable, null) optional = try(entry.optional, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_vpn_interface_ipsec_feature_template" "cisco_vpn_interface_ipsec_feature_template" { @@ -1736,6 +1754,7 @@ resource "sdwan_cisco_vpn_interface_ipsec_feature_template" "cisco_vpn_interface tunnel_source_interface_variable = try(each.value.tunnel_source_interface_variable, null) tunnel_source = try(each.value.tunnel_source_ip, null) tunnel_source_variable = try(each.value.tunnel_source_ip_variable, null) + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cli_template_feature_template" "cli_template_feature_template" { @@ -1744,6 +1763,7 @@ resource "sdwan_cli_template_feature_template" "cli_template_feature_template" { description = each.value.description device_types = [for d in try(each.value.device_types, local.defaults.sdwan.edge_feature_templates.cli_templates.device_types) : try(local.device_type_map[d], "vedge-${d}")] cli_config = each.value.cli_config + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_switchport_feature_template" "switchport_feature_template" { @@ -1810,6 +1830,7 @@ resource "sdwan_switchport_feature_template" "switchport_feature_template" { vlan = try(sma.vlan, null) vlan_variable = try(sma.vlan_variable, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_vpn_interface_svi_feature_template" "vpn_interface_svi_feature_template" { @@ -1937,4 +1958,5 @@ resource "sdwan_vpn_interface_svi_feature_template" "vpn_interface_svi_feature_t mac_address_variable = try(e.mac_address_variable, null) optional = try(e.optional, null) }] + depends_on = [sdwan_localized_policy.localized_policy] } From e9006df06b68ea9f3289f54611f056774d1ac207 Mon Sep 17 00:00:00 2001 From: tzarski0 <92273798+tzarski0@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:55:42 +0200 Subject: [PATCH 2/2] fix formatting --- sdwan_feature_templates.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdwan_feature_templates.tf b/sdwan_feature_templates.tf index 0c2c09d..e6470d1 100644 --- a/sdwan_feature_templates.tf +++ b/sdwan_feature_templates.tf @@ -151,7 +151,7 @@ resource "sdwan_cedge_global_feature_template" "cedge_global_feature_template" { udp_small_servers_variable = try(each.value.udp_small_servers_variable, null) vty_logging = try(each.value.vty_logging, null) vty_logging_variable = try(each.value.vty_logging_variable, null) - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_banner_feature_template" "cisco_banner_feature_template" { @@ -163,7 +163,7 @@ resource "sdwan_cisco_banner_feature_template" "cisco_banner_feature_template" { login_variable = try(each.value.login_variable, null) motd = try(each.value.motd, null) motd_variable = try(each.value.motd_variable, null) - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_bfd_feature_template" "cisco_bfd_feature_template" { @@ -582,7 +582,7 @@ resource "sdwan_cisco_ntp_feature_template" "cisco_ntp_feature_template" { }] trusted_keys = try(each.value.trusted_keys, null) trusted_keys_variable = try(each.value.trusted_keys_variable, null) - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_omp_feature_template" "cisco_omp_feature_template" { @@ -905,7 +905,7 @@ resource "sdwan_cisco_sig_credentials_feature_template" "cisco_sig_credentials_f zscaler_password_variable = try(each.value.zscaler_password_variable, null) zscaler_username = try(each.value.zscaler_username, null) zscaler_username_variable = try(each.value.zscaler_username_variable, null) - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cisco_snmp_feature_template" "cisco_snmp_feature_template" { @@ -1754,7 +1754,7 @@ resource "sdwan_cisco_vpn_interface_ipsec_feature_template" "cisco_vpn_interface tunnel_source_interface_variable = try(each.value.tunnel_source_interface_variable, null) tunnel_source = try(each.value.tunnel_source_ip, null) tunnel_source_variable = try(each.value.tunnel_source_ip_variable, null) - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_cli_template_feature_template" "cli_template_feature_template" { @@ -1763,7 +1763,7 @@ resource "sdwan_cli_template_feature_template" "cli_template_feature_template" { description = each.value.description device_types = [for d in try(each.value.device_types, local.defaults.sdwan.edge_feature_templates.cli_templates.device_types) : try(local.device_type_map[d], "vedge-${d}")] cli_config = each.value.cli_config - depends_on = [sdwan_localized_policy.localized_policy] + depends_on = [sdwan_localized_policy.localized_policy] } resource "sdwan_switchport_feature_template" "switchport_feature_template" {