Merge branch 'main' of https://github.com/oracle-quickstart/oci-weblogic-server into main

Author: Sarada Kommalapati

terraform/images/mp_image_ee_byol.tfvars

@@ -1,12 +1,12 @@
 # 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.
 
-tf_script_version        = "24.3.1-240717203601"
+tf_script_version        = "24.3.2-240826233830"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaauga63jzbyefbqtjeboszo27r4afg7j4axp4cif5in6azshnlc6yq"
+listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaao25ncdtg7yezjprzgd56d6j7gxuen3cczemnoegs7lgaihjy5gba"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaelqj7qwwrggbhlfxzpa4qhmojpnhcycwml2e2lwsksmov3dh77hq"
+ucm_listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaasbest4ysvkitc6bp27klwflg3zfbz5hb637htezsovaqivkk72qa"

terraform/images/mp_image_ee_ucm.tfvars

@@ -1,8 +1,8 @@
 # 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.
 
-tf_script_version        = "24.3.1-240717203601"
+tf_script_version        = "24.3.2-240826233830"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaelqj7qwwrggbhlfxzpa4qhmojpnhcycwml2e2lwsksmov3dh77hq"
+listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaasbest4ysvkitc6bp27klwflg3zfbz5hb637htezsovaqivkk72qa"

terraform/images/mp_image_se_byol.tfvars

@@ -1,8 +1,8 @@
 # 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.
 
-tf_script_version        = "24.3.1-240717203601"
+tf_script_version        = "24.3.2-240826233830"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaasy6a25lbasdgoosem52sgtsxcd3ma7b7xfiuvq3jzryecoc4bhiq"
+listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaatbgtdelzzk6fvyf4l23do34udyjejtby2tzxj7nzaswn2slznsxq"

terraform/images/mp_image_suite_byol.tfvars

@@ -1,12 +1,12 @@
 # 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.
 
-tf_script_version        = "24.3.1-240717203601"
+tf_script_version        = "24.3.2-240826233830"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaqe6spyz6djfxr37asosv2sxgsdanvft3py444szbrpffr74vvb5a"
+listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa2kfgmx6pu7qjl4pgno2x64hau4dj5lfvteimh2ibqajdlvqxjeaa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaa72qjwyo4nzhddmi6bs62mj22zc3jk6enflqpav3bfh2ll4gongja"
+ucm_listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaauu7t5rihkowgsfimkdqrlyg46w24ri2bae4bgvsypbemhcewe6eq"

terraform/images/mp_image_suite_ucm.tfvars

@@ -1,8 +1,8 @@
 # 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.
 
-tf_script_version        = "24.3.1-240717203601"
+tf_script_version        = "24.3.2-240826233830"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.3.1-ol8.8-23.12.13-240717-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa72qjwyo4nzhddmi6bs62mj22zc3jk6enflqpav3bfh2ll4gongja"
+listing_resource_version = "24.3.2-ol8.8-23.12.13-240826-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaauu7t5rihkowgsfimkdqrlyg46w24ri2bae4bgvsypbemhcewe6eq"

terraform/modules/policies/locals.tf

@@ -11,8 +11,10 @@ locals {
   oci_db_connection_string = trimspace(var.oci_db.oci_db_connection_string)
   is_oci_db                = var.oci_db.is_oci_db || local.oci_db_connection_string != ""
 
-  # This policy with "use instances" verb is needed because there is code in the WebLogic for OCI compute image that updates metadata of the compute instance, when more than one VM nodes are created
-  core_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use instances in compartment id ${var.compartment_id}"
+  # This policy with "manage instances" verb is needed for 2 reasons:
+  # 1. "use" is needed because there is code in the WebLogic for OCI compute image that updates metadata of the compute instance, when more than one VM node is created.
+  # 2. "manage" is needed for cloning scenarios where volumes need to be added.
+  core_policy_statement1 = "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to manage 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

terraform/variables.tf

@@ -123,8 +123,8 @@ variable "tf_script_version" {
 
 variable "is_rms_private_endpoint_required" {
   type        = bool
-  description = "Set resource manager private endpoint. Default value is true"
-  default     = true
+  description = "Set resource manager private endpoint. Default value is false"
+  default     = false
 }
 
 variable "add_rms_private_endpoint" {