oracle-devrel · xs2suruchi · May 14, 2025 · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/Dockerfile b/Dockerfile
@@ -62,11 +62,12 @@ sudo unzip terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip -d /cd3us
 sudo cp -r /cd3user/.terraform.d/plugins/registry.terraform.io /cd3user/.terraform.d/plugins/registry.opentofu.org && \
 sudo chown -R cd3user:cd3user /cd3user/ && \
 sudo rm -rf terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip ;\
+
 fi
 
 ##################################### START INSTALLING JENKINS ###################################
-ARG JENKINS_VERSION=2.444
-ARG JENKINS_SHA=ab093a455fc35951c9b46361002e17cc3ed7c59b0943bbee3a57a363f3370d2e
+ARG JENKINS_VERSION=2.504.1
+ARG JENKINS_SHA=81026db18b0c4aad6b62cf408e4c42e5797661b41c517b37df606238e89b9df1
 ARG JENKINS_PLUGIN_MANAGER_VERSION=2.12.13
 ARG PLUGIN_CLI_URL=https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/${JENKINS_PLUGIN_MANAGER_VERSION}/jenkins-plugin-manager-${JENKINS_PLUGIN_MANAGER_VERSION}.jar
 

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 <br>
 
-  [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2024.4.3) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries) 
+  [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2025.1.2) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries) 
 
 <br>
 

diff --git a/cd3_automation_toolkit/Compute/export_dedicatedvmhosts_nonGreenField.py b/cd3_automation_toolkit/Compute/export_dedicatedvmhosts_nonGreenField.py
@@ -24,10 +24,11 @@ def print_dedicatedvmhosts(region, dedicatedvmhost, values_for_column, ntk_compa
     # Tags filter
     defined_tags = dedicatedvmhost.defined_tags
     tags_list = []
-    for tkey, tval in defined_tags.items():
-        for kk, vv in tval.items():
-            tag = tkey + "." + kk + "=" + vv
-            tags_list.append(tag)
+    if defined_tags:
+        for tkey, tval in defined_tags.items():
+            for kk, vv in tval.items():
+                tag = tkey + "." + kk + "=" + vv
+                tags_list.append(tag)
 
     if export_tags == []:
         check = True

diff --git a/cd3_automation_toolkit/Compute/export_instances_nonGreenField.py b/cd3_automation_toolkit/Compute/export_instances_nonGreenField.py
@@ -115,10 +115,11 @@ def __get_instances_info(compartment_name, compartment_id, reg_name, display_nam
             # Tags filter
             ins_defined_tags = ins.defined_tags
             tags_list=[]
-            for tkey,tval in ins_defined_tags.items():
-                for kk,vv in tval.items():
-                    tag = tkey+"."+kk+"="+vv
-                    tags_list.append(tag)
+            if ins_defined_tags:
+                for tkey,tval in ins_defined_tags.items():
+                    for kk,vv in tval.items():
+                        tag = tkey+"."+kk+"="+vv
+                        tags_list.append(tag)
 
             if export_tags == []:
                 check = True

diff --git a/cd3_automation_toolkit/CostManagement/Budget/export_budgets_nonGreenField.py b/cd3_automation_toolkit/CostManagement/Budget/export_budgets_nonGreenField.py
@@ -159,10 +159,11 @@ def export_budgets_nongreenfield(inputfile, outdir, service_dir, config, signer,
                 # Tags filter
                 defined_tags = budget.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/Database/export_adb_nonGreenField.py b/cd3_automation_toolkit/Database/export_adb_nonGreenField.py
@@ -180,10 +180,11 @@ def export_adbs(inputfile, outdir, service_dir, config, signer, ct, export_compa
                 # Tags filter
                 defined_tags = adb.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags==[]:
                     check=True

diff --git a/cd3_automation_toolkit/Database/export_dbsystems_vm_bm_nonGreenField.py b/cd3_automation_toolkit/Database/export_dbsystems_vm_bm_nonGreenField.py
@@ -176,10 +176,11 @@ def export_dbsystems_vm_bm(inputfile, outdir, service_dir, config, signer, ct, e
                 # Tags filter
                 defined_tags = db_system.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/Database/export_exa_infra_nonGreenField.py b/cd3_automation_toolkit/Database/export_exa_infra_nonGreenField.py
@@ -108,10 +108,11 @@ def export_exa_infra(inputfile, outdir, service_dir, config, signer, ct, export_
                 # Tags filter
                 defined_tags = exa_infra.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/Database/export_exa_vmclusters_nonGreenField.py b/cd3_automation_toolkit/Database/export_exa_vmclusters_nonGreenField.py
@@ -169,10 +169,11 @@ def export_exa_vmclusters(inputfile, outdir, service_dir, config, signer, ct, ex
                 # Tags filter
                 defined_tags = exa_infra.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/Database/export_mysql_configuration_nonGreenField.py b/cd3_automation_toolkit/Database/export_mysql_configuration_nonGreenField.py
@@ -123,10 +123,11 @@ def export_mysql_configuration(inputfile, outdir, service_dir, config, signer, c
                         # Tags filter
                         defined_tags = config_obj.defined_tags
                         tags_list = []
-                        for tkey, tval in defined_tags.items():
-                            for kk, vv in tval.items():
-                                tag = tkey + "." + kk + "=" + vv
-                                tags_list.append(tag)
+                        if defined_tags:
+                            for tkey, tval in defined_tags.items():
+                                for kk, vv in tval.items():
+                                    tag = tkey + "." + kk + "=" + vv
+                                    tags_list.append(tag)
 
                         if export_tags == []:
                             check = True

diff --git a/cd3_automation_toolkit/Database/export_mysql_db_nonGreenField.py b/cd3_automation_toolkit/Database/export_mysql_db_nonGreenField.py
@@ -236,10 +236,11 @@ def export_mysql_db(inputfile, outdir, service_dir, config, signer, ct, export_c
                 # Tags filter
                 defined_tags = mysql_db.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/DeveloperServices/OKE/export_oke_nonGreenField.py b/cd3_automation_toolkit/DeveloperServices/OKE/export_oke_nonGreenField.py
@@ -546,10 +546,11 @@ def export_oke(inputfile, outdir,service_dir, config, signer, ct, export_compart
                         # Tags filter
                         defined_tags = nodepool_info.defined_tags
                         tags_list = []
-                        for tkey, tval in defined_tags.items():
-                            for kk, vv in tval.items():
-                                tag = tkey + "." + kk + "=" + vv
-                                tags_list.append(tag)
+                        if defined_tags:
+                            for tkey, tval in defined_tags.items():
+                                for kk, vv in tval.items():
+                                    tag = tkey + "." + kk + "=" + vv
+                                    tags_list.append(tag)
 
                         if export_tags == []:
                             check = True

diff --git a/cd3_automation_toolkit/DeveloperServices/ResourceManager/create_resource_manager_stack.py b/cd3_automation_toolkit/DeveloperServices/ResourceManager/create_resource_manager_stack.py
@@ -346,7 +346,14 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
                 create_job_details.operation = "IMPORT_TF_STATE"
                 create_job_details.stack_id = stack_ocid
                 print("Uploading Terraform State file to Resource Manager for stack " + rm_name + "..............")
-                ocs_stack.create_job(create_job_details)
+                try:
+                    ocs_stack.create_job(create_job_details)
+                except Exception as e:
+                    print("\n")
+                    print(str(e))
+                    if ('Request Entity Too Large' in str(e)):
+                        print("\nError!!! Skipping state import for Resource Manager stack "+rm_name)
+                        pass
 
             rm_dir_zip = region_dir + '/' + prefix + '-' + region +'.zip'
             # Take a backup of zip file if it exists
@@ -458,7 +465,14 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
                     create_job_details.operation = "IMPORT_TF_STATE"
                     create_job_details.stack_id = stack_ocid
                     print("Uploading Terraform State file to Resource Manager for stack "+service_rm_name+"..............")
-                    ocs_stack.create_job(create_job_details)
+                    try:
+                        ocs_stack.create_job(create_job_details)
+                    except Exception as e:
+                        print("\n")
+                        print(str(e))
+                        if ('Request Entity Too Large' in str(e)):
+                            print("\nError!!! Skipping state import for Resource Manager stack " + service_rm_name)
+                            pass
 
                 shutil.rmtree(rm_dir + "/" + service_dir)
 

diff --git a/cd3_automation_toolkit/Governance/Quota/export_quotas_nonGreenField.py b/cd3_automation_toolkit/Governance/Quota/export_quotas_nonGreenField.py
@@ -85,10 +85,11 @@ def export_quotas_nongreenfield(inputfile, outdir, service_dir, config, signer,
             # Tags filter
             defined_tags = quota.defined_tags
             tags_list = []
-            for tkey, tval in defined_tags.items():
-                for kk, vv in tval.items():
-                    tag = tkey + "." + kk + "=" + vv
-                    tags_list.append(tag)
+            if defined_tags:
+                for tkey, tval in defined_tags.items():
+                    for kk, vv in tval.items():
+                        tag = tkey + "." + kk + "=" + vv
+                        tags_list.append(tag)
 
             if export_tags == []:
                 check = True

diff --git a/...it/ManagementServices/EventsAndNotifications/export_events_notifications_nonGreenField.py b/...it/ManagementServices/EventsAndNotifications/export_events_notifications_nonGreenField.py
@@ -234,10 +234,11 @@ def export_events(inputfile, outdir, service_dir, config, signer, ct,export_comp
                 # Tags filter
                 defined_tags = event_info.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/ManagementServices/Monitoring/export_alarms_nonGreenField.py b/cd3_automation_toolkit/ManagementServices/Monitoring/export_alarms_nonGreenField.py
@@ -134,10 +134,11 @@ def export_alarms(inputfile, outdir, service_dir, config, signer, ct, export_com
                 # Tags filter
                 defined_tags = alarm.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True

diff --git a/cd3_automation_toolkit/ManagementServices/ServiceConnectorHub/export_sch_nonGreenField.py b/cd3_automation_toolkit/ManagementServices/ServiceConnectorHub/export_sch_nonGreenField.py
@@ -43,10 +43,11 @@ def get_comp_details(comp_data):
         # Tags filter
         defined_tags = sch_details.data.defined_tags
         tags_list = []
-        for tkey, tval in defined_tags.items():
-            for kk, vv in tval.items():
-                tag = tkey + "." + kk + "=" + vv
-                tags_list.append(tag)
+        if defined_tags:
+            for tkey, tval in defined_tags.items():
+                for kk, vv in tval.items():
+                    tag = tkey + "." + kk + "=" + vv
+                    tags_list.append(tag)
 
         if export_tags == []:
             check = True

diff --git a/cd3_automation_toolkit/Network/BaseNetwork/exportNSG.py b/cd3_automation_toolkit/Network/BaseNetwork/exportNSG.py
@@ -218,10 +218,11 @@ def export_nsg(inputfile, outdir, service_dir,config,signer, ct, export_compartm
                 # Tags filter
                 defined_tags = vcn.defined_tags
                 tags_list = []
-                for tkey, tval in defined_tags.items():
-                    for kk, vv in tval.items():
-                        tag = tkey + "." + kk + "=" + vv
-                        tags_list.append(tag)
+                if defined_tags:
+                    for tkey, tval in defined_tags.items():
+                        for kk, vv in tval.items():
+                            tag = tkey + "." + kk + "=" + vv
+                            tags_list.append(tag)
 
                 if export_tags == []:
                     check = True
@@ -242,10 +243,11 @@ def export_nsg(inputfile, outdir, service_dir,config,signer, ct, export_compartm
                         # Tags filter
                         defined_tags = nsg.defined_tags
                         tags_list = []
-                        for tkey, tval in defined_tags.items():
-                            for kk, vv in tval.items():
-                                tag = tkey + "." + kk + "=" + vv
-                                tags_list.append(tag)
+                        if defined_tags:
+                            for tkey, tval in defined_tags.items():
+                                for kk, vv in tval.items():
+                                    tag = tkey + "." + kk + "=" + vv
+                                    tags_list.append(tag)
 
                         if export_tags == []:
                             check = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     <br>
-      [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2024.4.3) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries)
+      [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2025.1.2) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries)
     <br>
@@ Expand Down @@