From a41ddb07e0b6bb156f493b189afd178cee96073f Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:27:23 -0700
Subject: [PATCH 01/15] Fix the jira 13945 (#216)

Fix the connection string provisioning issues

1. Created JRF instance with rac database without providing db
connecting string.
2. Created JRF instance with rac database with providing db connect
string.
---
 terraform/modules/compute/wls_compute/locals.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/modules/compute/wls_compute/locals.tf b/terraform/modules/compute/wls_compute/locals.tf
index 1edb85ae..d73dd0db 100644
--- a/terraform/modules/compute/wls_compute/locals.tf
+++ b/terraform/modules/compute/wls_compute/locals.tf
@@ -28,6 +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
+  is_db_deleted = local.apply_JRF ? (local.is_atp_db ? (try(data.oci_database_autonomous_database.atp_db[0].id, null) == null ? true : false) : (try(data.oci_database_database.ocidb_database[0].id, null) == null ? true : false)) : false
 
-}
\ No newline at end of file
+}

From 46c4c456a10f44afd4a20aef0e61a4594858f790 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Wed, 23 Aug 2023 19:11:49 -0700
Subject: [PATCH 02/15] Fix bug Certificate on LB is reset in scaling operation
 (#219)

Fixed bug Certificate on LB is reset in scaling operation.
Test
-----

    Create a single VM instance with load balancer.
    Create a new certificate to the load balancer.
Note that you can generate a keypair from any OCI compute instance with
'openssl req -new -sha256 -newkey rsa:2048 -nodes -keyout testssl.key
-x509 -days 365 -out testssl.crt'
Note that you'll need to add both the certificate and private key pems
that are generated to the certificate.
Associate the certificate you added to the listener for the load
balancer.
Delete the demo certificate that was generated by the Stack from the
load balancer.
    Edit the stack and add a node.
    Make sure that new certificate is assigned to the listener.
    Demo certificate will be recreated but not assigned to any.

The certificate created and added by a customer is not reset, but will
still restore the cert created by terraform if it is deleted.
---
 terraform/modules/lb/backends/lb_backends.tf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terraform/modules/lb/backends/lb_backends.tf b/terraform/modules/lb/backends/lb_backends.tf
index 232cdb31..939ae35d 100644
--- a/terraform/modules/lb/backends/lb_backends.tf
+++ b/terraform/modules/lb/backends/lb_backends.tf
@@ -44,6 +44,10 @@ resource "oci_load_balancer_listener" "wls_lb_listener_https" {
     certificate_name        = oci_load_balancer_certificate.demo_certificate[count.index].certificate_name
     verify_peer_certificate = false
   }
+
+  lifecycle {
+    ignore_changes = [ssl_configuration]
+  }
 }
 
 resource "oci_load_balancer_backend" "wls_lb_backend" {

From c1a5cd919664b607cbd086c1b3af6dac5cbb9a4d Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Tue, 29 Aug 2023 15:28:34 -0700
Subject: [PATCH 03/15] Uptake 23.3.2 values. (#220)

Uptake 23.3.2 marketplace values.
---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index 0d5d6ca8..24f376c2 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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.3.1-230719124253"
+tf_script_version        = "23.3.2-230828162145"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaq5nae6poqifz72opkiuld4bprckwnqjtd5iafto5co5od3jubswq"
+listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa2gzo2p5vx6m3lhrybvvacbk2zmegxt5jcq55zlwleymdmp2xbopa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"
+ucm_listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaasog76b3c6bpzvhliybfv54tqdf7vg3hxhflabww2jly6fmksi6pa"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index 6a09e25b..c237bc76 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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.3.1-230719124253"
+tf_script_version        = "23.3.2-230828162145"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"
+listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaasog76b3c6bpzvhliybfv54tqdf7vg3hxhflabww2jly6fmksi6pa"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index 22972d3a..fae38efd 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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.3.1-230719124253"
+tf_script_version        = "23.3.2-230828162145"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaqlzjmwtm3cz3ejafzmf5fvi7jxrui7gn3odec7vb572hmbv7cuua"
+listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa3idbabur4bu7bvwejkc77nqepdmm2efbul57vfgslfjsrdhgmmiq"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index e8390091..607de3ed 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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.3.1-230719124253"
+tf_script_version        = "23.3.2-230828162145"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaau7dmjm42neorefkgt6f7q7h2lddi2x5vld43l7eqr4f5ljt5y7sq"
+listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaasqf2gopuuhxxsfywp7h7s3gj3shcckkjrycfgmqm63gneezrifca"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"
+ucm_listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaqeitdjhtc6rduioyhfhq7hb3kiappgdcoqcgug6oy4xzwkiohjia"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index 09583351..32e5ec7b 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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.3.1-230719124253"
+tf_script_version        = "23.3.2-230828162145"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"
+listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaqeitdjhtc6rduioyhfhq7hb3kiappgdcoqcgug6oy4xzwkiohjia"

From 4b0d953506750b41f72d027f76eee37e10d7f6b5 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:21:19 -0700
Subject: [PATCH 04/15] Topic sk jcs 14015 (#222)

Implement -
[JCS-14015](https://jira.oraclecorp.com/jira/browse/JCS-14015) - Bug -
load-balancer policy required for instance creation

Created provisioning instance without load balancer and non admin user.
Created provisioning instance with load balancer and non admin user.

---------

Co-authored-by: Abhijit Paranjpe <109541284+abhijit-paranjpe@users.noreply.github.com>
---
 terraform/locals.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/locals.tf b/terraform/locals.tf
index 43e1bb71..d7502c13 100644
--- a/terraform/locals.tf
+++ b/terraform/locals.tf
@@ -72,7 +72,7 @@ locals {
   new_lb_ip                  = !local.add_load_balancer || local.use_existing_lb ? "" : element(coalescelist(module.load-balancer[0].wls_loadbalancer_ip_addresses, [""]), 0)
   new_lb_id                  = element(concat(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)
   existing_lb_ip             = local.use_existing_lb && local.valid_existing_lb ? local.existing_lb_object_as_list[0].ip_addresses[0] : ""
-  existing_lb_object_as_list = [for lb in data.oci_load_balancer_load_balancers.existing_load_balancers_data_source.load_balancers[*] : lb if lb.id == var.existing_load_balancer_id]
+  existing_lb_object_as_list = local.use_existing_lb ? [for lb in data.oci_load_balancer_load_balancers.existing_load_balancers_data_source.load_balancers[*] : lb if lb.id == var.existing_load_balancer_id] : []
   valid_existing_lb          = length(local.existing_lb_object_as_list) == 1
   use_existing_lb            = local.add_load_balancer && var.existing_load_balancer_id != ""
   lb_backendset_name         = local.use_existing_lb ? var.backendset_name_for_existing_load_balancer : "${local.service_name_prefix}-lb-backendset"

From 25666e2d7c911f56298ab3de9754a0073c3a5867 Mon Sep 17 00:00:00 2001
From: telake <tim.lake@oracle.com>
Date: Mon, 25 Sep 2023 20:14:12 -0700
Subject: [PATCH 05/15] JCS-14035 - Fail to get password expiry date when using
 connect string (#225)

Bug - Fail to get password expiry date for OPSS user when using connect
string

Note that since the DB service name is not guaranteed to include the PDB
name ( I proved this by using a connect string w/o the PDB name in it to
successfully create a WLS for OCI instance). Therefore, the PDB name
must be asked for.

Also note that the validation change added will not be executed, but to
limit the scope of the changes I updated the validation only and didn't
try to also add in the validator. I suspect that the validation was
never added in order to ensure that 11g databases, which don't have a
PDB can be allowed.

Tested that when setting a connect string the error occurred. After the
fix, with PDB name provided, the error did not occur.
---
 .../modules/validators/oci_db_validators.tf   |  2 +-
 terraform/schema.yaml                         | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/terraform/modules/validators/oci_db_validators.tf b/terraform/modules/validators/oci_db_validators.tf
index 0869e2f1..3ba8aad4 100644
--- a/terraform/modules/validators/oci_db_validators.tf
+++ b/terraform/modules/validators/oci_db_validators.tf
@@ -18,7 +18,7 @@ locals {
   missing_oci_db_compartment_id = (var.is_oci_db && !local.has_oci_db_compartment_id)
   missing_oci_db_database_id    = (var.is_oci_db && !local.has_oci_db_database_id)
 
-  missing_oci_db_pdb_service_name = (var.is_oci_db && !local.has_oci_db_pdb_service_name)
+  missing_oci_db_pdb_service_name = (var.is_oci_db || var.oci_db_connection_string != "") && !local.has_oci_db_pdb_service_name
 
   missing_oci_db_vcn_id = (var.is_oci_db && var.oci_db_existing_vcn_id == "")
 
diff --git a/terraform/schema.yaml b/terraform/schema.yaml
index 05d40b72..804f3e3e 100644
--- a/terraform/schema.yaml
+++ b/terraform/schema.yaml
@@ -50,6 +50,7 @@ groupings:
       - ${atp_db_password_id}
       - ${atp_db_level}
       - ${use_oci_db_connection_string}
+      - ${oci_db_connection_string}
       - ${oci_db_compartment_id}
       - ${oci_db_dbsystem_id}
       - ${oci_db_network_compartment_id}
@@ -58,7 +59,6 @@ groupings:
       - ${oci_db_dbhome_major_version}
       - ${oci_db_database_id}
       - ${oci_db_pdb_service_name}
-      - ${oci_db_connection_string}
       - ${oci_db_user}
       - ${oci_db_secret_compartment_id}
       - ${oci_db_password_id}
@@ -1853,18 +1853,13 @@ variables:
         - ${orm_create_mode}
         - ${add_JRF}
         - and:
-            - or:
-                - ${create_new_vcn}
-                - not:
-                    - ${use_oci_db_connection_string}
-            - and:
-                - not:
-                    - eq:
-                        - ${oci_db_dbhome_major_version}
-                        - "11"
+            - not:
                 - eq:
-                    - ${db_strategy}
-                    - "Database System"
+                    - ${oci_db_dbhome_major_version}
+                    - "11"
+            - eq:
+                - ${db_strategy}
+                - "Database System"
 
     type: string
     required: true

From b70ef3033df032fc563c5df967f6af6af1221f5f Mon Sep 17 00:00:00 2001
From: telake <tim.lake@oracle.com>
Date: Mon, 25 Sep 2023 20:14:24 -0700
Subject: [PATCH 06/15] JCS-13959 - validate_vcn_cidr.py always returning
 errors in bootstrap (#224)

validate_vcn_cidr.py always returning errors in bootstrap log due to
wls_vcn_cidr being empty with existing subnets.

Note that this is essentially a revert to the previous commit. The
checkin log for the commit states, "Use customer provided NSGs for
existing subnet provisioning". Therefore, I tested with existing subnet
and NSGs provided with the reversion of this line change and there were
no issues. Other tests in addition to existing subnet with NSGs
provided:
1. New VCN.
2. Existing VCN, new subnet
3. Existing subnet with security rules. In each case I tested with IDCS
added so the call to validate_vcn_cidr.py would occur. I not only made
sure the error no longer appeared, but verified that the metadata value
was present and ran validate_vcn_cidr.py by hand.
---
 terraform/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index bafff56c..16f99af5 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -615,7 +615,7 @@ module "compute" {
   wls_vcn_peering_route_table_attachment_id = local.assign_weblogic_public_ip ? element(flatten(concat(module.vcn-peering[*].wls_vcn_public_route_table_attachment_id, [""])), 0) : element(flatten(concat(module.vcn-peering[*].wls_vcn_private_route_table_attachment_id, [""])), 0)
 
   mount_vcn_id                  = var.mount_target_id != "" ? data.oci_core_subnet.mount_target_existing_subnet[0].vcn_id : ""
-  wls_vcn_cidr                  = var.wls_vcn_cidr != "" ? var.wls_vcn_cidr : element(concat(module.network-vcn.*.vcn_cidr, tolist([""])), 0)
+  wls_vcn_cidr                  = var.wls_vcn_cidr != "" ? var.wls_vcn_cidr : data.oci_core_vcn.wls_vcn[0].cidr_block
   wls_version                   = var.wls_version
   wls_edition                   = var.wls_edition
   allow_manual_domain_extension = var.allow_manual_domain_extension

From 1fd4172fae2cf9869e9966bf7a1f26403c0632cd Mon Sep 17 00:00:00 2001
From: telake <tim.lake@oracle.com>
Date: Mon, 25 Sep 2023 20:15:10 -0700
Subject: [PATCH 07/15] JCS-14038 - Missing OSMS agent required dynamic-group
 policies (#223)

Verified issue by creating stack in a compartment without dynamic group
policies set and selecting OCI Policies checkbox. Clicked on
Instances|Instance Details and navigate to the OS Management and saw:
"No OS management information is available for this resource."
After fix ran same test and OS Managment information appears.
---
 terraform/modules/policies/locals.tf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/terraform/modules/policies/locals.tf b/terraform/modules/policies/locals.tf
index f30cad62..d21ca739 100644
--- a/terraform/modules/policies/locals.tf
+++ b/terraform/modules/policies/locals.tf
@@ -15,6 +15,9 @@ locals {
   core_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use instances in compartment id ${var.compartment_id}"
   core_policy_statement2 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage volumes in compartment id ${var.compartment_id}"
   core_policy_statement3 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage volume-attachments in compartment id ${var.compartment_id}"
+  # These policy statements are required to register Compute instances with the OS Management service
+  osms_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to read instance-family in compartment id ${var.compartment_id}"
+  osms_policy_statement2 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use osms-managed-instances in compartment id ${var.compartment_id}"
   # This policy with "inspect virtual-network-family" verb is needed to read VCN information like CIDR, etc, for VCN validation
   network_policy_statement1 = var.network_compartment_id != "" ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to inspect virtual-network-family in compartment id ${var.network_compartment_id}" : ""
   secrets_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to read secret-bundles in tenancy where target.secret.id = '${var.wls_admin_password_id}'"
@@ -35,7 +38,7 @@ locals {
   apm_domain_policy_statement = var.use_apm_service ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use apm-domains in compartment id ${var.apm_domain_compartment_id}" : ""
   # This policy with "use load_balancer" verb is needed to create load balancer for new vcn
   lb_policy_statement = var.add_load_balancer ? length(oci_identity_dynamic_group.wlsc_instance_principal_group) > 0 ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use load-balancers in compartment id ${var.network_compartment_id}" : "" : ""
-  service_statements = compact([local.core_policy_statement1, local.core_policy_statement2, local.core_policy_statement3, local.network_policy_statement1, local.secrets_policy_statement1, local.secrets_policy_statement2,
+  service_statements = compact([local.core_policy_statement1, local.core_policy_statement2, local.core_policy_statement3, local.osms_policy_statement1, local.osms_policy_statement2, local.network_policy_statement1, local.secrets_policy_statement1, local.secrets_policy_statement2,
     local.atp_policy_statement1, local.atp_policy_statement2, local.atp_policy_statement3, local.oci_db_policy_statement1, local.oci_db_policy_statement2, local.oci_db_policy_statement3, local.logging_policy,
     local.apm_domain_policy_statement, local.lb_policy_statement
   ])

From c2aabe83ffa3d5c6231dc4e69574eed40c4ef5bb Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Thu, 28 Sep 2023 07:31:22 -0700
Subject: [PATCH 08/15] Topic sk uptake mp 23.3.3 (#226)

Uptake 23.3.3 release image values.

---------

Co-authored-by: Abhijit Paranjpe <109541284+abhijit-paranjpe@users.noreply.github.com>
---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index 24f376c2..f6f759b9 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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.3.2-230828162145"
+tf_script_version        = "23.3.3-230927160037"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa2gzo2p5vx6m3lhrybvvacbk2zmegxt5jcq55zlwleymdmp2xbopa"
+listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaabap7xdx4ngetamhlehbfvezeuqjq6xnp6mlxhu3653z3fkjauuqa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaasog76b3c6bpzvhliybfv54tqdf7vg3hxhflabww2jly6fmksi6pa"
+ucm_listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaqpw5hpslmzsclilzx37lmd5kiknujgb5vf67sjdyo5ipekmtbdoq"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index c237bc76..50cf157b 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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.3.2-230828162145"
+tf_script_version        = "23.3.3-230927160037"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaasog76b3c6bpzvhliybfv54tqdf7vg3hxhflabww2jly6fmksi6pa"
+listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaqpw5hpslmzsclilzx37lmd5kiknujgb5vf67sjdyo5ipekmtbdoq"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index fae38efd..33656425 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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.3.2-230828162145"
+tf_script_version        = "23.3.3-230927160037"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa3idbabur4bu7bvwejkc77nqepdmm2efbul57vfgslfjsrdhgmmiq"
+listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa3gpg6zmkdleztkbimjski2ucfgdla4wyjdvgdam36j7ebbwt7kqq"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index 607de3ed..a7817e73 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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.3.2-230828162145"
+tf_script_version        = "23.3.3-230927160037"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaasqf2gopuuhxxsfywp7h7s3gj3shcckkjrycfgmqm63gneezrifca"
+listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaafvozp7qev5ebyd4a3vdwg7k3qalxo6ysi3mmyihoxu7lyo4lxuza"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaqeitdjhtc6rduioyhfhq7hb3kiappgdcoqcgug6oy4xzwkiohjia"
+ucm_listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaksiktyxk7kqcw54klhfrhik3fxm2xtq5uvpu7xx7cm4ml5h7h7nq"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index 32e5ec7b..c7c66145 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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.3.2-230828162145"
+tf_script_version        = "23.3.3-230927160037"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.3.2-ol8.7-23.04.25-230828-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaqeitdjhtc6rduioyhfhq7hb3kiappgdcoqcgug6oy4xzwkiohjia"
+listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaksiktyxk7kqcw54klhfrhik3fxm2xtq5uvpu7xx7cm4ml5h7h7nq"

From f187ef53b371aefbf95fa6e4530e05c1dc0d5240 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:46:18 -0700
Subject: [PATCH 09/15] Topic sk uptake mp 23.4.1 (#228)

---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index f6f759b9..c75dd699 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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.3.3-230927160037"
+tf_script_version        = "23.4.1-231018231905"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaabap7xdx4ngetamhlehbfvezeuqjq6xnp6mlxhu3653z3fkjauuqa"
+listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaax4pfhhb2qhinklrkrnmjrqqbvvis72b5mod4yohz6m7yviejq7rq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaqpw5hpslmzsclilzx37lmd5kiknujgb5vf67sjdyo5ipekmtbdoq"
+ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index 6b9d6bf5..965b58f0 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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.3.3-230927160037"
+tf_script_version        = "23.4.1-231018231905"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaqpw5hpslmzsclilzx37lmd5kiknujgb5vf67sjdyo5ipekmtbdoq"
\ No newline at end of file
+listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index 33656425..71b4721e 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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.3.3-230927160037"
+tf_script_version        = "23.4.1-231018231905"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa3gpg6zmkdleztkbimjski2ucfgdla4wyjdvgdam36j7ebbwt7kqq"
+listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaazcjnpfj43scz2d6e3fxzkbcxtr3fnqeaymn2erq46jmvzhpqdzya"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index bc177e16..a947d449 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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.3.3-230927160037"
+tf_script_version        = "23.4.1-231018231905"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaafvozp7qev5ebyd4a3vdwg7k3qalxo6ysi3mmyihoxu7lyo4lxuza"
+listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaainafum2ncqjoyuwvfbl4vi6fnfutueuinn3g2mgvfzgquk6xqjkq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaksiktyxk7kqcw54klhfrhik3fxm2xtq5uvpu7xx7cm4ml5h7h7nq"
\ No newline at end of file
+ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index c7c66145..aefca5c0 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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.3.3-230927160037"
+tf_script_version        = "23.4.1-231018231905"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.3.3-ol8.7-23.04.25-230927-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaksiktyxk7kqcw54klhfrhik3fxm2xtq5uvpu7xx7cm4ml5h7h7nq"
+listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"

From 58251b3f1d08b1870ce4135595fa951aca4e95d5 Mon Sep 17 00:00:00 2001
From: telake <tim.lake@oracle.com>
Date: Mon, 30 Oct 2023 11:00:05 -0700
Subject: [PATCH 10/15] JCS-14046 Support VM.Standard.E5.Flex shape, but not as
 default shape. (#230)

JCS-14046 Support VM.Standard.E5.Flex shape, but not as default shape.
Testing using E5.Flex shape (requires OL8.8 image):
- 14.1.1.0 JDK11 with IDCS. idcs-sample-app logged into.
- 12.2.1.4 JRF on ATP with IDCS (2 OCPU count). idcs-sample-app logged
into.
- 14.1.1.0 JDK8 with IDCS validated cloning.

Testing max cpu utilization (E5.Flex allows 94 ocpu max):
- Using same logic changes in this MR built stack with:
-- max OCPUs for Flex5 to 1
-- max OCPUs for Flex4 to 2
-- Set 2 OCPUs for Flex 5 and ran tf plan. Confirmed validation error
fired.
-- Set 3 OCPUs for Flex 4 and ran tf plan. Confirmed validation error
fired. This shows no regression in the logic changes.
---
 terraform/modules/compute/wls_compute/validators.tf | 4 ++--
 terraform/schema.yaml                               | 7 +++++--
 terraform/schema_14110.yaml                         | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/terraform/modules/compute/wls_compute/validators.tf b/terraform/modules/compute/wls_compute/validators.tf
index 1be55ec0..231b6292 100644
--- a/terraform/modules/compute/wls_compute/validators.tf
+++ b/terraform/modules/compute/wls_compute/validators.tf
@@ -7,12 +7,12 @@ locals {
     #Dummy map to trigger an error in case we detect a validation error.
   }
   is_std_flex_shape                  = var.instance_shape.instanceShape == "VM.Standard.E3.Flex" || var.instance_shape.instanceShape == "VM.Standard.E4.Flex" || var.instance_shape.instanceShape == "VM.Standard3.Flex"
-  invalid_ocpu_count_standard_shape  = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : false
+  invalid_ocpu_count_standard_shape  = local.is_std_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 64) : var.instance_shape.instanceShape == "VM.Standard.E5.Flex" ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 94) : false
   is_optimized_flex_shape            = var.instance_shape.instanceShape == "VM.Optimized3.Flex"
   invalid_ocpu_count_optimized_shape = local.is_optimized_flex_shape ? (var.instance_shape.ocpus < 1 || var.instance_shape.ocpus > 18) : false
 
   #Flex shape validations
-  invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shape [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus."
+  invalid_standard_flex_shape_ocpus_msg = "WLSC-ERROR: The standard flex instance shapes [ VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard3.Flex ] support maximum 64 ocpus and VM.Standard.E5.Flex supports a maximum of 94 ocpus."
   validate_standard_flex_shape_ocpus    = local.invalid_ocpu_count_standard_shape ? local.validators_msg_map[local.invalid_standard_flex_shape_ocpus_msg] : null
 
   invalid_optimized_flex_shape_ocpus_msg = "WLSC-ERROR: The VM.Optimized3.Flex instance shape supports maximum 18 ocpus."
diff --git a/terraform/schema.yaml b/terraform/schema.yaml
index 804f3e3e..697c4e47 100644
--- a/terraform/schema.yaml
+++ b/terraform/schema.yaml
@@ -394,9 +394,9 @@ variables:
   wls_ocpu_count:
     type: integer
     title: "OCPU Count"
-    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
+    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
     minimum: 1
-    maximum: 64
+    maximum: 94
     multipleOf: 1
     default: 1
     required: true
@@ -410,6 +410,9 @@ variables:
         - eq:
           - ${instance_shape}
           - "VM.Standard.E4.Flex"
+        - eq:
+          - ${instance_shape}
+          - "VM.Standard.E5.Flex"
         - eq:
           - ${instance_shape}
           - "VM.Optimized3.Flex"
diff --git a/terraform/schema_14110.yaml b/terraform/schema_14110.yaml
index 85723255..38d64823 100644
--- a/terraform/schema_14110.yaml
+++ b/terraform/schema_14110.yaml
@@ -392,9 +392,9 @@ variables:
   wls_ocpu_count:
     type: integer
     title: "OCPU Count"
-    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64 while VM.Optimized3.Flex shape supports maximum of 18 ocpus. When scaled-out, the changes in OCPU count will apply only to the added nodes."
+    description: "The number of OCPU count for instances. Only required for VM.Standard.E3.Flex, VM.Standard.E4.Flex, VM.Standard.E5.Flex, VM.Optimized3.Flex, and  VM.Standard3.Flex Shapes. The maximum number of ocpus for VM.Standard.E3.Flex and VM.Standard.E4.Flex is 64, for VM.Standard.E5.Flex is 94, while VM.Optimized3.Flex shape supports 18. When scaled-out, the changes in OCPU count will apply only to the added nodes."
     minimum: 1
-    maximum: 64
+    maximum: 94
     multipleOf: 1
     default: 1
     required: true
@@ -408,6 +408,9 @@ variables:
         - eq:
           - ${instance_shape}
           - "VM.Standard.E4.Flex"
+        - eq:
+          - ${instance_shape}
+          - "VM.Standard.E5.Flex"
         - eq:
           - ${instance_shape}
           - "VM.Optimized3.Flex"

From 12b2a7d772293bb33f405f26f0ce8e9b5c14d522 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Fri, 1 Dec 2023 12:02:03 -0800
Subject: [PATCH 11/15] Topic sk uptake mp 23.4.3 (#231)

Uptake marketplace image values into 23.4.3 reelase
---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index 36093308..85bd8a91 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaax4pfhhb2qhinklrkrnmjrqqbvvis72b5mod4yohz6m7yviejq7rq"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaatomkczyox3g5pnw4oquxijcl7urcmp6s4ozmthj62h727ec7uevq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
\ No newline at end of file
+ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"
\ No newline at end of file
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index 10f92520..b9f6d148 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaxi4ebsy4sndydzpp6epprpbuhjz7dv3ynad5h3kaklrkrvzv6czq"
\ No newline at end of file
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index 71b4721e..727e8330 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazcjnpfj43scz2d6e3fxzkbcxtr3fnqeaymn2erq46jmvzhpqdzya"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa6mhaqaxk5t7xwagusc36hnoimhkqqlihvcho2ndlx2onj67u2juq"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index 3c70110d..f634411b 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaainafum2ncqjoyuwvfbl4vi6fnfutueuinn3g2mgvfzgquk6xqjkq"
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa22tkmyuks4hfntwc3gpsdq5dnnkmlesvj6nlaxmhb6mw2jvlx2oq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
\ No newline at end of file
+ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index 2ae14e1d..aa79e87b 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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.4.1-231018231905"
+tf_script_version        = "23.4.3-231130202436"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.4.1-ol8.7-23.04.25-231018-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaea6mqnsna4wnjmy7dcz32a5kolit6jvgwgvjwrrke642oeji6e7a"
\ No newline at end of file
+listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"
\ No newline at end of file

From 687f61b7684f92f66037b14a92ccddebec0619e0 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Thu, 18 Jan 2024 11:54:06 -0800
Subject: [PATCH 12/15] Uptake 24.1.1 mp values. (#233)

Uptake 24.1.1 marketplace values..
---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index 85bd8a91..13c74fe0 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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.4.3-231130202436"
+tf_script_version        = "24.1.1-240117210740"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaatomkczyox3g5pnw4oquxijcl7urcmp6s4ozmthj62h727ec7uevq"
+listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaagthrvz4ul6c5quok25hd2wtmsvyqx3preitjb63e7dxgopsez4aq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"
\ No newline at end of file
+ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index b9f6d148..b28f99e0 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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.4.3-231130202436"
+tf_script_version        = "24.1.1-240117210740"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zuvippliu4zusl4ssnsbwrw5sn7toaj62y4p4obsn54wkmtsuuq"
+listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index 727e8330..6c0c7492 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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.4.3-231130202436"
+tf_script_version        = "24.1.1-240117210740"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa6mhaqaxk5t7xwagusc36hnoimhkqqlihvcho2ndlx2onj67u2juq"
+listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaatl3dybgmy6l3wqyaxprl22rvctqnkn5uixjsmfc2rbpian35pvjq"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index f634411b..0c6dc4f0 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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.4.3-231130202436"
+tf_script_version        = "24.1.1-240117210740"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa22tkmyuks4hfntwc3gpsdq5dnnkmlesvj6nlaxmhb6mw2jvlx2oq"
+listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaczn55djd6qih54sxpsn5ve7yloahczmnb7w2d7gadaagu6d44kwa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"
+ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index aa79e87b..be40a1ab 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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.4.3-231130202436"
+tf_script_version        = "24.1.1-240117210740"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.4.3-ol8.8-23.09.26-231130-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaac4hb7q5h2i7qqpsbdyhzytaigli52qyk4mtrv5eo3d3zjb6rkjkq"
\ No newline at end of file
+listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"

From 24871e3fead8aa63bf84b3e76152badef641e379 Mon Sep 17 00:00:00 2001
From: telake <tim.lake@oracle.com>
Date: Wed, 21 Feb 2024 17:34:55 -0800
Subject: [PATCH 13/15] JCS-14023 Status check missing from public subnet
 provisioning (#238)

JCS-14023 Status check missing from public subnet provisioning
Verified status check now showing for public subnet, private endpoint
and bastion still showing status check, and that private subnet w/o
bastion still does not attempt to get status check. Verified all
conditions using both ORM UI and CLI.
---
 terraform/modules/provisioners/provisioning.tf | 6 +++---
 terraform/modules/provisioners/variables.tf    | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/terraform/modules/provisioners/provisioning.tf b/terraform/modules/provisioners/provisioning.tf
index 79a3c8f7..a592b54c 100644
--- a/terraform/modules/provisioners/provisioning.tf
+++ b/terraform/modules/provisioners/provisioning.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 resource "null_resource" "status_check" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.dev_mode_provisioning]
 
   // Connection setup for all WLS instances
@@ -121,7 +121,7 @@ resource "null_resource" "status_check" {
 }
 
 resource "null_resource" "print_service_info" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.status_check]
 
   // Connection setup for all WLS instances
@@ -146,7 +146,7 @@ resource "null_resource" "print_service_info" {
 }
 
 resource "null_resource" "cleanup" {
-  count      = var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
+  count      = var.assign_public_ip || var.is_bastion_instance_required || var.is_rms_private_endpoint_required ? var.num_vm_instances : 0
   depends_on = [null_resource.print_service_info]
 
 
diff --git a/terraform/modules/provisioners/variables.tf b/terraform/modules/provisioners/variables.tf
index 004538ab..6eaeb148 100644
--- a/terraform/modules/provisioners/variables.tf
+++ b/terraform/modules/provisioners/variables.tf
@@ -48,11 +48,9 @@ variable "bastion_host_private_key" {
   default     = ""
 }
 
-#TODO: Check if this variable is really needed.
 variable "assign_public_ip" {
   type        = bool
-  description = "Set to true if you want the compute instance to have a public IP in addition to the private ip. Use with caution"
-  default     = true
+  description = "Set to true if the WebLogic compute instances will be created in a public subnet and should have a public IP"
 }
 
 variable "is_bastion_instance_required" {

From 0007d5806447642259343fd0e90a1f183959eae3 Mon Sep 17 00:00:00 2001
From: Sarada Kommalapati <52939928+skommala@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:24:37 -0800
Subject: [PATCH 14/15] Uptake 24.1.2 mp values. (#242)

Uptake 24.1.2 mp values..
---
 terraform/images/mp_image_ee_byol.tfvars    | 10 +++++-----
 terraform/images/mp_image_ee_ucm.tfvars     |  6 +++---
 terraform/images/mp_image_se_byol.tfvars    |  6 +++---
 terraform/images/mp_image_suite_byol.tfvars | 10 +++++-----
 terraform/images/mp_image_suite_ucm.tfvars  |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/terraform/images/mp_image_ee_byol.tfvars b/terraform/images/mp_image_ee_byol.tfvars
index 13c74fe0..c137b732 100644
--- a/terraform/images/mp_image_ee_byol.tfvars
+++ b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaagthrvz4ul6c5quok25hd2wtmsvyqx3preitjb63e7dxgopsez4aq"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaahermck4j7yc3jbfcfzfpvwgzhfoen74mmn5dwrmnptep5ikb43va"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
+ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/terraform/images/mp_image_ee_ucm.tfvars
index 77c9ff01..9c6e8447 100644
--- a/terraform/images/mp_image_ee_ucm.tfvars
+++ b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa4znas6youb5d3fwzxttrse22zhdfp7bc4kgqw5ecj2b4zzvmg53q"
\ No newline at end of file
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/terraform/images/mp_image_se_byol.tfvars
index c39ff3df..1ab0feb3 100644
--- a/terraform/images/mp_image_se_byol.tfvars
+++ b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaatl3dybgmy6l3wqyaxprl22rvctqnkn5uixjsmfc2rbpian35pvjq"
\ No newline at end of file
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaax3lnppqmdleamgvqnt2zg4zgze7cmrkjmx4pwnw2s55utmvaieta"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/terraform/images/mp_image_suite_byol.tfvars
index 8aedbbc1..81672a87 100644
--- a/terraform/images/mp_image_suite_byol.tfvars
+++ b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaczn55djd6qih54sxpsn5ve7yloahczmnb7w2d7gadaagu6d44kwa"
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaalakd5qdicfbwnqljsgw4bwdqhl74nrz2t7mmnavcij5ifcpbm4nq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"
\ No newline at end of file
+ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/terraform/images/mp_image_suite_ucm.tfvars
index 5106040a..3ccf307c 100644
--- a/terraform/images/mp_image_suite_ucm.tfvars
+++ b/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        = "24.1.1-240117210740"
+tf_script_version        = "24.1.2-240226193100"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.1.1-ol8.8-23.12.13-240117-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaai42ahqg2nzta7x5632b7vo5dwy5mf4gnxyu5qgqpaecatfsoq74a"
\ No newline at end of file
+listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"

From 2cfb830f377e7f873823e64041a4cdd6764611e3 Mon Sep 17 00:00:00 2001
From: Roberto Sanchez Herrera <roberto.s.sanchez@oracle.com>
Date: Fri, 22 Mar 2024 09:46:51 -0600
Subject: [PATCH 15/15] JCS-14392 -  Issue with volume attachments on scale-out
 (#245)

- Make the keys of the maps of compute and volumes resources to have 2
digits at the end, to conserve the iteration order, which is
lexicographical, to prevent volume attachments from being reassigned to
other instances because of the iteration order in the list of compute
instances

Tests:
- Created a non-JRF stack with new VCN, and two nodes
- Scaled up the stack to 4 nodes, verified the apply job completed
successfully and that all servers were added.
- Scaled up the stack to 10 nodes, and verified the same points above
- Scaled up the stack to 11 nodes, and made the same verifications
above, and verified that the existing block volume attachments and block
volumes where not affected
- Scaled up the stack to 20 nodes, and made the same verifications above
- Scaled up the stack to 30 nodes, and made the same verifications above
- Scaled down the stack to 10 nodes. Verified that only the artifacts 29
to 10 are deleted, and the rest of the servers are still running
---
 terraform/modules/compute/wls_compute/wls_compute.tf |  4 ++--
 terraform/modules/compute/wls_compute/wls_volume.tf  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/terraform/modules/compute/wls_compute/wls_compute.tf b/terraform/modules/compute/wls_compute/wls_compute.tf
index 12f4f228..0ba1147a 100644
--- a/terraform/modules/compute/wls_compute/wls_compute.tf
+++ b/terraform/modules/compute/wls_compute/wls_compute.tf
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 module "compute-keygen" {
@@ -9,7 +9,7 @@ module "wls-instances" {
 
   source = "../instance"
 
-  instance_params = { for x in range(var.num_vm_instances) : "${local.host_label}-${x}" => {
+  instance_params = { for x in range(var.num_vm_instances) : "${local.host_label}-${format("%02d", x)}" => {
 
     availability_domain = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
 
diff --git a/terraform/modules/compute/wls_compute/wls_volume.tf b/terraform/modules/compute/wls_compute/wls_volume.tf
index 1557d8c0..dc70c5f1 100644
--- a/terraform/modules/compute/wls_compute/wls_volume.tf
+++ b/terraform/modules/compute/wls_compute/wls_volume.tf
@@ -1,9 +1,9 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 module "middleware-volume" {
   source = "../volume"
-  bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-mw-block-${x}" => {
+  bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-mw-block-${format("%02d", x)}" => {
     ad             = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
     compartment_id = var.compartment_id
     display_name   = "${var.resource_name_prefix}-mw-block-${x}"
@@ -18,7 +18,7 @@ module "middleware-volume" {
 
 module "data-volume" {
   source = "../volume"
-  bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-data-block-${x}" => {
+  bv_params = { for x in range(var.num_vm_instances) : "${var.resource_name_prefix}-data-block-${format("%02d", x)}" => {
     ad             = var.use_regional_subnet ? local.ad_names[(x + local.admin_ad_index) % length(local.ad_names)] : var.availability_domain
     compartment_id = var.compartment_id
     display_name   = "${var.resource_name_prefix}-data-block-${x}"
@@ -35,7 +35,7 @@ module "middleware_volume_attach" {
 
   bv_params = { empty = { ad = "", compartment_id = "", display_name = "", bv_size = 0, defined_tags = { def = "" }, freeform_tags = { free = "" } } }
 
-  bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${x}" => {
+  bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${format("%02d", x)}" => {
     display_name    = "${var.resource_name_prefix}-block-volume-attach-${x}"
     attachment_type = "iscsi"
     instance_id     = module.wls-instances.instance_ids[x / var.num_volumes]
@@ -49,7 +49,7 @@ module "data_volume_attach" {
 
   bv_params = { empty = { ad = "", compartment_id = "", display_name = "", bv_size = 0, defined_tags = { def = "" }, freeform_tags = { free = "" } } }
 
-  bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${x}" => {
+  bv_attach_params = { for x in range(var.num_vm_instances * var.num_volumes) : "${var.resource_name_prefix}-block-volume-attach-${format("%02d", x)}" => {
     display_name    = "${var.resource_name_prefix}-block-volume-attach-${x}"
     attachment_type = "iscsi"
     instance_id     = module.wls-instances.instance_ids[x / var.num_volumes]