Development (#211)

Merging development to main for release 22.2.3

Author: abhijit-paranjpe

terraform/images/mp_image_ee_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.2.2-230527145254"
+tf_script_version        = "23.2.3-230702055451"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaao47acui7dt2il7gmre7wzx7nwas6srsmn76zxz77zlbby6rhkota"
+listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaalhdzj6vpns7uw7w3srh6qryi3sdnq36c4kovrn3c7t7ojuafff3q"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaahnvusjczw7sq22mzgtiqt7cgkpjnysmqv7xa5dpggzohmcopn3bq"
+ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"

terraform/images/mp_image_ee_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.2.2-230527145254"
+tf_script_version        = "23.2.3-230702055451"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaahnvusjczw7sq22mzgtiqt7cgkpjnysmqv7xa5dpggzohmcopn3bq"
+listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"

terraform/images/mp_image_se_byol.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.2.2-230527145254"
+tf_script_version        = "23.2.3-230702055451"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaal6xkggt2s4gr5zirxjjzsmzyiujooszh2coy5gk5u246jetdz7pq"
+listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaagdd4fc5bs5qynsv6oorwm7hwj7wbvishxxsizsspclckrvedf4va"

terraform/images/mp_image_suite_byol.tfvars

@@ -1,12 +1,12 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.2.2-230527145254"
+tf_script_version        = "23.2.3-230702055451"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaadcqxyhgkiipawuavpl43djren4nkiyfla3tm7p2tetqxz32bdylq"
+listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zp7hrszjgt2w5ffamt5zoc6gnbbhzpdregfcsqmumiwel5idqmq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaoom5clwv2yns46nvg5k72zsh2i663vofm4ew7vojvmulfubbka2q"
+ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"

terraform/images/mp_image_suite_ucm.tfvars

@@ -1,8 +1,8 @@
 # Copyright (c) 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-tf_script_version        = "23.2.2-230527145254"
+tf_script_version        = "23.2.3-230702055451"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaoom5clwv2yns46nvg5k72zsh2i663vofm4ew7vojvmulfubbka2q"
+listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"

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"

terraform/mp_variables.tf

@@ -11,7 +11,7 @@ variable "use_bastion_marketplace_image" {
 variable "bastion_image_id" {
   type        = string
   description = "The OCID of the marketplace bastion image"
-  default     = "ocid1.image.oc1..aaaaaaaaxqgskkr4lsp3gz3hx2umgneirwmdcp3fmnztgawmk5uszz4b4qja"
+  default     = "ocid1.image.oc1..aaaaaaaablqmvpn633emdv7o2k42km6nxjt4i44aqwab3wxwquyz3ag6hvmq"
 }
 
 variable "bastion_listing_id" {
@@ -23,7 +23,7 @@ variable "bastion_listing_id" {
 variable "bastion_listing_resource_version" {
   type        = string
   description = "The OCID of the marketplace bastion image listing resource version"
-  default     = "23.1.3-ol7.9-22.08.08-230323-1"
+  default     = "23.2.3-ol8.7-23.04.25-230702-1"
 }
 
 variable "use_marketplace_image" {

terraform/oci_images.tf

@@ -19,7 +19,7 @@ variable "marketplace_source_images" {
       compatible_shapes     = []
     }
     baselinux_instance_image = {
-      ocid                  = "ocid1.image.oc1..aaaaaaaaxqgskkr4lsp3gz3hx2umgneirwmdcp3fmnztgawmk5uszz4b4qja"
+      ocid                  = "ocid1.image.oc1..aaaaaaaablqmvpn633emdv7o2k42km6nxjt4i44aqwab3wxwquyz3ag6hvmq"
       is_pricing_associated = false
       compatible_shapes     = []
     }