Development (#200)

Merging development branch into Main branch for release 23.2.2

Author: abhijit-paranjpe

builds/build_cli.sh

@@ -69,6 +69,7 @@ mkdir -p ${SCRIPT_DIR}/binaries/tmpbuild
 create_cli_bundle()
 {
   cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/edition.tf ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/images ${TMP_BUILD}
+  rm ${TMP_BUILD}/modules/validators/stack_validators.tf
   replace_variables
   (cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-terraform.zip *; rm -Rf ${TMP_BUILD}/*)
 }
@@ -79,6 +80,8 @@ replace_variables()
   sed -i '/variable "generate_dg_tag" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/variables.tf
   sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
+  sed -i '/variable "is_rms_private_endpoint_required" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/variables.tf
+  sed -i '/variable "is_bastion_instance_required" {/!b;n;n;n;cdefault = true' ${TMP_BUILD}/bastion_variables.tf
 }
 
 

solutions/jrf/jrf_instance.tfvars

@@ -26,7 +26,10 @@ wls_node_count = 2
 wls_availability_domain_name = "<availability_domain_name>"
 wls_subnet_id = "ocid1.subnet.xxxxxxxxxxxxxxx"
 
-### Bastion parameters to create new bastion instance
+### Resource Manager Private Endpoint parameter
+is_rms_private_endpoint_required = false
+
+### Bastion instance parameters
 is_bastion_instance_required = true
 bastion_subnet_id = "ocid1.subnet.xxxxxxxxxxxxxxx"
-bastion_instance_shape = "VM.Standard.E4.Flex"
+bastion_instance_shape = "VM.Standard.E4.Flex"

terraform/bastion_variables.tf

@@ -4,7 +4,7 @@
 variable "is_bastion_instance_required" {
   type        = bool
   description = "Set to true to use a bastion, either new or existing. If existing_bastion_instance_id is blank, a new bastion will be created"
-  default     = true
+  default     = false
 }
 
 variable "existing_bastion_instance_id" {

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.1-230422141938"
+tf_script_version        = "23.2.2-230527145254"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaspdu4zslcnaza7kmwqhv3xnvpwsvw4ij5sr4jeoy6k3jbxveb7uq"
+listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaao47acui7dt2il7gmre7wzx7nwas6srsmn76zxz77zlbby6rhkota"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaadadvpisg7vdaxbnkckge5btrsxjwyhmpkukff6xpxomvml5ogi2q"
+ucm_listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaahnvusjczw7sq22mzgtiqt7cgkpjnysmqv7xa5dpggzohmcopn3bq"

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.1-230422141938"
+tf_script_version        = "23.2.2-230527145254"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaadadvpisg7vdaxbnkckge5btrsxjwyhmpkukff6xpxomvml5ogi2q"
+listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaahnvusjczw7sq22mzgtiqt7cgkpjnysmqv7xa5dpggzohmcopn3bq"

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.1-230422141938"
+tf_script_version        = "23.2.2-230527145254"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazpiifnhh3viyffewgx7upr6bjvcoeq3qwr7kjp3yfvjat2o2njea"
+listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaal6xkggt2s4gr5zirxjjzsmzyiujooszh2coy5gk5u246jetdz7pq"

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.1-230422141938"
+tf_script_version        = "23.2.2-230527145254"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaauz5d4nxpsca2puc2ufu7cqmd5q65zwkkxaffvbrmnjh263mxliwq"
+listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaadcqxyhgkiipawuavpl43djren4nkiyfla3tm7p2tetqxz32bdylq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaziqalsizb5apfascoz4uxr2m67csgqzppclbymmimriqwcjw5h5q"
+ucm_listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaoom5clwv2yns46nvg5k72zsh2i663vofm4ew7vojvmulfubbka2q"

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.1-230422141938"
+tf_script_version        = "23.2.2-230527145254"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.2.1-ol7.9-22.08.29-230422-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaziqalsizb5apfascoz4uxr2m67csgqzppclbymmimriqwcjw5h5q"
+listing_resource_version = "23.2.2-ol7.9-22.08.29-230527-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaoom5clwv2yns46nvg5k72zsh2i663vofm4ew7vojvmulfubbka2q"

terraform/locals.tf

@@ -84,7 +84,6 @@ locals {
   lb_subnet_1_name = var.is_lb_private ? "lbprist1" : "lbpubst1"
   lb_subnet_2_name = var.is_lb_private ? "lbprist2" : "lbpubst2"
 
-
   lb_id = local.use_existing_lb ? var.existing_load_balancer_id : local.new_lb_id
   lb_ip = local.use_existing_lb ? local.existing_lb_ip : local.new_lb_ip
 
@@ -105,7 +104,7 @@ locals {
     local.lb_ip,
   ) : ""
 
-  async_prov_mode = !local.assign_weblogic_public_ip && !var.is_bastion_instance_required ? "Asynchronous provisioning is enabled. Connect to each compute instance and confirm that the file /u01/data/domains/${format("%s_domain", local.service_name_prefix)}/provCompletedMarker exists. Details are found in the file /u01/logs/provisioning.log." : ""
+  async_prov_mode = !local.assign_weblogic_public_ip && !var.is_rms_private_endpoint_required && !var.is_bastion_instance_required ? "Asynchronous provisioning is enabled. Connect to each compute instance and confirm that the file /u01/data/domains/${format("%s_domain", local.service_name_prefix)}/provCompletedMarker exists. Details are found in the file /u01/logs/provisioning.log." : ""
 
   jdk_labels  = { jdk7 = "JDK 7", jdk8 = "JDK 8", jdk11 = "JDK 11" }
   jdk_version = var.wls_version == "14.1.1.0" ? local.jdk_labels[var.wls_14c_jdk_version] : (var.wls_version == "11.1.1.7" ? local.jdk_labels["jdk7"] : local.jdk_labels["jdk8"])
@@ -151,11 +150,12 @@ locals {
   use_apm_service           = (var.use_apm_service || var.use_autoscaling)
   apm_domain_compartment_id = local.use_apm_service ? lookup(data.oci_apm_apm_domain.apm_domain[0], "compartment_id") : ""
 
-
-
   ocir_namespace = data.oci_objectstorage_namespace.object_namespace.namespace
 
-  ocir_user           = format("%s/%s", local.ocir_namespace, var.ocir_user)
+  ocir_namespace_with_slash = format("%s/", local.ocir_namespace)
+  ocir_user_starts_with     = substr(var.ocir_user, 0, length(local.ocir_namespace_with_slash))
+  ocir_user                 = local.ocir_user_starts_with == local.ocir_namespace_with_slash ? var.ocir_user : "${format("%s%s", local.ocir_namespace_with_slash, var.ocir_user)}"
+
   region_keys         = data.oci_identity_regions.all_regions.regions.*.key
   region_names        = data.oci_identity_regions.all_regions.regions.*.name
   ocir_region         = var.ocir_region == "" ? lower(element(local.region_keys, index(local.region_names, lower(var.region)))) : var.ocir_region
@@ -177,4 +177,11 @@ locals {
     "instanceShape" = var.bastion_instance_shape,
     "ocpus"         = 1
   }
+
+  is_bastion_instance_required = (var.is_bastion_instance_required && var.subnet_type != "Use Public Subnet") || var.wls_existing_vcn_id == "" || (var.wls_existing_vcn_id != "" && var.wls_subnet_id == "") ? true : false
+
+  # Resource Manager Endpoint
+  is_rms_private_endpoint_required  = var.is_rms_private_endpoint_required && var.wls_existing_vcn_id != "" && var.wls_subnet_id != "" && !local.assign_weblogic_public_ip ? true : false
+  add_new_rms_private_endpoint      = local.is_rms_private_endpoint_required && var.add_rms_private_endpoint == "Create New Resource Manager Endpoint" ? true : false
+  add_existing_rms_private_endpoint = local.is_rms_private_endpoint_required && var.add_rms_private_endpoint == "Use Existing Resource Manager Endpoint" ? true : false
 }