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

Author: skommala

terraform/images/mp_image_ee_byol.tfvars

@@ -1,12 +1,12 @@
-# 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.
 
-tf_script_version        = "24.1.2-240226193100"
+tf_script_version        = "24.2.1-240510214529"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaahermck4j7yc3jbfcfzfpvwgzhfoen74mmn5dwrmnptep5ikb43va"
+listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaa44h6iv2n3mgzjej26juwoxiceb274xghl7h444nwvft2yzsfxo5a"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
+ucm_listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaapv6ojtnwlo4kbjd57ewzqca3jyepcebrwjitva2pxo7d3b3ecnfq"

terraform/images/mp_image_ee_ucm.tfvars

@@ -1,8 +1,8 @@
-# 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.
 
-tf_script_version        = "24.1.2-240226193100"
+tf_script_version        = "24.2.1-240510214529"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaev4aso265wkxmt566hvey4pgja4r2rd5yqnua37hcn5bo75lc77a"
+listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaapv6ojtnwlo4kbjd57ewzqca3jyepcebrwjitva2pxo7d3b3ecnfq"

terraform/images/mp_image_se_byol.tfvars

@@ -1,8 +1,8 @@
-# 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.
 
-tf_script_version        = "24.1.2-240226193100"
+tf_script_version        = "24.2.1-240510214529"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaax3lnppqmdleamgvqnt2zg4zgze7cmrkjmx4pwnw2s55utmvaieta"
+listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaac6cfkwfyuzjwk7q37tn3mslfkszpnrojnb2nezwy4oy77zoan4uq"

terraform/images/mp_image_suite_byol.tfvars

@@ -1,13 +1,12 @@
-# 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.
 
-tf_script_version        = "24.1.2-240226193100"
+tf_script_version        = "24.2.1-240510214529"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaalakd5qdicfbwnqljsgw4bwdqhl74nrz2t7mmnavcij5ifcpbm4nq"
+listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaahybonu5hsryaqvsnoj6mqhtgbrphfal7ujvezi356rxyhjbq7f3a"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"
->>>>>>> development
+ucm_listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaor56fbh7brlzxqnjeaa3lcii5e2w5l3ghxru53scrlawqodaqnbq"

terraform/images/mp_image_suite_ucm.tfvars

@@ -1,8 +1,8 @@
-# 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.
 
-tf_script_version        = "24.1.2-240226193100"
+tf_script_version        = "24.2.1-240510214529"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "24.1.2-ol8.8-23.12.13-240226-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaajf5s77j3syb42vtljjsyrnix2ycc6zdaychdaqa7gbncw5ajmelq"
+listing_resource_version = "24.2.1-ol8.8-23.12.13-240510-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaor56fbh7brlzxqnjeaa3lcii5e2w5l3ghxru53scrlawqodaqnbq"

terraform/main.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.
 
 ### Removing network validation script from provisioning flow temporarily.
@@ -464,6 +464,7 @@ module "validators" {
   provisioned_node_count = length(data.oci_core_instances.provisioned_instances.instances.*.display_name)
   use_marketplace_image  = var.use_marketplace_image
   wls_edition            = var.wls_edition
+  tenancy_id             = var.tenancy_ocid
 }
 
 module "fss" {
@@ -609,6 +610,7 @@ module "compute" {
   wls_domain_name           = format("%s_domain", local.service_name_prefix)
   wls_server_startup_args   = var.wls_server_startup_args
   wls_existing_vcn_id       = var.wls_existing_vcn_id
+  create_policies           = var.create_policies
 
   #The following two are for adding a dependency on the peering module
   wls_vcn_peering_dns_resolver_id           = element(flatten(concat(module.vcn-peering[*].wls_vcn_dns_resolver_id, [""])), 0)

terraform/modules/compute/wls_compute/variables.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.
 
 variable "tenancy_id" {
@@ -16,6 +16,11 @@ variable "compartment_id" {
   description = "The OCID of the compartment where the compute will be created"
 }
 
+variable "create_policies" {
+  type        = bool
+  description = "Set to true to create OCI IAM policies and dynamic groups required by the WebLogic for OCI stack. If this is set to false, the policies and dynamic groups need to be created manually"
+}
+
 variable "availability_domain" {
   type        = string
   description = "The label of the availability domain where the compute will be created"

terraform/modules/compute/wls_compute/wls_compute.tf

@@ -67,6 +67,7 @@ module "wls-instances" {
       wls_subnet_cidr                    = local.wls_subnet_cidr
       wls_edition                        = var.wls_edition
       is_bastion_instance_required       = var.is_bastion_instance_required
+      create_policies                    = var.create_policies
 
       user_data            = data.template_cloudinit_config.config.rendered
       mode                 = var.mode

terraform/modules/validators/policy_validators.tf

@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+data "oci_identity_policies" "existing_policies" {
+  compartment_id = var.tenancy_id
+}
+
+locals {
+  policy_name = var.create_policies ? "${var.service_name}-oci-policy" : ""
+  existing_policy_names = var.create_policies ? [for policy in data.oci_identity_policies.existing_policies.policies : policy.name] : []
+  policy_already_exists = var.create_policies ? contains(local.existing_policy_names, local.policy_name) : false
+  policy_already_exists_msg = "WLSC-ERROR: Policy with name ${local.policy_name} already exists. Suggested Actions: It appears that another policy with the same name already exists. This could be because you have previously provisioned a stack with the same resource name prefix. If you no longer need the previous stack, please destroy and delete it so that all the resources are cleaned up or else you can provision again with a different resource name prefix. If you have already deleted the stack, delete the policy ${local.policy_name}."
+  validate_policy_name_is_not_already_used = var.create_policies && local.policy_already_exists ? local.validators_msg_map[local.policy_already_exists_msg] : null
+}

terraform/modules/validators/variables.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.
 
 variable "compartment_id" {
@@ -533,3 +533,12 @@ variable "tf_script_version" {
   type        = string
   description = "The version of the provisioning scripts located in the OCI image used to create the WebLogic compute instances"
 }
+
+variable "tenancy_id" {
+  type        = string
+  description = "The OCID of the tenancy where the dynamic group and policy will be created"
+  validation {
+    condition     = length(regexall("^ocid1.tenancy.*$", var.tenancy_id)) > 0
+    error_message = "WLSC-ERROR: The value for tenancy_id should start with \"ocid1.tenancy.\"."
+  }
+}