Automation Toolkit Release v2024.2.1

Author: bhlohumi

cd3_automation_toolkit/Identity/Compartments/create_terraform_compartments.py

@@ -243,7 +243,7 @@ def travel(parent, keys, values, c):
         oname[reg].close()
         print(outfile[reg] + " for Compartments has been created for region " + reg)
 
-        fetch_comp_file = f'{outdir}/fetchcompinfo.safe'
+        fetch_comp_file = f'{outdir}/.safe/fetchcompinfo.safe'
         with open(fetch_comp_file, 'w') as f:
             f.write('run_fetch_script=1')
         f.close()

cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py

@@ -407,7 +407,7 @@ def get_comp_details(comp_data):
                                 importCommands_rpc["global"].write(
                                     "\nterraform import \"module.rpcs[\\\"" + rpc_tf_name + f"\\\"].oci_core_remote_peering_connection.{source_region.lower()}_{region.lower()}_accepter_rpc[\\\"region\\\"]\" " + str(
                                         dest_rpc_id))
-
+                        importCommands_rpc["global"].write("\nterraform plan")
                         for col_header in values_for_column:
                             if col_header == 'Region':
                                 values_for_column[col_header].append(source_region)

cd3_automation_toolkit/Network/Global/templates/rpc-root-terraform-template

@@ -8,8 +8,8 @@ module "rpcs" {
   source   = "../modules/rpc"
   for_each = var.drg_other_attachments
 
-  requester_compartment_id = each.value.requester_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.requester_compartment_id)) > 0 ? each.value.requester_compartment_id : var.compartment_ocids[each.value.requester_compartment_id]) : null
-  accepter_compartment_id  = each.value.accepter_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.accepter_compartment_id)) > 0 ? each.value.accepter_compartment_id : var.compartment_ocids[each.value.accepter_compartment_id]) : null
+  requester_compartment_id = each.value.requester_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.requester_compartment_id)) > 0 ? each.value.requester_compartment_id : var.compartment_ocids[each.value.requester_compartment_id]) : null
+  accepter_compartment_id  = each.value.accepter_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.accepter_compartment_id)) > 0 ? each.value.accepter_compartment_id : var.compartment_ocids[each.value.accepter_compartment_id]) : null
   display_name             = each.value.display_name
 
   #Requester

cd3_automation_toolkit/Release-Notes

@@ -5,8 +5,9 @@ Apr 30, 2024
 1. Download latest Excel Sheet using Jenkins.
 2. Docker Image upgrade to OL9 and upgrade of other softwares also.
 3. Dropdowns for Region and Compartment while running setUpOCI using Jenkins.
-4. Fix Image OCIDs for OCI Work VM deployment using RM stack.
-5. Review of existing terraform modules.
+4. Take out Security List from Network stack.
+5. Fix Image OCIDs for OCI Work VM deployment using RM stack.
+6. Review of existing terraform modules.
 
 -------------------------------------
 CD3 Automation Toolkit Tag v2024.2.0

cd3_automation_toolkit/user-scripts/terraform/adb.tf

@@ -8,7 +8,7 @@ data "oci_core_subnets" "oci_subnets_adb" {
   # depends_on = [module.subnets] # Uncomment to create Network and FSS together
   #for_each       = var.adb != null ? var.adb : {}
   for_each       = { for k, v in var.adb : k => v if v.vcn_name != null }
-  compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", 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]
+  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.subnet_id
   vcn_id         = data.oci_core_vcns.oci_vcns_adb[each.key].virtual_networks.*.id[0]
 }
@@ -17,7 +17,7 @@ data "oci_core_vcns" "oci_vcns_adb" {
   # depends_on = [module.vcns] # Uncomment to create Network and FSS together
   #for_each       = var.adb != null ? var.adb : {}
   for_each       = { for k, v in var.adb : k => v if v.vcn_name != null }
-  compartment_id = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", 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]
+  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
 }
 
@@ -27,7 +27,7 @@ module "adb" {
   # depends_on = [module.vcns, module.subnets]
   admin_password             = each.value.admin_password
   character_set              = each.value.character_set
-  compartment_id             = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
+  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
   cpu_core_count             = each.value.cpu_core_count
   database_edition           = each.value.database_edition
   data_storage_size_in_tbs   = each.value.data_storage_size_in_tbs
@@ -39,10 +39,10 @@ module "adb" {
   license_model              = each.value.license_model
   ncharacter_set             = each.value.ncharacter_set
   customer_contacts          = each.value.customer_contacts
-  network_compartment_id     = each.value.network_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.network_compartment_id)) > 0 ? each.value.network_compartment_id : var.compartment_ocids[each.value.network_compartment_id]) : null
+  network_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]) : null
   network_security_group_ids = each.value.nsg_ids
   freeform_tags              = each.value.freeform_tags
-  subnet_id                  = each.value.subnet_id != null ? (length(regexall("ocid1.subnet.oc1*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_subnets_adb[each.key].subnets.*.id[0]) : null
+  subnet_id                  = each.value.subnet_id != null ? (length(regexall("ocid1.subnet.oc*", each.value.subnet_id)) > 0 ? each.value.subnet_id : data.oci_core_subnets.oci_subnets_adb[each.key].subnets.*.id[0]) : null
   vcn_name                   = each.value.vcn_name != null ? each.value.vcn_name : null
   whitelisted_ips            = each.value.whitelisted_ips
 

cd3_automation_toolkit/user-scripts/terraform/block-volume.tf

@@ -8,7 +8,7 @@
 data "oci_core_instances" "instance" {
   depends_on = [module.instances]
   for_each       = var.blockvolumes != null ? var.blockvolumes : {}
-  compartment_id = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
+  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
   display_name   =  one(each.value.attach_to_instance)
   state = "RUNNING"
 }
@@ -18,10 +18,10 @@ module "block-volumes" {
   source             = "./modules/storage/block-volume"
   for_each           = var.blockvolumes != null ? var.blockvolumes : {}
   attachment_type    = each.value.attachment_type
-  attach_to_instance = each.value.attach_to_instance != null ? length(regexall("ocid1.instance.oc1*", each.value.attach_to_instance)) > 0 ? each.value.attach_to_instance : merge(module.instances.*...)[each.value.attach_to_instance]["instance_tf_id"] : null
+  attach_to_instance = each.value.attach_to_instance != null ? length(regexall("ocid1.instance.oc*", each.value.attach_to_instance)) > 0 ? each.value.attach_to_instance : merge(module.instances.*...)[each.value.attach_to_instance]["instance_tf_id"] : null
   #attach_to_instance  = length(each.value.attach_to_instance) > 0 ? [data.oci_core_instances.instance[each.value.display_name].instances[0].id] : []
   availability_domain      = each.value.availability_domain != "" && each.value.availability_domain != null ? data.oci_identity_availability_domains.availability_domains.availability_domains[each.value.availability_domain].name : null
-  compartment_id           = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : null
+  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
   vpus_per_gb              = each.value.vpus_per_gb != null ? each.value.vpus_per_gb : null
   device                   = each.value.device
   defined_tags             = each.value.defined_tags
@@ -31,7 +31,7 @@ module "block-volumes" {
   kms_key_id               = each.value.kms_key_id
   size_in_gbs              = each.value.size_in_gbs != null ? each.value.size_in_gbs : null
   block_tf_policy          = each.value.backup_policy != null ? each.value.backup_policy : null
-  policy_tf_compartment_id = each.value.policy_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.policy_compartment_id)) > 0 ? each.value.policy_compartment_id : var.compartment_ocids[each.value.policy_compartment_id]) : null
+  policy_tf_compartment_id = each.value.policy_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.policy_compartment_id)) > 0 ? each.value.policy_compartment_id : var.compartment_ocids[each.value.policy_compartment_id]) : null
 
 
   #Volume Attachment Optional Params

cd3_automation_toolkit/user-scripts/terraform/budget.tf

@@ -11,7 +11,7 @@ module "budgets" {
 
   #Required
   amount         = each.value.amount
-  compartment_id = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : var.tenancy_ocid
+  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]) : var.tenancy_ocid
   reset_period   = each.value.reset_period != null ? each.value.reset_period : "MONTHLY"
 
   #Optional
@@ -21,7 +21,7 @@ module "budgets" {
   defined_tags                          = each.value.defined_tags
   freeform_tags                         = each.value.freeform_tags
   processing_period_type                = each.value.processing_period_type
-  #target_compartment_id = each.value.target_compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.target_compartment_id)) > 0 ? each.value.target_compartment_id : var.compartment_ocids[each.value.target_compartment_id]) : null
+  #target_compartment_id = each.value.target_compartment_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.target_compartment_id)) > 0 ? each.value.target_compartment_id : var.compartment_ocids[each.value.target_compartment_id]) : null
   target_type = each.value.target_type
   targets     = each.value.targets != null ? [var.compartment_ocids[flatten([for targets in each.value.targets : targets])[0]]] : []
 
@@ -32,7 +32,7 @@ module "budget-alert-rules" {
   for_each = var.budget_alert_rules != null ? var.budget_alert_rules : {}
 
   #Required
-  budget_id      = each.value.budget_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.budget_id)) > 0 ? each.value.budget_id : merge(module.budgets.*...)[each.value.budget_id]["budget_tf_id"]) : null
+  budget_id      = each.value.budget_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.budget_id)) > 0 ? each.value.budget_id : merge(module.budgets.*...)[each.value.budget_id]["budget_tf_id"]) : null
   threshold      = each.value.threshold
   threshold_type = each.value.threshold_type
   type           = each.value.type

cd3_automation_toolkit/user-scripts/terraform/cloud-guard.tf

@@ -10,7 +10,7 @@ module "cloud-guard-configurations" {
   for_each = var.cloud_guard_configs != null ? var.cloud_guard_configs : {}
 
   #Required
-  compartment_id   = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : var.tenancy_ocid
+  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]) : var.tenancy_ocid
   reporting_region = each.value.reporting_region
   status           = each.value.status
 
@@ -25,9 +25,9 @@ module "cloud-guard-targets" {
   depends_on = [module.cloud-guard-configurations]
   #Required
   tenancy_ocid         = var.tenancy_ocid
-  compartment_id       = each.value.compartment_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.compartment_id)) > 0 ? each.value.compartment_id : var.compartment_ocids[each.value.compartment_id]) : var.tenancy_ocid
+  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]) : var.tenancy_ocid
   display_name         = each.value.display_name
-  target_resource_id   = each.value.target_resource_id != null ? (length(regexall("ocid1.compartment.oc1*", each.value.target_resource_id)) > 0 ? each.value.target_resource_id : var.compartment_ocids[each.value.target_resource_id]) : each.value.target_resource_id
+  target_resource_id   = each.value.target_resource_id != null ? (length(regexall("ocid1.compartment.oc*", each.value.target_resource_id)) > 0 ? each.value.target_resource_id : var.compartment_ocids[each.value.target_resource_id]) : each.value.target_resource_id
   target_resource_type = each.value.target_resource_type != null ? each.value.target_resource_type : "COMPARTMENT"
   prefix               = each.value.prefix