Skip to content

Commit 226e568

Browse files
juniorjunior
authored
Merge pull request #5 from junior/API_Gateway_n_FN_subnet_example
Version update to 0.2.0
2 parents 22baeac + f52d94d commit 226e568

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ There are multiple examples included in the [examples](https://github.com/oracle
2626

2727
```hcl
2828
module "oci-networking" {
29-
source = "github.com/oracle-quickstart/terraform-oci-networking?ref=0.1.2"
29+
source = "github.com/oracle-quickstart/terraform-oci-networking?ref=0.2.0"
3030
3131
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
3232
tenancy_ocid = var.tenancy_ocid
@@ -61,7 +61,7 @@ module "oci-networking" {
6161

6262
```hcl
6363
module "vcn" {
64-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.1.2"
64+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.2.0"
6565
6666
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
6767
compartment_ocid = var.compartment_ocid
@@ -81,7 +81,7 @@ module "vcn" {
8181
8282
module "subnets" {
8383
for_each = { for map in local.subnets : map.subnet_name => map }
84-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.1.2"
84+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.2.0"
8585
8686
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
8787
compartment_ocid = var.compartment_ocid

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.3
1+
0.2.0

‎examples/5g-networking/gateways.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Module: Gateways
33
################################################################################
44
module "gateways" {
5-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.1.2"
5+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.2.0"
66

77
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
88
compartment_ocid = local.vcn_compartment_ocid

‎examples/5g-networking/route_tables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
################################################################################
55
module "route_tables" {
66
for_each = { for map in local.route_tables : map.route_table_name => map }
7-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.1.2"
7+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.2.0"
88

99
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
1010
compartment_ocid = local.vcn_compartment_ocid

‎examples/5g-networking/security_lists.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
################################################################################
44
module "security_lists" {
55
for_each = { for map in local.security_lists : map.security_list_name => map }
6-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.1.2"
6+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.2.0"
77

88
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
99
compartment_ocid = local.vcn_compartment_ocid

‎examples/5g-networking/subnets.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
################################################################################
44
module "subnets" {
55
for_each = { for map in local.subnets : map.subnet_name => map }
6-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.1.2"
6+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.2.0"
77

88
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
99
compartment_ocid = local.vcn_compartment_ocid

‎examples/5g-networking/vcn.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Module: Virtual Cloud Network (VCN)
44
################################################################################
55
module "vcn" {
6-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.1.2"
6+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.2.0"
77

88
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
99
compartment_ocid = local.vcn_compartment_ocid

‎examples/apigw-fn-extra-subnet-existing-vcn/networking.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "vcn" {
2-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.1.2"
2+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.2.0"
33

44
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
55
compartment_ocid = var.compartment_ocid
@@ -14,7 +14,7 @@ module "vcn" {
1414

1515
module "subnets" {
1616
for_each = { for map in local.subnets : map.subnet_name => map }
17-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.1.2"
17+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.2.0"
1818

1919
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
2020
compartment_ocid = var.compartment_ocid
@@ -55,7 +55,7 @@ locals {
5555

5656
module "route_tables" {
5757
for_each = { for map in local.route_tables : map.route_table_name => map }
58-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.1.2"
58+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/route_table?ref=0.2.0"
5959

6060
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
6161
compartment_ocid = local.vcn_compartment_ocid
@@ -85,7 +85,7 @@ locals {
8585
}
8686

8787
module "gateways" {
88-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.1.2"
88+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/gateways?ref=0.2.0"
8989

9090
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
9191
compartment_ocid = local.vcn_compartment_ocid
@@ -102,7 +102,7 @@ module "gateways" {
102102

103103
module "security_lists" {
104104
for_each = { for map in local.security_lists : map.security_list_name => map }
105-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.1.2"
105+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/security_list?ref=0.2.0"
106106

107107
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
108108
compartment_ocid = local.vcn_compartment_ocid
@@ -170,8 +170,8 @@ data "oci_core_services" "all_services_network" {
170170
locals {
171171
# vcn_cidr_blocks = split(",", var.vcn_cidr_blocks)
172172
vcn_compartment_ocid = var.compartment_ocid
173-
pre_vcn_cidr_blocks = split(",", var.vcn_cidr_blocks)
174-
vcn_cidr_blocks = contains(module.vcn.cidr_blocks, local.pre_vcn_cidr_blocks[0]) ? distinct(concat([local.pre_vcn_cidr_blocks[0]],module.vcn.cidr_blocks)) : module.vcn.cidr_blocks
173+
pre_vcn_cidr_blocks = split(",", var.vcn_cidr_blocks)
174+
vcn_cidr_blocks = contains(module.vcn.cidr_blocks, local.pre_vcn_cidr_blocks[0]) ? distinct(concat([local.pre_vcn_cidr_blocks[0]], module.vcn.cidr_blocks)) : module.vcn.cidr_blocks
175175
network_cidrs = {
176176
APIGW-FN-REGIONAL-SUBNET-CIDR = cidrsubnet(local.vcn_cidr_blocks[0], 8, 30) # e.g.: "10.20.30.0/24" = 254 usable IPs (10.20.30.0 - 10.20.30.255)
177177
ALL-CIDR = "0.0.0.0/0"

‎examples/basic-vcn-using-submodules/subnets.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "subnets" {
22
for_each = { for map in local.subnets : map.subnet_name => map }
3-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.1.2"
3+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/subnet?ref=0.2.0"
44

55
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
66
compartment_ocid = var.compartment_ocid

‎examples/basic-vcn-using-submodules/vcn.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "vcn" {
2-
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.1.2"
2+
source = "github.com/oracle-quickstart/terraform-oci-networking//modules/vcn?ref=0.2.0"
33

44
# Oracle Cloud Infrastructure Tenancy and Compartment OCID
55
compartment_ocid = var.compartment_ocid

0 commit comments

Comments
 (0)