Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f083a74

Browse files
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
Lines changed: 5 additions & 5 deletions
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"
Lines changed: 3 additions & 3 deletions
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"
Lines changed: 3 additions & 3 deletions
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"
Lines changed: 5 additions & 5 deletions
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"
Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /