Bug 35445029 - MAA: WLS for OCI requiring DB OCID for scale out (#209)

Author: Mahuwa-Barman

terraform/modules/compute/wls_compute/data_sources.tf

@@ -52,7 +52,7 @@ data "oci_database_autonomous_database" "atp_db" {
 }
 
 data "template_file" "atp_nsg_id" {
-  count    = local.is_atp_db ? 1 : 0
+  count    = local.is_atp_db && !local.is_db_deleted ? 1 : 0
   template = length(data.oci_database_autonomous_database.atp_db[0].nsg_ids) > 0 ? data.oci_database_autonomous_database.atp_db[0].nsg_ids[0] : ""
 }
 
@@ -76,6 +76,6 @@ data "oci_database_database" "ocidb_database" {
 }
 
 data "oci_database_db_home" "ocidb_db_home" {
-  count      = local.is_ocidb_system_id_available ? 1 : 0
+  count      = local.is_ocidb_system_id_available && !local.is_db_deleted ? 1 : 0
   db_home_id = data.oci_database_database.ocidb_database[0].db_home_id
 }

terraform/modules/compute/wls_compute/locals.tf

@@ -28,4 +28,6 @@ locals {
   db_options            = try(lookup(data.oci_database_db_systems.ocidb_db_systems[0].db_systems[0], "db_system_options", []), [])
   db_storage_management = try(lookup(local.db_options[0], "storage_management", "ASM"), "ASM")
 
+  is_db_deleted = local.apply_JRF ? (local.is_atp_db ? (data.oci_database_autonomous_database.atp_db[0].id == null ? true : false) : (data.oci_database_database.ocidb_database[0].id == null ? true : false)) : false
+
 }

terraform/modules/compute/wls_compute/wls_compute.tf

@@ -153,7 +153,7 @@ module "wls-instances" {
       atp_db_level          = var.jrf_parameters.atp_db_parameters.atp_db_level
       is_atp_dedicated      = local.is_atp_db ? lookup(data.oci_database_autonomous_database.atp_db[0], "is_dedicated") : false
       atp_private_end_point = element(coalescelist(data.oci_database_autonomous_database.atp_db.*.private_endpoint, [""]), 0)
-      atp_nsg_id            = local.is_atp_db ? data.template_file.atp_nsg_id[0].rendered : ""
+      atp_nsg_id            = local.is_atp_db && !local.is_db_deleted ? data.template_file.atp_nsg_id[0].rendered : ""
 
       # TODO: These variables are hardcoded to allow creating instances without app db. Remove them once app db code is removed from image
       is_atp_app_db       = "false"