Automation Toolkit Release v2024.2.0

Author: bhlohumi

cd3_automation_toolkit/Security/Firewall/export_firewallpolicy_nonGreenField.py

@@ -298,11 +298,11 @@ def print_firewall_applist(region, ct, values_for_column_fwapplist, fwpolicies,
                         "\nterraform import \"module.applications[\\\"" + str(applistpolicy_tf_name) + "_" + str(
                             app_tf_name) + "\\\"].oci_network_firewall_network_firewall_policy_application.network_firewall_policy_application\" networkFirewallPolicies/" + applistpolicy_id + "/applications/" + app_display_name)
 
-                    if app_data.icmp_code != None:
-                        application_detail = application_detail + "\n" + app.name + "::" + app.type + "::" + str(
+                if app_data.icmp_code != None:
+                    application_detail = application_detail + "\n" + app.name + "::" + app.type + "::" + str(
                             app_data.icmp_type) + "::" + str(app_data.icmp_code)
-                    else:
-                        application_detail = application_detail + "\n" + app.name + "::" + app.type + "::" + str(
+                else:
+                    application_detail = application_detail + "\n" + app.name + "::" + app.type + "::" + str(
                             app_data.icmp_type)
 
             if (application_detail != ""):

cd3_automation_toolkit/Security/Firewall/templates/policy-apps-template

@@ -1,6 +1,6 @@
 {% if count == 0 %}
 
-application_lists = {
+applications = {
     ##Add New apps for {{ region|lower }} here##
 }
 {% else %}

cd3_automation_toolkit/user-scripts/terraform/firewall.tf

@@ -68,7 +68,7 @@ module address_lists {
 
 module applications {
   source                     = "./modules/security/firewall/application"
-  for_each                   = var.application_lists != null ? var.application_lists : {}
+  for_each                   = var.applications != null ? var.applications : {}
   depends_on = [module.policies]
   icmp_type = each.value.icmp_type
   app_list_name = each.value.app_list_name

cd3_automation_toolkit/user-scripts/terraform/variables_example.tf

@@ -1727,7 +1727,7 @@ variable "address_lists" {
   default = {}
 }
 
-variable "application_lists" {
+variable "applications" {
   type    = map(object({
     app_list_name          = string
     network_firewall_policy_id = string

jenkins_install/scriptler/scripts/ValidateParams.groovy

@@ -4,7 +4,7 @@ def validate_params(Workflow,MainOptions,SubOptions,SubChildOptions,AdditionalFi
     "Validate CD3":["Validate Compartments","Validate Groups","Validate Policies","Validate Tags","Validate Networks","Validate DNS","Validate Instances","Validate Block Volumes","Validate FSS","Validate Buckets"],
     "Identity":["Add/Modify/Delete Compartments", "Add/Modify/Delete Groups","Add/Modify/Delete Policies", "Add/Modify/Delete Users", "Add/Modify/Delete Network Sources"],
     "Network":["Create Network", "Modify Network","Security Rules", "Route Rules", "DRG Route Rules", "Network Security Groups", "Add/Modify/Delete VLANs", "Customer Connectivity"],
-    "OCI Firewall":["Validate Firewall CD3 Excel", "Add/Modify Firewall Policy","Add/Modify/Delete Firewall", "Clone Firewall Policy", "Delete Firewall Policy"],  
+    "OCI Firewall":["Validate Firewall CD3 Excel", "Add/Modify/Delete Firewall Policy","Add/Modify/Delete Firewall", "Clone Firewall Policy"],
     "DNS Management":["Add/Modify/Delete DNS Views/Zones/Records", "Add/Modify/Delete DNS Resolvers"],
     "Compute":["Add/Modify/Delete Dedicated VM Hosts", "Add/Modify/Delete Instances/Boot Backup Policy"],
     "Storage":["Add/Modify/Delete Block Volumes/Block Backup Policy", "Add/Modify/Delete File Systems", "Add/Modify/Delete Object Storage Buckets"],