Skip to content

Commit fd0828f

Browse files
fzarrioraclefzarrioracle
committed
Update some typos
1 parent 2164aea commit fd0828f

File tree

2 files changed

+36
-98
lines changed
  • security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network

2 files changed

+36
-98
lines changed

‎security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/main.tf

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,15 @@
11
################################################################################
2-
#Copyright (c) 2023 Oracle and/or its affiliates.
3-
#
4-
#The Universal Permissive License (UPL), Version 1.0
5-
#
6-
#Subject to the condition set forth below, permission is hereby granted to any
7-
#person obtaining a copy of this software, associated documentation and/or data
8-
#(collectively the "Software"), free of charge and under any and all copyright
9-
#rights in the Software, and any and all patent rights owned or freely
10-
#licensable by each licensor hereunder covering either (i) the unmodified
11-
#Software as contributed to or provided by such licensor, or (ii) the Larger
12-
#Works (as defined below), to deal in both
13-
#
14-
#(a) the Software, and
15-
#(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
16-
#one is included with the Software (each a "Larger Work" to which the Software
17-
#is contributed by such licensors),
18-
19-
#without restriction, including without limitation the rights to copy, create
20-
#derivative works of, display, perform, and distribute the Software and make,
21-
#use, sell, offer for sale, import, export, have made, and have sold the
22-
#Software and the Larger Work(s), and to sublicense the foregoing rights on
23-
#either these or other terms.
24-
25-
#This license is subject to the following condition:
26-
#The above copyright notice and either this complete permission notice or at
27-
#a minimum a reference to the UPL must be included in all copies or
28-
#substantial portions of the Software.
29-
30-
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31-
#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32-
#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33-
#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34-
#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35-
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36-
#SOFTWARE.
2+
# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3+
# This software is dual-licensed to you under the Universal Permissive
4+
# License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl
375
################################################################################
386

7+
398
resource "oci_core_virtual_network" "vcn" {
409
cidr_block = var.VCN-CIDR
41-
dns_label = "${var.fnvcndnslabelprefix}${random_id.tag.hex}"
10+
dns_label = "${var.vcndnslabelprefix}${random_id.tag.hex}"
4211
compartment_id = var.compartment_ocid
43-
display_name = "${var.fnvcnnameprefix}-${random_id.tag.hex}"
12+
display_name = "${var.vcnnameprefix}-${random_id.tag.hex}"
4413
}
4514

4615
data "oci_core_services" "service_gateway_all_oci_services" {
@@ -58,19 +27,19 @@ resource "oci_core_service_gateway" "service_gw" {
5827
services {
5928
service_id = lookup(data.oci_core_services.service_gateway_all_oci_services.services[0], "id")
6029
}
61-
display_name = "${var.fnvcnnameservicegatewayprefix}-${random_id.tag.hex}"
30+
display_name = "${var.vcnnameservicegatewayprefix}-${random_id.tag.hex}"
6231
}
6332

6433
resource "oci_core_route_table" "rt_fn_subnet" {
6534
compartment_id = var.compartment_ocid
6635
vcn_id = oci_core_virtual_network.vcn.id
67-
display_name = "${var.fnvcnnameroutingtableprefix}-${random_id.tag.hex}"
36+
display_name = "${var.vcnnameroutingtableprefix}-${random_id.tag.hex}"
6837

6938
route_rules {
7039
destination = lookup(data.oci_core_services.service_gateway_all_oci_services.services[0], "cidr_block")
7140
destination_type = "SERVICE_CIDR_BLOCK"
7241
network_entity_id = oci_core_service_gateway.service_gw.id
73-
description = "${var.fnvcnroutingtabledescriptionervicegw}-${random_id.tag.hex}"
42+
description = "${var.vcnroutingtabledescriptionservicegw}-${random_id.tag.hex}"
7443
}
7544

7645
}
@@ -80,17 +49,17 @@ resource "oci_core_route_table" "rt_fn_subnet" {
8049
resource "oci_core_dhcp_options" "dhcpoptions1" {
8150
compartment_id = var.compartment_ocid
8251
vcn_id = oci_core_virtual_network.vcn.id
83-
display_name = "${var.fnvcnnamedhcpopitonsprefix}-${random_id.tag.hex}"
52+
display_name = "${var.vcnnamedhcpopitonsprefix}-${random_id.tag.hex}"
8453
options {
8554
type = "DomainNameServer"
8655
server_type = "VcnLocalPlusInternet"
8756
}
8857
}
8958

9059
resource "oci_core_subnet" "function_ds_log_vcn" {
91-
cidr_block = var.fnsubnet-CIDR
92-
display_name = "${var.fnsubnetnameprefix}-${random_id.tag.hex}"
93-
dns_label = "${var.fnsubnetdnslabelprefix}${random_id.tag.hex}"
60+
cidr_block = var.subnet-CIDR
61+
display_name = "${var.subnetnameprefix}-${random_id.tag.hex}"
62+
dns_label = "${var.subnetdnslabelprefix}${random_id.tag.hex}"
9463
compartment_id = var.compartment_ocid
9564
vcn_id = oci_core_virtual_network.vcn.id
9665
route_table_id = oci_core_route_table.rt_fn_subnet.id
@@ -103,7 +72,7 @@ resource "oci_core_subnet" "function_ds_log_vcn" {
10372
resource "oci_core_security_list" "vcn_security_list"{
10473
compartment_id = var.compartment_ocid
10574
vcn_id = oci_core_virtual_network.vcn.id
106-
display_name = "${var.fnvcnnamesecuritylistprefix}-${random_id.tag.hex}"
75+
display_name = "${var.vcnnamesecuritylistprefix}-${random_id.tag.hex}"
10776

10877
egress_security_rules {
10978
stateless = false

‎security/security-design/fn-datasafe-dbaudit-to-oci-logging/terraform/modules/network/variables.tf

Lines changed: 22 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,11 @@
11
################################################################################
2-
#Copyright (c) 2023 Oracle and/or its affiliates.
3-
#
4-
#The Universal Permissive License (UPL), Version 1.0
5-
#
6-
#Subject to the condition set forth below, permission is hereby granted to any
7-
#person obtaining a copy of this software, associated documentation and/or data
8-
#(collectively the "Software"), free of charge and under any and all copyright
9-
#rights in the Software, and any and all patent rights owned or freely
10-
#licensable by each licensor hereunder covering either (i) the unmodified
11-
#Software as contributed to or provided by such licensor, or (ii) the Larger
12-
#Works (as defined below), to deal in both
13-
#
14-
#(a) the Software, and
15-
#(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
16-
#one is included with the Software (each a "Larger Work" to which the Software
17-
#is contributed by such licensors),
18-
19-
#without restriction, including without limitation the rights to copy, create
20-
#derivative works of, display, perform, and distribute the Software and make,
21-
#use, sell, offer for sale, import, export, have made, and have sold the
22-
#Software and the Larger Work(s), and to sublicense the foregoing rights on
23-
#either these or other terms.
24-
25-
#This license is subject to the following condition:
26-
#The above copyright notice and either this complete permission notice or at
27-
#a minimum a reference to the UPL must be included in all copies or
28-
#substantial portions of the Software.
29-
30-
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31-
#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32-
#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33-
#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34-
#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35-
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36-
#SOFTWARE.
2+
# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3+
# This software is dual-licensed to you under the Universal Permissive
4+
# License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl
375
################################################################################
386

397

8+
409
variable "compartment_ocid" {
4110
description = "the OCID of the compartment where the environment will be created."
4211
}
@@ -46,42 +15,42 @@ variable "VCN-CIDR" {
4615
description = "The CIDR block of VCN"
4716
}
4817

49-
variable "fnsubnet-CIDR" {
18+
variable "subnet-CIDR" {
5019
default = "10.0.1.0/24"
5120
}
5221

53-
variable "fnvcndnslabelprefix" {
54-
default = "fndslogvcn"
22+
variable "vcndnslabelprefix" {
23+
default = "dnsepl"
5524
}
5625

57-
variable "fnvcnnameprefix" {
58-
default = "vcn_fn_ds_log-fndslog"
26+
variable "vcnnameprefix" {
27+
default = "vnc"
5928
description = "The prefix display name of VCN"
6029
}
6130

62-
variable "fnvcnnameroutingtableprefix" {
63-
default = "function_ds_log_vcn_routetable"
31+
variable "vcnnameroutingtableprefix" {
32+
default = "rt"
6433
}
6534

66-
variable "fnvcnroutingtabledescriptionervicegw" {
35+
variable "vcnroutingtabledescriptionservicegw" {
6736
default = "Route for Service Gateway"
6837
}
6938

70-
variable "fnvcnnamedhcpopitonsprefix" {
71-
default = "function_ds_log_vcn_dhcpoptions1"
39+
variable "vcnnamedhcpopitonsprefix" {
40+
default = "dhcpo"
7241
}
7342

74-
variable "fnsubnetnameprefix" {
75-
default = "private_fn_ds_log_vcn_subnet"
43+
variable "subnetnameprefix" {
44+
default = "sub"
7645
}
7746

78-
variable "fnsubnetdnslabelprefix" {
79-
default = "fndslogsub"
47+
variable "subnetdnslabelprefix" {
48+
default = "dnsepl"
8049
}
8150

82-
variable "fnvcnnamesecuritylistprefix" {
83-
default = "functions-security-list"
51+
variable "vcnnamesecuritylistprefix" {
52+
default = "sl"
8453
}
85-
variable "fnvcnnameservicegatewayprefix" {
86-
default = "function_ds_log_vcn_sg"
54+
variable "vcnnameservicegatewayprefix" {
55+
default = "sgw"
8756
}

0 commit comments

Comments
 (0)