Skip to content

Commit f083a74

Browse files
abhijit-paranjpeabhijit-paranjpe
authored
Development (#215)
Merge development to main..
2 parents f925d7d + ca44e31 commit f083a74

File tree

17 files changed

+53
-52
lines changed

17 files changed

+53
-52
lines changed

‎terraform/images/mp_image_ee_byol.tfvars

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "23.2.3-230702055451"
4+
tf_script_version = "23.3.1-230719124253"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
7-
listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaalhdzj6vpns7uw7w3srh6qryi3sdnq36c4kovrn3c7t7ojuafff3q"
7+
listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaaq5nae6poqifz72opkiuld4bprckwnqjtd5iafto5co5od3jubswq"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
11-
ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"
11+
ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"

‎terraform/images/mp_image_ee_ucm.tfvars

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "23.2.3-230702055451"
4+
tf_script_version = "23.3.1-230719124253"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
7-
listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaivrjbnb7pk7urqwhnbigafqc2komq2otryu7ifqv7sbpzt5ls6ua"
7+
listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaailbgbqixdcykix2kq6gfe6zckfebcbpvcmrvj2vken53azkxafqq"

‎terraform/images/mp_image_se_byol.tfvars

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "23.2.3-230702055451"
4+
tf_script_version = "23.3.1-230719124253"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
7-
listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaagdd4fc5bs5qynsv6oorwm7hwj7wbvishxxsizsspclckrvedf4va"
7+
listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaaqlzjmwtm3cz3ejafzmf5fvi7jxrui7gn3odec7vb572hmbv7cuua"

‎terraform/images/mp_image_suite_byol.tfvars

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "23.2.3-230702055451"
4+
tf_script_version = "23.3.1-230719124253"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
7-
listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaa4zp7hrszjgt2w5ffamt5zoc6gnbbhzpdregfcsqmumiwel5idqmq"
7+
listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaau7dmjm42neorefkgt6f7q7h2lddi2x5vld43l7eqr4f5ljt5y7sq"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
11-
ucm_listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"
11+
ucm_listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"

‎terraform/images/mp_image_suite_ucm.tfvars

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "23.2.3-230702055451"
4+
tf_script_version = "23.3.1-230719124253"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
7-
listing_resource_version = "23.2.3-ol8.7-23.04.25-230702-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaijwygc3cvillkixqtnyc6pyqpgub6xd6syjycn3hi3puguodb33a"
7+
listing_resource_version = "23.3.1-ol8.7-23.04.25-230719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaahru54lr3cormvd5mf6ssxdp3hxm7robzbkl62757x7hhbc4hep2q"

‎terraform/modules/compute/bastion/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ variable "compartment_id" {
1818
type = string
1919
description = "The OCID of the compartment where the bastion instance will be created"
2020
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.\"."
2323
}
2424
}
2525

‎terraform/modules/fss/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the file system exists"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/lb/loadbalancer/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the load balancer will be created"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/network-validator/scripts/network_validation.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,12 @@ function in_cidr_range() {
7272

7373
subnet_ip=$(echo "${cidr_subnet}" | cut -d'/' -f1)
7474
cidr_mask=$(echo "${cidr_subnet}" | cut -d'/' -f2)
75+
ip_addr_ip=$(echo "${ip_addr}" | cut -d'/' -f1)
7576

7677
netmask=$(( 0xFFFFFFFF << $(( 32 - ${cidr_mask} )) ))
7778

7879
# Apply netmask to both the subnet IP and the given IP address
79-
ip_addr_subnet=$(( netmask & $(ip_to_int ${ip_addr}) ))
80+
ip_addr_subnet=$(( netmask & $(ip_to_int ${ip_addr_ip}) ))
8081
subnet=$(( netmask & $(ip_to_int ${subnet_ip}) ))
8182

8283
# Subnet IPs will match if given IP address is in CIDR subnet

‎terraform/modules/network/subnet/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the subnet will be created"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/network/vcn-config/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the vcn config will be created"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/network/vcn-peering/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ variable "wls_network_compartment_id" {
1010
type = string
1111
description = "The OCID of the compartment for the network resources, like VCN, for the WebLogic servers"
1212
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.\"."
1515
}
1616
}
1717

‎terraform/modules/network/vcn/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the VCN will be created"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/policies/variables.tf

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@ variable "compartment_id" {
1414
type = string
1515
description = "The OCID of the compartment for the matching rule of dynamic group"
1616
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.\"."
1919
}
2020
}
2121

2222
variable "network_compartment_id" {
2323
type = string
2424
description = "The OCID of the compartment where the network resources like VCN are located"
2525
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.\"."
2828
}
2929
}
3030

3131
variable "fss_compartment_id" {
3232
type = string
3333
description = "The OCID of the compartment where the file system exists"
3434
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.\"."
3737
}
3838
}
3939

4040
variable "mount_target_compartment_id" {
4141
type = string
4242
description = "The OCID of the compartment where the mount target exists"
4343
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.\"."
4646
}
4747
}
4848

‎terraform/modules/resource-tags/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the resource tags will be created"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/rms-private-endpoint/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ variable "compartment_id" {
55
type = string
66
description = "The OCID of the compartment where the file system exists"
77
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.\"."
1010
}
1111
}
1212

‎terraform/modules/validators/variables.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ variable "oci_db_compartment_id" {
200200
type = string
201201
description = "The OCID of the compartment where the OCI database is located, if JRF with OCI DB is used"
202202
validation {
203-
condition = var.oci_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.oci_db_compartment_id)) > 0
204-
error_message = "WLSC-ERROR: The value for oci_db_compartment_id should be blank or start with \"ocid1.compartment.\"."
203+
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
204+
error_message = "WLSC-ERROR: The value for oci_db_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
205205
}
206206
}
207207
variable "db_network_compartment_id" {
@@ -279,8 +279,8 @@ variable "atp_db_compartment_id" {
279279
type = string
280280
description = "The OCID of the compartment where the ATP database is located, if JRF with ATP is used"
281281
validation {
282-
condition = var.atp_db_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.atp_db_compartment_id)) > 0
283-
error_message = "WLSC-ERROR: The value for atp_db_compartment_id should be blank or start with \"ocid1.compartment.\"."
282+
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
283+
error_message = "WLSC-ERROR: The value for atp_db_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
284284
}
285285
}
286286

@@ -348,8 +348,8 @@ variable "mount_target_compartment_id" {
348348
type = string
349349
description = "The OCID of the compartment where the mount target exists"
350350
validation {
351-
condition = var.mount_target_compartment_id == "" || length(regexall("^ocid1.compartment.*$", var.mount_target_compartment_id)) > 0
352-
error_message = "WLSC-ERROR: The value for mount_target_compartment_id should be blank or start with \"ocid1.compartment.\"."
351+
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
352+
error_message = "WLSC-ERROR: The value for mount_target_compartment_id should be blank or start with \"ocid1.compartment.\" or \"ocid1.tenancy.\"."
353353
}
354354
}
355355

0 commit comments

Comments
 (0)