Merge pull request #113 from oracle-devrel/develop-temp

Automation Toolkit Release v2024.3.1

Author: bhlohumi

cd3_automation_toolkit/Release-Notes

@@ -1,4 +1,10 @@
 -------------------------------------
+CD3 Automation Toolkit Tag v2024.3.1
+Jun 18th, 2024
+-------------------------------------
+1. Bug fixes for OCI Firewall
+2. Moved to Jenkins latest plugins
+-------------------------------------
 CD3 Automation Toolkit Tag v2024.3.0
 Jun 7th, 2024
 -------------------------------------
@@ -464,4 +470,4 @@ Export Security Rules/Route Rules
 It also offers functionality to create OCS Work VM into customer's OCI tenancy using which all other tasks can be carried out.
 Please go through readMe under SetUpOCI_ViaTF for details on how to use the automation.
 
-It works for 2 regions currently: Ashburn and Phoenix ie it works for customer tenancy subscribed to Ashburn and Phoenix
+It works for 2 regions currently: Ashburn and Phoenix ie it works for customer tenancy subscribed to Ashburn and Phoenix

cd3_automation_toolkit/cd3FirewallValidator.py

@@ -207,7 +207,7 @@ def validate_Firewall(filename,comp_ids,fwpolicy,config,signer, ct):
             columnvalue = str(dffirewall.loc[i, columnname]).strip()
 
             if (columnname == 'Availability Domain(AD1|AD2|AD3|Regional)'):
-                if columnvalue.lower() != 'nan' and columnvalue.upper() not in ["AD1", "AD2", "AD3","Regional"]:
+                if columnvalue.lower() != 'nan' and columnvalue.upper() not in ["AD1", "AD2", "AD3","REGIONAL"]:
                     log(f'ROW {i+3} : Wrong value at column "Availability Domain" - {columnvalue}.')
                     fw_invalid_check = True
 
@@ -1160,6 +1160,4 @@ def validate_firewall_cd3(filename, var_file, prefix, outdir, config,signer,ct):
         print("\n\nSummary:")
         print("=======")
         print("There are no errors in CD3. Please proceed with TF Generation\n")
-        return "No Error"
-
-
+        return "No Error"

cd3_automation_toolkit/commonTools.py

@@ -164,7 +164,7 @@ def get_export_filters(self,export_filters):
                 self.cg_region = (i.split("=")[1])[2:][:-2]
 
             if 'fwl_clone_src_region' in i:
-                self.fwl_clone_src_region = (i.split("=")[1])[2:][:-2]
+                self.fwl_clone_src_region = (i.split("=")[1])[1:][:-1]
 
             if 'src_policy_str' in i:
                 self.src_policy_str = (i.split("=")[1])[2:][:-2]
@@ -179,7 +179,7 @@ def get_export_filters(self,export_filters):
                 self.fwl_name = (i.split("=")[1])[2:][:-2]
 
             if 'fwl_clone_comp' in i:
-                self.fwl_clone_comp = (i.split("=")[1])[2:][:-2]
+                self.fwl_clone_comp = (i.split("=")[1])[1:][:-1]
                 self.fwl_clone_comp = self.fwl_clone_comp if self.fwl_clone_comp else "null"
 
             if 'fwl_del_comp' in i:

jenkins_install/plugins.txt

@@ -1,22 +1,22 @@
-plain-credentials:143.v1b_df8b_d3b_e48
-snakeyaml-api:2.2-111.vc6598e30cc65
-workflow-step-api:657.v03b_e8115821b_
-pipeline-build-step:540.vb_e8849e1a_b_d8
-pipeline-input-step:491.vb_07d21da_1a_fb_
-pipeline-stage-view:2.34
-job-dsl:1.87
-credentials-binding:657.v2b_19db_7d6e6d
-docker-workflow:572.v950f58993843
-scm-api:689.v237b_6d3a_ef7f
-configuration-as-code:1775.v810dc950b_514
-config-file-provider:968.ve1ca_eb_913f8c
-git:5.2.1
-credentials:1319.v7eb_51b_3a_c97b_
-build-timeout:1.32
-script-security:1336.vf33a_a_9863911
-rebuild:330.v645b_7df10e2a_
-uno-choice:2.8.1
-file-parameters:316.va_83a_1221db_a_7
-scriptler:348.v5d461e205da_a_
-ansicolor:1.0.4
-pipeline-graph-view:223.vf9249decdfcd
+plain-credentials:latest
+snakeyaml-api:latest
+workflow-step-api:latest
+pipeline-build-step:latest
+pipeline-input-step:latest
+pipeline-stage-view:latest
+job-dsl:latest
+credentials-binding:latest
+docker-workflow:latest
+scm-api:latest
+configuration-as-code:latest
+config-file-provider:latest
+git:latest
+credentials:latest
+build-timeout:latest
+script-security:latest
+rebuild:latest
+uno-choice:latest
+file-parameters:latest
+scriptler:latest
+ansicolor:latest
+pipeline-graph-view:latest

jenkins_install/scriptler/scripts/SubChildOptions.groovy

@@ -1,6 +1,6 @@
 List sec_rules = ["<b>SECURITY RULES</b>:disabled","Export Security Rules (From OCI into SecRulesinOCI sheet)", "Add/Modify/Delete Security Rules (Reads SecRulesinOCI sheet)"]
 List route_rules = ["<b>ROUTE RULES</b>:disabled","Export Route Rules (From OCI into RouteRulesinOCI sheet)", "Add/Modify/Delete Route Rules (Reads RouteRulesinOCI sheet)"]
-List firewall_policy = ["<b>FIREWALL POLICY</b>:disabled","Add/Modify Policy", "Add/Modify Service","Add/Modify Service-list","Add/Modify Application","Add/Modify Application-list","Add/Modify Address-list","Add/Modify Url-list","Add/Modify Security rules","Add/Modify Mapped Secrets","Add/Modify Decryption Rules","Add/Modify Decryption Profile"]
+List firewall_policy = ["<b>FIREWALL POLICY</b>:disabled","Add/Modify/Delete Policy", "Add/Modify/Delete Service","Add/Modify/Delete Service-list","Add/Modify/Delete Application","Add/Modify/Delete Application-list","Add/Modify/Delete Address-list","Add/Modify/Delete Url-list","Add/Modify/Delete Security rules","Add/Modify/Delete Mapped Secrets","Add/Modify/Delete Decryption Rules","Add/Modify/Delete Decryption Profile"]
 List drg_route_rules = ["<b>DRG ROUTE RULES</b>:disabled","Export DRG Route Rules (From OCI into DRGRouteRulesinOCI sheet)", "Add/Modify/Delete DRG Route Rules (Reads DRGRouteRulesinOCI sheet)"]
 List nsg = ["<b>NSGs</b>:disabled","Export NSGs (From OCI into NSGs sheet)", "Add/Modify/Delete NSGs (Reads NSGs sheet)"]
 List cis =  ["<b>CIS</b>:disabled","Download latest compliance checking script", "Execute compliance checking script"]