Development (#181)

Merge development branch to main to cut release branch.

---------

Co-authored-by: Roberto Sanchez <roberto.s.sanchez@oracle.com>
Co-authored-by: Mahuwa Barman <106961326+Mahuwa-Barman@users.noreply.github.com>
Co-authored-by: telake <120423380+telake@users.noreply.github.com>
Co-authored-by: Rajesh Chavan <120182853+rachavan@users.noreply.github.com>
Co-authored-by: abhijit-paranjpe <109541284+abhijit-paranjpe@users.noreply.github.com>

Author: 6 people

README.md

@@ -42,6 +42,13 @@ For pre-requisites specific to Terraform CLI and ORM, see their corresponding se
 
 ## Create the Stack Using the OCI Marketplace
 
+The WebLogic Server for OCI stack applications available in the Marketplace are:
+- [Oracle WebLogic Server Enterprise Edition (UCM)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/72493372)
+- [Oracle WebLogic Suite (UCM)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/72492657)
+- [Oracle WebLogic Server Standard Edition (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/65022652)
+- [Oracle WebLogic Server Enterprise Edition (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/63497374)
+- [Oracle WebLogic Suite (BYOL)](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/63498586)
+
 To create, manage and destroy the OCI Terraform stack for WebLogic Server as WebLogic Server for OCI using the Marketplace,
 follow the instructions in the [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/create-stack1.html).
 

VARIABLES.md

@@ -203,7 +203,17 @@ Review the [observability_variables.tf](./terraform/observability_variables.tf)
 To configure the stack to automatically add or remove servers based on performance metrics, refer to the
 [autoscaling_variables.tf](./terraform/autoscaling_variables.tf) file for the variables to use.
 
-Note that autoscaling is not supported when creating a stack using Terraform CLI. You need you create a [Resource Manager][orm]
+This is an example of how to configure autoscaling:
+```terraform
+use_autoscaling       = true
+wls_metric            = "CPU Load"
+min_threshold_percent = 10
+max_threshold_percent = 20
+ocir_user             = "<ocir_user>"
+ocir_auth_token_id    = "ocid1.vaultsecret.oc1.phx.xxxxxxxxxxxxxxx"
+```
+There are some prerequisites for using autoscaling. See [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/components-oracle-weblogic-cloud.html#GUID-CE8B9AE0-0FE9-442A-9239-8B0DFD835119) for more details.                                 
+Note that autoscaling is not supported when creating a stack using Terraform CLI. You need to create a [Resource Manager][orm]
 stack, or use the [Marketplace][marketplace].
 
 [marketplace]: https://docs.oracle.com/iaas/Content/Marketplace/Concepts/marketoverview.htm

solutions/jrf/README.md

@@ -47,7 +47,7 @@ The directory oci-weblogic-server/solutions/jrf consists of the following terraf
 The directory oci-weblogic-server/solutions/common consists of the following:
 - tenancy.tfvars - tenancy configuration
 
-The files in the oci-weblogic-server/inputs directory contain the values of the images for the different combinations of
+The files in the oci-weblogic-server/images directory contain the values of the images for the different combinations of
 WebLogic edition and pricing. In this solution, the file _mp_image_ee_byol.tfvars_ is used to create a WebLogic Enterprise
 Edition, BYOL instance. Specify a different file to use a different edition and/or pricing. 
 
@@ -63,7 +63,8 @@ Initialize the terraform provider plugin
 terraform init
 ```
 
-Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according to the user specific values
+Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according
+to the user specific values.
 Invoke apply passing all *.tfvars files as input
 ```bash
 terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars

solutions/non_jrf/README.md

@@ -42,7 +42,7 @@ The directory oci-weblogic-server/solutions/non_jrf consists of the following te
 The directory oci-weblogic-server/solutions/common consists of the following:
 - tenancy.tfvars - tenancy configuration
 
-The files in the oci-weblogic-server/inputs directory contain the values of the images for the different combinations of
+The files in the oci-weblogic-server/images directory contain the values of the images for the different combinations of
 WebLogic edition and pricing. In this solution, the file _mp_image_ee_byol.tfvars_ is used to create a WebLogic Enterprise
 Edition, BYOL instance. Specify a different file to use a different edition and/or pricing.
 

terraform/bastion_variables.tf

@@ -33,7 +33,7 @@ variable "bastion_instance_shape" {
 
 variable "bastion_ssh_private_key" {
   type        = string
-  description = "Private ssh key for existing bastion instance"
+  description = "The path to the file that contains the private ssh key for an existing bastion instance"
   default     = ""
 }
 

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.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaxr2dllkm3e6qwdleu6q3bwou6pw2r2vt4ne7d7aucrtxpurypvyq"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaadgqvwsbfcm6bjaowtogdym4kv5gffi6rwv3d5po2o4vk2smwwcxa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaagrmncsysh64fj5hh5pcjr6swo6oyzzbh4woi4q4hsyct6n5eqkuq"
+ucm_listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaagmy46blg6wrvwvozvnui25jxaus5jt6fquv2efkktcf2p6vnveiq"

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.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaagrmncsysh64fj5hh5pcjr6swo6oyzzbh4woi4q4hsyct6n5eqkuq"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaagmy46blg6wrvwvozvnui25jxaus5jt6fquv2efkktcf2p6vnveiq"

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.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaazc4flvws6yji6ktj6jwzhrm6e6dcvf2vwiokovrlwodvppa5atfa"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaar3qjebqyaqpqwqzeg2mtf2gt4oosly23qaeb4k76fzhprnphnuxa"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaapqar667d3clrw6xgpoccbtqj6rff5xcpj72sstttzqrahvvcx4ia"
+ucm_listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaxrntnjc2btd7o3rig3wpqkyskair2iospvquto2ofjt2tmuuujya"

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.1.1-230118062825"
+tf_script_version        = "23.1.3-230323195128"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.1.1-ol7.9-22.08.29-230118-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaapqar667d3clrw6xgpoccbtqj6rff5xcpj72sstttzqrahvvcx4ia"
+listing_resource_version = "23.1.3-ol7.9-22.08.29-230323-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaxrntnjc2btd7o3rig3wpqkyskair2iospvquto2ofjt2tmuuujya"

terraform/locals.tf

@@ -148,7 +148,7 @@ locals {
     var.wls_extern_ssl_admin_port,
   ) : ""
 
-  use_apm_service = (var.use_apm_service || var.use_autoscaling)
+  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") : ""
 
 

terraform/main.tf

@@ -1,7 +1,30 @@
 # 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.
 
+module "network-validation" {
+  source                         = "./modules/network-validator"
+  count                          = local.use_existing_subnets && !var.skip_network_validation ? 1 : 0
+  wls_subnet_id                  = var.wls_subnet_id
+  bastion_subnet_id              = var.is_bastion_instance_required ? var.bastion_subnet_id : ""
+  bastion_ip                     = var.is_bastion_instance_required && var.existing_bastion_instance_id != "" ? data.oci_core_instance.existing_bastion_instance[0].private_ip : ""
+  lb_subnet_1_id                 = var.add_load_balancer ? var.lb_subnet_1_id : ""
+  lb_subnet_2_id                 = var.add_load_balancer && !local.use_regional_subnet ? var.lb_subnet_2_id : ""
+  mount_target_subnet_id         = var.add_fss ? var.mount_target_subnet_id : ""
+  atp_db_id                      = !local.is_oci_db ? var.atp_db_id : ""
+  oci_db_dbsystem_id             = local.is_oci_db ? var.oci_db_dbsystem_id : ""
+  oci_db_port                    = local.is_oci_db ? var.oci_db_port : 0
+  wls_extern_admin_port          = var.wls_extern_admin_port
+  wls_extern_ssl_admin_port      = var.wls_extern_ssl_admin_port
+  wls_ms_extern_port             = var.wls_ms_extern_port
+  existing_admin_server_nsg_id   = var.add_existing_nsg ? var.existing_admin_server_nsg_id : ""
+  existing_managed_server_nsg_id = var.add_existing_nsg ? var.existing_managed_server_nsg_id : ""
+  existing_lb_nsg_id             = var.add_existing_nsg && var.add_load_balancer ? var.existing_lb_nsg_id : ""
+  existing_mount_target_nsg_id   = var.add_existing_nsg && var.add_fss ? var.existing_mount_target_nsg_id : ""
+  existing_bastion_nsg_id        = var.add_existing_nsg && var.is_bastion_instance_required ? var.existing_bastion_nsg_id : ""
+}
+
 module "system-tags" {
+  depends_on     = [module.network-validation]
   source         = "./modules/resource-tags"
   compartment_id = var.compartment_ocid
   service_name   = var.service_name
@@ -37,14 +60,11 @@ module "network-vcn-config" {
   wls_extern_admin_port      = var.wls_extern_admin_port
   wls_expose_admin_port      = var.wls_expose_admin_port
   wls_admin_port_source_cidr = var.wls_admin_port_source_cidr
-  wls_ms_content_port        = var.is_idcs_selected ? var.idcs_cloudgate_port : var.wls_ms_extern_ssl_port
+  wls_ms_content_port        = local.add_load_balancer ? (var.is_idcs_selected ? var.idcs_cloudgate_port : var.wls_ms_extern_port) : var.wls_ms_extern_ssl_port
   assign_backend_public_ip   = local.assign_weblogic_public_ip
 
-  wls_security_list_name       = !local.assign_weblogic_public_ip ? "bastion-security-list" : "wls-security-list"
   wls_subnet_cidr              = local.wls_subnet_cidr
   wls_ms_source_cidrs          = local.add_load_balancer ? [local.lb_subnet_1_subnet_cidr] : ["0.0.0.0/0"]
-  load_balancer_min_value      = local.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
-  load_balancer_max_value      = local.add_load_balancer ? var.wls_ms_extern_port : var.wls_ms_extern_ssl_port
   create_load_balancer         = local.add_load_balancer
   resource_name_prefix         = local.service_name_prefix
   bastion_subnet_cidr          = local.bastion_subnet_cidr
@@ -183,6 +203,7 @@ module "network-bastion-subnet" {
 }
 
 module "policies" {
+  depends_on             = [module.network-validation]
   source                 = "./modules/policies"
   count                  = var.create_policies ? 1 : 0
   compartment_id         = var.compartment_ocid
@@ -217,6 +238,7 @@ module "policies" {
 
 
 module "bastion" {
+  depends_on          = [module.network-validation]
   source              = "./modules/compute/bastion"
   count               = (!local.assign_weblogic_public_ip && var.is_bastion_instance_required && var.existing_bastion_instance_id == "") ? 1 : 0
   availability_domain = local.bastion_availability_domain
@@ -304,6 +326,7 @@ module "network-mount-target-private-subnet" {
 }
 
 module "vcn-peering" {
+  depends_on                     = [module.network-validation]
   count                          = local.is_vcn_peering ? 1 : 0
   source                         = "./modules/network/vcn-peering"
   resource_name_prefix           = local.service_name_prefix
@@ -321,7 +344,8 @@ module "vcn-peering" {
 }
 
 module "validators" {
-  source = "./modules/validators"
+  depends_on = [module.network-validation]
+  source     = "./modules/validators"
 
   service_name               = var.service_name
   wls_ms_port                = var.wls_ms_extern_port
@@ -426,6 +450,7 @@ module "validators" {
 
   wlsoci_vmscripts_zip_bundle_path = var.wlsoci_vmscripts_zip_bundle_path
   mode                             = var.mode
+  tf_script_version                = var.tf_script_version
 
   image_mode             = var.image_mode
   instance_image_id      = var.instance_image_id
@@ -438,8 +463,9 @@ module "validators" {
 }
 
 module "fss" {
-  source = "./modules/fss"
-  count  = var.add_fss ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/fss"
+  count      = var.add_fss ? 1 : 0
 
   compartment_id      = var.compartment_ocid
   availability_domain = local.fss_availability_domain
@@ -460,8 +486,9 @@ module "fss" {
 }
 
 module "load-balancer" {
-  source = "./modules/lb/loadbalancer"
-  count  = (local.add_load_balancer && var.existing_load_balancer_id == "") ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/lb/loadbalancer"
+  count      = (local.add_load_balancer && var.existing_load_balancer_id == "") ? 1 : 0
 
   compartment_id           = local.network_compartment_id
   lb_reserved_public_ip_id = compact([var.lb_reserved_public_ip_id])
@@ -480,17 +507,19 @@ module "load-balancer" {
 }
 
 module "observability-common" {
-  source = "./modules/observability/common"
-  count  = var.use_oci_logging ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/observability/common"
+  count      = var.use_oci_logging ? 1 : 0
 
   compartment_id      = var.compartment_ocid
   service_prefix_name = local.service_name_prefix
   add_delay           = var.use_autoscaling
 }
 
 module "observability-autoscaling" {
-  source = "./modules/observability/autoscaling"
-  count  = var.use_autoscaling ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/observability/autoscaling"
+  count      = var.use_autoscaling ? 1 : 0
 
   compartment_id        = var.compartment_ocid
   metric_compartment_id = local.apm_domain_compartment_id
@@ -649,8 +678,9 @@ module "compute" {
 }
 
 module "load-balancer-backends" {
-  source = "./modules/lb/backends"
-  count  = local.add_load_balancer ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/lb/backends"
+  count      = local.add_load_balancer ? 1 : 0
 
   resource_name_prefix = local.service_name_prefix
   load_balancer_id     = local.add_load_balancer ? (var.existing_load_balancer_id != "" ? var.existing_load_balancer_id : element(coalescelist(module.load-balancer[*].wls_loadbalancer_id, [""]), 0)) : ""
@@ -663,8 +693,9 @@ module "load-balancer-backends" {
 }
 
 module "observability-logging" {
-  source = "./modules/observability/logging"
-  count  = var.use_oci_logging ? 1 : 0
+  depends_on = [module.network-validation]
+  source     = "./modules/observability/logging"
+  count      = var.use_oci_logging ? 1 : 0
 
   compartment_id                        = var.compartment_ocid
   oci_managed_instances_principal_group = element(concat(module.policies[*].oci_managed_instances_principal_group, [""]), 0)
@@ -680,7 +711,8 @@ module "observability-logging" {
 }
 
 module "provisioners" {
-  source = "./modules/provisioners"
+  depends_on = [module.network-validation]
+  source     = "./modules/provisioners"
 
   existing_bastion_instance_id = var.existing_bastion_instance_id
   host_ips                     = coalescelist(compact(module.compute.instance_public_ips), compact(module.compute.instance_private_ips), [""])

terraform/modules/compute/wls_compute/wls_compute.tf

@@ -78,8 +78,10 @@ module "wls-instances" {
       log_level            = var.log_level
       mw_vol_mount_point   = lookup(var.volume_map[0], "volume_mount_point")
       mw_vol_device        = lookup(var.volume_map[0], "device")
+      mw_volume            = module.middleware-volume.data_volume_ids[x / var.num_volumes]
       data_vol_mount_point = lookup(var.volume_map[1], "volume_mount_point")
       data_vol_device      = lookup(var.volume_map[1], "device")
+      data_volume          = module.data-volume.data_volume_ids[x / var.num_volumes]
 
       deploy_sample_app                  = var.deploy_sample_app
       domain_dir                         = var.domain_dir

terraform/modules/compute/wls_compute/wls_variables.tf

@@ -15,8 +15,8 @@ variable "wls_admin_user" {
   type        = string
   description = "The name of the admin user that will be added to the WebLogic domain"
   validation {
-    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9]{7,127}/", "0") == "0"
-    error_message = "WLSC-ERROR: The value for wls_admin_user provided should be alphanumeric and length should be between 8 and 128 characters."
+    condition     = replace(var.wls_admin_user, "/^[a-zA-Z][a-zA-Z0-9_-]{7,127}/", "0") == "0"
+    error_message = "WLSC-ERROR: The value for wls_admin_user should be between 8 and 128 characters long and alphanumeric, and can contain underscore (_) and hyphen(-) special characters."
   }
 }