Automation Toolkit Release v2024.2.2

bhlohumi · bhlohumi · commit 319bb483f906 · 2024-04-29T09:51:18.000+05:30
diff --git a/cd3_automation_toolkit/Governance/Tagging/templates/tags-defaults-template b/cd3_automation_toolkit/Governance/Tagging/templates/tags-defaults-template
@@ -22,7 +22,7 @@ tag_defaults = {
             compartment_id = "{{ tags.split('=')[1] }}"
             value = "{{ tags.split('=')[2] }}"
 
-            is_required =  {{ tags.split('=')[3] }} #}
+            is_required =  {{ tags.split('=')[3] }}
             },
     {% endfor %}
 
diff --git a/cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py b/cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py
@@ -300,8 +300,8 @@ def get_rpc_resources(source_region, SOURCE_RPC_LIST, dest_rpc_dict, rpc_source_
     dest_drg_rt_name = ""
     drg_rt_import_dist_name = ""
     dest_drg_rt_import_dist_name = ""
-    source_rpc_comp_name = ""
-    dest_rpc_comp_name = ""
+    source_drg_comp_name = ""
+    dest_drg_comp_name = ""
     dest_rpc_display_name = ""
     dest_import_rt_statements = None
     import_rt_statements = None
@@ -330,12 +330,13 @@ def get_comp_details(comp_data):
 
         # Check peering is alive
         if source_rpc_peer_id is not None and new_rpc.peering_status == "PEERED":
-            source_rpc_comp_name = get_comp_details(new_rpc.compartment_id)
             source_rpc_display_name = new_rpc.display_name
             source_rpc_drg_id = new_rpc.drg_id
             dest_rpc_id = new_rpc.peer_id
             dest_region = new_rpc.peer_region_name.split("-")[1]
             source_rpc_drg_name = getattr(rpc_source_client.get_drg(drg_id=source_rpc_drg_id).data, 'display_name')
+            source_drg_comp_name = get_comp_details(
+                getattr(rpc_source_client.get_drg(drg_id=source_rpc_drg_id).data, 'compartment_id'))
             rpc_tf_name = commonTools.check_tf_variable(new_rpc.display_name)
 
             # Fetch source attach list id
@@ -377,7 +378,7 @@ def get_comp_details(comp_data):
                                     remote_peering_connection_id=source_rpc_peer_id)
                                 dest_rpc_drg_id = dest_rpc.drg_id
                                 dest_rpc_drg_name = getattr(client.get_drg(drg_id=dest_rpc_drg_id).data, 'display_name')
-                                dest_rpc_comp_name = get_comp_details(dest_rpc.compartment_id)
+                                dest_drg_comp_name = get_comp_details(getattr(client.get_drg(drg_id=dest_rpc_drg_id).data, 'compartment_id'))
                                 dest_rpc_display_name = dest_rpc.display_name
                                 dest_drg_rpc_attachment_list = client.list_drg_attachments(
                                     compartment_id=dest_rpc_comp_id, attachment_type="REMOTE_PEERING_CONNECTION",
@@ -412,11 +413,11 @@ def get_comp_details(comp_data):
                             if col_header == 'Region':
                                 values_for_column[col_header].append(source_region)
                             elif col_header == 'Attached To':
-                                # Format is RPC::region::dest_rpc_comp_name::dest_rpc_drg_name
+                                # Format is RPC::region::dest_rpc_drg_name
                                 attach_to = "RPC::" + dest_region.lower() + "::" + dest_rpc_drg_name
                                 values_for_column[col_header].append(attach_to)
                             elif col_header == 'Compartment Name':
-                                values_for_column[col_header].append(source_rpc_comp_name)
+                                values_for_column[col_header].append(source_drg_comp_name)
                             elif col_header == 'RPC Display Name':
                                 values_for_column[col_header].append(source_rpc_display_name)
                             elif col_header == 'DRG Name':
@@ -461,11 +462,11 @@ def get_comp_details(comp_data):
                             if col_header == 'Region':
                                 values_for_column[col_header].append(dest_region.capitalize())
                             elif col_header == 'Attached To':
-                                # Format is RPC::region::dest_rpc_comp_name::dest_rpc_drg_name
+                                # Format is RPC::region::source_rpc_drg_name
                                 attach_to = "RPC::" + source_region.lower() + "::" + source_rpc_drg_name
                                 values_for_column[col_header].append(attach_to)
                             elif col_header == 'Compartment Name':
-                                values_for_column[col_header].append(dest_rpc_comp_name)
+                                values_for_column[col_header].append(dest_drg_comp_name)
                             elif col_header == 'RPC Display Name':
                                 values_for_column[col_header].append(dest_rpc_display_name)
                             elif col_header == 'DRG Name':
diff --git a/cd3_automation_toolkit/OCI_Regions b/cd3_automation_toolkit/OCI_Regions
@@ -1,5 +1,4 @@
 #Region:Region_Key
-saltlake:us-saltlake-2
 amsterdam:eu-amsterdam-1
 stockholm:eu-stockholm-1
 abudhabi:me-abudhabi-1
diff --git a/cd3_automation_toolkit/Storage/BlockVolume/templates/blockvolumes-template b/cd3_automation_toolkit/Storage/BlockVolume/templates/blockvolumes-template
@@ -71,7 +71,7 @@ blockvolumes = {
             {% endif %}
 
             {% if is_pv_encryption_in_transit_enabled %}
-            is_pv_encryption_in_transit_enabled = "{{ is_pv_encryption_in_transit_enabled }}"
+            is_pv_encryption_in_transit_enabled = {{ is_pv_encryption_in_transit_enabled }}
             {% endif %}
 
             {% if is_shareable %}
diff --git a/cd3_automation_toolkit/setUpOCI.py b/cd3_automation_toolkit/setUpOCI.py
@@ -1262,6 +1262,7 @@ def enable_cis_cloudguard(*args,**kwargs):
         region = input("Enter Reporting Region for Cloud Guard eg london: ")
     else:
         region = ct.cg_region
+    region = region.lower()
     options = [Option(None, Security.enable_cis_cloudguard, 'Enabling Cloud Guard')]
     execute_options(options, outdir, service_dir_cloud_guard, prefix, ct, region)
     # Update modified path list
diff --git a/cd3_automation_toolkit/user-scripts/createTenancyConfig.py b/cd3_automation_toolkit/user-scripts/createTenancyConfig.py
@@ -839,9 +839,26 @@ def create_bucket(config, signer):
     rewrite_backend.write(new_backend_data)
     rewrite_backend.close()
 
-    # Manage multiple outdir
+    # Manage single and multiple outdir
     if (outdir_structure_file == '' or outdir_structure_file == "\n"):
-        pass
+        #remove depends_on for single outdir
+        region_dir = terraform_files + "/" + region + "/"
+        single_outdir_config = configparser.RawConfigParser()
+        single_outdir_config.read("/cd3user/oci_tools/cd3_automation_toolkit/user-scripts/.outdir_structure_file.properties")
+        keys = []
+        for key, val in single_outdir_config.items("Default"):
+            keys.append(key)
+        for file in os.listdir(region_dir):
+            name=file.removesuffix(".tf")
+            if name in keys:
+                file=region_dir+"/"+file
+                with open(file, 'r+') as tf_file:
+                    module_data = tf_file.read().rstrip()
+                    module_data = module_data.replace("# depends_on", "depends_on")
+                tf_file.close()
+                f = open(file, "w+")
+                f.write(module_data)
+                f.close()
     else:
         region_dir = terraform_files + "/" + region + "/"
         for service, service_dir in outdir_config.items("Default"):
diff --git a/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf b/cd3_automation_toolkit/user-scripts/terraform/loadbalancer.tf
@@ -36,7 +36,7 @@ locals {
 }
 
 module "load-balancers" {
-  #  depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Load Balancer together
+  # depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Load Balancer together
   source   = "./modules/loadbalancer/lb-load-balancer"
   for_each = var.load_balancers != null ? var.load_balancers : {}
 
diff --git a/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf b/cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf
@@ -72,6 +72,7 @@ module "nlb-backend-sets" {
 
 module "nlb-backends" {
   source                   = "./modules/networkloadbalancer/nlb-backend"
+  # depends_on = [module.instances] # Uncomment to create Network and NLBs together
   for_each                 = var.nlb_backends != null ? var.nlb_backends : {}
   backend_set_name         = merge(module.nlb-backend-sets.*...)[each.value.backend_set_name]["nlb_backend_set_tf_name"]
   network_load_balancer_id = length(regexall("ocid1.loadbalancer.oc*", each.value.network_load_balancer_id)) > 0 ? each.value.network_load_balancer_id : merge(module.network-load-balancers.*...)[each.value.network_load_balancer_id]["network_load_balancer_tf_id"]
diff --git a/cd3_automation_toolkit/user-scripts/terraform/sddc.tf b/cd3_automation_toolkit/user-scripts/terraform/sddc.tf
@@ -52,14 +52,14 @@ data "oci_core_volumes" "ds_volumes" {
 
 
 data "oci_core_vcns" "oci_vcns_sddc" {
-  # depends_on = [module.vcns] # Uncomment to create Network and Instances together
+  # depends_on = [module.vcns] # Uncomment to create Network and SDDC together
   for_each       = var.sddcs != null ? var.sddcs : {}
   compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : var.compartment_ocids[each.value.network_compartment_id]
   display_name   = each.value.vcn_name
 }
 
 data "oci_core_subnets" "oci_subnets_sddc" {
-  # depends_on = [module.subnets] # Uncomment to create Network and Instances together
+  # depends_on = [module.subnets] # Uncomment to create Network and SDDC together
   for_each       = var.sddcs != null ? var.sddcs : {}
   compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : var.compartment_ocids[each.value.network_compartment_id]
   display_name   = each.value.provisioning_subnet_id
@@ -76,7 +76,7 @@ data "oci_core_vlans" "sddc_vlan_id" {
 
 
 module "sddcs" {
-  #depends_on = [module.vlans]
+  # depends_on = [module.vlans] # Uncomment to create Network and SDDC together
   source                      = "./modules/sddc"
   for_each                    = var.sddcs != null ? var.sddcs : {}
   compartment_id              = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
diff --git a/jenkins_install/tf-apply.groovy b/jenkins_install/tf-apply.groovy
@@ -216,6 +216,7 @@ pipeline {
                         } else {
                             try {
                                 sh '''
+                                    set +x
                                     mkdir -p ${WORKSPACE}/../${BUILD_NUMBER}
                                     cd ${WORKSPACE}/../${BUILD_NUMBER}
                                     git clone ${GIT_URL}
@@ -229,6 +230,8 @@ pipeline {
                                     git_status=`git status --porcelain`
                                     if [[ $git_status ]]; then
                                         git commit -m "commit for terraform-apply build - ${BUILD_NUMBER} for "${reg}"/"${service}
+                                        git config pull.rebase true
+                                        git pull --no-edit origin main
                                         git push origin main
                                     else
                                         echo "Nothing to commit"
diff --git a/jenkins_install/tf-destroy.groovy b/jenkins_install/tf-destroy.groovy
@@ -129,7 +129,6 @@ pipeline {
                                     cd "${env.Region}/${env.Service}"
                                     git pull --no-edit origin main
                                     rm -f *.tfvars
-                                    git rm *.tfvars
                                     git status
                                     git add --all .
                                 """

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#Region:Region_Key`
`2`		`-saltlake:us-saltlake-2`
`3`	`2`	`amsterdam:eu-amsterdam-1`
`4`	`3`	`stockholm:eu-stockholm-1`
`5`	`4`	`abudhabi:me-abudhabi-1`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ locals {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`module "load-balancers" {`
`39`		`- # depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Load Balancer together`
	`39`	`+ # depends_on = [module.vcns, module.subnets] # Uncomment to execute Networking and Load Balancer together`
`40`	`40`	`source = "./modules/loadbalancer/lb-load-balancer"`
`41`	`41`	`for_each = var.load_balancers != null ? var.load_balancers : {}`
`42`	`42`