Development (#227)

Co-authored-by: Abhijit Paranjpe <[email protected]>
Co-authored-by: telake <[email protected]>

Author: 3 people

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"

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"

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"

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"

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"

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"

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

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
   ])

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 == "")
 

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