Automation Toolkit Release v2025.1.3

Author: xs2suruchi

OCIWorkVMStack/scripts/installToolkit.sh

@@ -66,7 +66,7 @@ fi
 sudo podman --version >> $logfile 2>&1
 
 echo "***Download Toolkit***" >> $logfile 2>&1
-sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1
+sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1
 stop_exec
 
 curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json

cd3_automation_toolkit/Network/DNS/create_dns_rrsets.py

@@ -79,7 +79,8 @@ def create_terraform_dns_rrsets(inputfile, outdir, service_dir, prefix, ct):
         zone_name = str(df["Zone"][i]).strip()
         domain = str(df["Domain"][i]).strip()
         rtype = str(df["RType"][i]).strip()
-        if 'nan' in [view_name,zone_name,domain,rtype]:
+        values = [domain,rtype]
+        if not all(v == 'nan' for v in values) and 'nan' in values:
             print(f'Required parameters for record creation are missing. Skipping record creation for row : {i+3}')
             continue
         rrset_tf_name = str(view_name + "_" + zone_name+ "_" + domain+ "_" + rtype).replace(".", "_")

cd3_automation_toolkit/Network/DNS/export_dns_views_zones_records.py

@@ -19,7 +19,7 @@ def get_rrset(zone_data,dns_client,record_default):
     zone_records = oci.pagination.list_call_get_all_results(dns_client.get_zone_records,zone_data.id).data
 
     for zone_record in zone_records.items:
-        if record_default == 'n' and zone_record.is_protected == True:
+        if (record_default == 'n' and zone_record.is_protected == True) or zone_record.rtype in ["SOA","NS"]:
             continue
         tmpdict = {}
         domain = zone_record.domain
@@ -75,7 +75,7 @@ def print_data(region, ntk_compartment_name, rrset, zone_data, view_data, values
             values_for_column = commonTools.export_tags(view_data, col_header, values_for_column)
 
 
-def print_empty_view(region, ntk_compartment_name, view_data, values_for_column):
+def print_empty_view(region, ntk_compartment_name, view_data, values_for_column,zone_name=""):
     for col_header in values_for_column:
         if col_header == 'Region':
             values_for_column[col_header].append(region)
@@ -85,7 +85,7 @@ def print_empty_view(region, ntk_compartment_name, view_data, values_for_column)
             values_for_column[col_header].append(view_data.display_name)
 
         elif col_header == 'Zone':
-            values_for_column[col_header].append("")
+            values_for_column[col_header].append(zone_name)
         elif col_header == 'Domain':
             values_for_column[col_header].append("")
         elif col_header == 'RType':
@@ -214,12 +214,15 @@ def export_dns_views_zones_rrsets(inputfile, outdir, service_dir, config, signer
                         if rrsets:
                             for rrset in rrsets.values():
                                 print_data(region, ntk_compartment_name, rrset, zone_data, view_data, values_for_column,state)
-                            tf_resource = f'module.dns-zones[\\"{zone_tf_name}\\"].oci_dns_zone.zone'
-                            if tf_resource not in state["resources"]:
-                                importCommands[region.lower()] += f'\n{tf_or_tofu} import "{tf_resource}" {str(zone_data.id)}'
 
                         else:
-                            print_empty_view(region, ntk_compartment_name, view_data, values_for_column)
+                            print_empty_view(region, ntk_compartment_name, view_data, values_for_column,zone_name=zone_data.name)
+
+                        tf_resource = f'module.dns-zones[\\"{zone_tf_name}\\"].oci_dns_zone.zone'
+                        if tf_resource not in state["resources"]:
+                            importCommands[
+                                region.lower()] += f'\n{tf_or_tofu} import "{tf_resource}" {str(zone_data.id)}'
+
                 else:
                     print_empty_view(region, ntk_compartment_name, view_data, values_for_column)
                 if print_zone==False: