Development (#215)

abhijit-paranjpe · web-flow · commit f083a74186e2 · 2023-07-20T09:35:26.000-07:00
Merge development to main..
diff --git a/terraform/images/mp_image_ee_byol.tfvars b/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.3-230702055451"
+tf_script_version        = "23.3.1-230719124253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
-listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaalhdzj6vpns7uw7w3srh6qryi3sdnq36c4kovrn3c7t7ojuafff3q"
+listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaq5nae6poqifz72opkiuld4bprckwnqjtd5iafto5co5od3jubswq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"
+ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"
diff --git a/terraform/images/mp_image_ee_ucm.tfvars b/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.3-230702055451"
+tf_script_version        = "23.3.1-230719124253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
-listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"
+listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"
diff --git a/terraform/images/mp_image_se_byol.tfvars b/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.3-230702055451"
+tf_script_version        = "23.3.1-230719124253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
-listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaagdd4fc5bs5qynsv6oorwm7hwj7wbvishxxsizsspclckrvedf4va"
+listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaaqlzjmwtm3cz3ejafzmf5fvi7jxrui7gn3odec7vb572hmbv7cuua"
diff --git a/terraform/images/mp_image_suite_byol.tfvars b/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.3-230702055451"
+tf_script_version        = "23.3.1-230719124253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
-listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaa4zp7hrszjgt2w5ffamt5zoc6gnbbhzpdregfcsqmumiwel5idqmq"
+listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaau7dmjm42neorefkgt6f7q7h2lddi2x5vld43l7eqr4f5ljt5y7sq"
 
 ucm_listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"
+ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+ucm_instance_image_id        = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"
diff --git a/terraform/images/mp_image_suite_ucm.tfvars b/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.3-230702055451"
+tf_script_version        = "23.3.1-230719124253"
 use_marketplace_image    = true
 listing_id               = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
-listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
-instance_image_id        = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"
+listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
+instance_image_id        = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"
diff --git a/terraform/modules/compute/bastion/variables.tf b/terraform/modules/compute/bastion/variables.tf
@@ -18,8 +18,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the bastion instance will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/fss/variables.tf b/terraform/modules/fss/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the file system exists"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/lb/loadbalancer/variables.tf b/terraform/modules/lb/loadbalancer/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the load balancer will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/network-validator/scripts/network_validation.sh b/terraform/modules/network-validator/scripts/network_validation.sh
@@ -72,11 +72,12 @@ function in_cidr_range() {
 
   subnet_ip=$(echo "${cidr_subnet}" | cut -d'/' -f1)
   cidr_mask=$(echo "${cidr_subnet}" | cut -d'/' -f2)
+  ip_addr_ip=$(echo "${ip_addr}" | cut -d'/' -f1)
 
   netmask=$(( 0xFFFFFFFF << $(( 32 - ${cidr_mask} )) ))
 
   # Apply netmask to both the subnet IP and the given IP address
-  ip_addr_subnet=$(( netmask & $(ip_to_int ${ip_addr}) ))
+  ip_addr_subnet=$(( netmask & $(ip_to_int ${ip_addr_ip}) ))
   subnet=$(( netmask & $(ip_to_int ${subnet_ip}) ))
 
   # Subnet IPs will match if given IP address is in CIDR subnet
diff --git a/terraform/modules/network/subnet/variables.tf b/terraform/modules/network/subnet/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the subnet will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/network/vcn-config/variables.tf b/terraform/modules/network/vcn-config/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the vcn config will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/network/vcn-peering/variables.tf b/terraform/modules/network/vcn-peering/variables.tf
@@ -10,8 +10,8 @@ variable "wls_network_compartment_id" {
   type        = string
   description = "The OCID of the compartment for the network resources, like VCN, for the WebLogic servers"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.wls_network_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for wls_network_compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.wls_network_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.wls_network_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for wls_network_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/network/vcn/variables.tf b/terraform/modules/network/vcn/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the VCN will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/policies/variables.tf b/terraform/modules/policies/variables.tf
@@ -14,35 +14,35 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment for the matching rule of dynamic group"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
 variable "network_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the network resources like VCN are located"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.network_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for network_compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.network_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.network_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for network_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
 variable "fss_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the file system exists"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.fss_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for fss_compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.fss_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.fss_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for fss_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
 variable "mount_target_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the mount target exists"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for mount_target_compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.mount_target_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for mount_target_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/resource-tags/variables.tf b/terraform/modules/resource-tags/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the resource tags will be created"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/rms-private-endpoint/variables.tf b/terraform/modules/rms-private-endpoint/variables.tf
@@ -5,8 +5,8 @@ variable "compartment_id" {
   type        = string
   description = "The OCID of the compartment where the file system exists"
   validation {
-    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."
+    condition     = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
diff --git a/terraform/modules/validators/variables.tf b/terraform/modules/validators/variables.tf
@@ -200,8 +200,8 @@ variable "oci_db_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the OCI database is located, if JRF with OCI DB is used"
   validation {
-    condition     = var.oci_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.oci_db_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for oci_db_compartment_id should be blank or start with \"ocid1.compartment.\"."
+    condition     = var.oci_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.oci_db_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.oci_db_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for oci_db_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 variable "db_network_compartment_id" {
@@ -279,8 +279,8 @@ variable "atp_db_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the ATP database is located, if JRF with ATP is used"
   validation {
-    condition     = var.atp_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.atp_db_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for atp_db_compartment_id should be blank or start with \"ocid1.compartment.\"."
+    condition     = var.atp_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.atp_db_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.atp_db_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for atp_db_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 
@@ -348,8 +348,8 @@ variable "mount_target_compartment_id" {
   type        = string
   description = "The OCID of the compartment where the mount target exists"
   validation {
-    condition     = var.mount_target_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0
-    error_message = "WLSC-ERROR: The value for mount_target_compartment_id should be blank or start with \"ocid1.compartment.\"."
+    condition     = var.mount_target_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0 || length(regexall("^ocid1.tenancy.*$", var.mount_target_compartment_id)) > 0
+    error_message = "WLSC-ERROR: The value for mount_target_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ variable "compartment_id" {`
`18`	`18`	`type = string`
`19`	`19`	`description = "The OCID of the compartment where the bastion instance will be created"`
`20`	`20`	`validation {`
`21`		`- condition = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0`
`22`		`- error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."`
	`21`	`+ condition = length(regexall("^ocid1.compartment.$", var.compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.compartment_id)) > 0`
	`22`	`+ error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ variable "compartment_id" {`
`5`	`5`	`type = string`
`6`	`6`	`description = "The OCID of the compartment where the file system exists"`
`7`	`7`	`validation {`
`8`		`- condition = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0`
`9`		`- error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."`
	`8`	`+ condition = length(regexall("^ocid1.compartment.$", var.compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.compartment_id)) > 0`
	`9`	`+ error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`