Update validation prechecks (#213)

Mahuwa-Barman · web-flow · commit 8eb33ce39546 · 2023-07-20T10:32:46.000+05:30
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/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`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ variable "wls_network_compartment_id" {`
`10`	`10`	`type = string`
`11`	`11`	`description = "The OCID of the compartment for the network resources, like VCN, for the WebLogic servers"`
`12`	`12`	`validation {`
`13`		`- condition = length(regexall("^ocid1.compartment.*$", var.wls_network_compartment_id)) > 0`
`14`		`- error_message = "WLSC-ERROR: The value for wls_network_compartment_id should start with \"ocid1.compartment.\"."`
	`13`	`+ condition = length(regexall("^ocid1.compartment.$", var.wls_network_compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.wls_network_compartment_id)) > 0`
	`14`	`+ error_message = "WLSC-ERROR: The value for wls_network_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -14,35 +14,35 @@ variable "compartment_id" {`
`14`	`14`	`type = string`
`15`	`15`	`description = "The OCID of the compartment for the matching rule of dynamic group"`
`16`	`16`	`validation {`
`17`		`- condition = length(regexall("^ocid1.compartment.*$", var.compartment_id)) > 0`
`18`		`- error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\"."`
	`17`	`+ condition = length(regexall("^ocid1.compartment.$", var.compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.compartment_id)) > 0`
	`18`	`+ error_message = "WLSC-ERROR: The value for compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`variable "network_compartment_id" {`
`23`	`23`	`type = string`
`24`	`24`	`description = "The OCID of the compartment where the network resources like VCN are located"`
`25`	`25`	`validation {`
`26`		`- condition = length(regexall("^ocid1.compartment.*$", var.network_compartment_id)) > 0`
`27`		`- error_message = "WLSC-ERROR: The value for network_compartment_id should start with \"ocid1.compartment.\"."`
	`26`	`+ condition = length(regexall("^ocid1.compartment.$", var.network_compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.network_compartment_id)) > 0`
	`27`	`+ error_message = "WLSC-ERROR: The value for network_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`variable "fss_compartment_id" {`
`32`	`32`	`type = string`
`33`	`33`	`description = "The OCID of the compartment where the file system exists"`
`34`	`34`	`validation {`
`35`		`- condition = length(regexall("^ocid1.compartment.*$", var.fss_compartment_id)) > 0`
`36`		`- error_message = "WLSC-ERROR: The value for fss_compartment_id should start with \"ocid1.compartment.\"."`
	`35`	`+ condition = length(regexall("^ocid1.compartment.$", var.fss_compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.fss_compartment_id)) > 0`
	`36`	`+ error_message = "WLSC-ERROR: The value for fss_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`variable "mount_target_compartment_id" {`
`41`	`41`	`type = string`
`42`	`42`	`description = "The OCID of the compartment where the mount target exists"`
`43`	`43`	`validation {`
`44`		`- condition = length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0`
`45`		`- error_message = "WLSC-ERROR: The value for mount_target_compartment_id should start with \"ocid1.compartment.\"."`
	`44`	`+ condition = length(regexall("^ocid1.compartment.$", var.mount_target_compartment_id)) > 0 \|\| length(regexall("^ocid1.tenancy.$", var.mount_target_compartment_id)) > 0`
	`45`	`+ error_message = "WLSC-ERROR: The value for mount_target_compartment_id should start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`